[FIX] vivado_ibert: Fix setting link properties

Author: p-woj

protoplaster/tests/bert/vivado_ibert/ibert_eyescan.py

@@ -11,7 +11,7 @@ class EyeScan:
 
     def __init__(self, vivado_cmd: str, hw_server: str, serial_number: str,
                  channel_path: str, prbs_bits: int, loopback: bool) -> None:
-        self.eyescan_file = tempfile.NamedTemporaryFile()
+        self.eyescan_file = tempfile.NamedTemporaryFile(suffix=".csv")
         self.hw_server = hw_server
         self.serial_number = serial_number
         self.channel_path = channel_path
@@ -39,7 +39,7 @@ def __init__(self, vivado_cmd: str, hw_server: str, serial_number: str,
             self.serial_number,
             self.channel_path,
             str(self.prbs_bits),
-            int(self.loopback),
+            str(self.loopback),
         ]
         res = subprocess.run(vivado_argv,
                              cwd=os.path.dirname(__file__),

protoplaster/tests/bert/vivado_ibert/ibert_eyescan.tcl

@@ -15,17 +15,15 @@ proc perform_eye_scan { outputPath hwServer serialNumber channelPath prbsBits lo
 	if { $loopback } {
 		# Set link to use PCS Loopback, and write to hardware
 		set_property LOOPBACK {Far-End PCS} [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
-		commit_hw_sio -non_blocking [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
 	}
 	set_property RX_PATTERN "PRBS $prbsBits-bit" [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
-	commit_hw_sio -non_blocking [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
 	set_property TX_PATTERN "PRBS $prbsBits-bit" [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
-	commit_hw_sio -non_blocking [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
+	commit_hw_sio [get_hw_sio_links -of_objects [get_hw_sio_linkgroups {Link_Group_0}]]
 	# Create, run, and save scan
-	set xil_newScan [create_hw_sio_scan -description {Scan 2} 2d_full_eye  [lindex [get_hw_sio_links $fullPath/TX->$fullPath/RX] 0 ]]
+	set xil_newScan [create_hw_sio_scan -description {Scan 0} 2d_full_eye  [lindex [get_hw_sio_links $fullPath/TX->$fullPath/RX] 0 ]]
 	run_hw_sio_scan [get_hw_sio_scans $xil_newScan]
-	wait_on_hw_sio_scan $xil_newScan
-	write_hw_sio_scan $outputPath $xil_newScan
+	wait_on_hw_sio_scan [get_hw_sio_scans $xil_newScan]
+	write_hw_sio_scan -force $outputPath [get_hw_sio_scans $xil_newScan]
 }
 
 set requiredArgs 6

protoplaster/tests/bert/vivado_ibert/test.py

@@ -90,10 +90,9 @@ def test_eye_size(self):
         assert min_width <= max_width, f"Invalid range: [{min_width}, {max_width}]"
         assert min_height <= max_height, f"Invalid range: [{min_height}, {max_height}]"
 
-        for sample in samples:
-            width, height = self.eyescan.get_eye_size(sample)
-            assert min_width <= width <= max_width, f"Eye width {width} is not in accepted range: [{min_width}, {max_width}]"
-            assert min_height <= height <= max_height, f"Eye height {height} is not in accepted range: [{min_height}, {max_height}]"
+        width, height = self.eyescan.get_eye_size(samples)
+        assert min_width <= width <= max_width, f"Eye width {width} is not in accepted range: [{min_width}, {max_width}]"
+        assert min_height <= height <= max_height, f"Eye height {height} is not in accepted range: [{min_height}, {max_height}]"
 
     def name(self):
         return self.test_name