From 86bc11a10d791c3168c1a99a9c9665f15bb7de63 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Wed, 6 Nov 2024 10:03:32 -0800 Subject: [PATCH 1/2] Tile.getWireConnections() not consistent with Vivado Signed-off-by: Eddie Hung --- test/src/com/xilinx/rapidwright/device/TestTile.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/src/com/xilinx/rapidwright/device/TestTile.java b/test/src/com/xilinx/rapidwright/device/TestTile.java index bcca70b49..6e97547e4 100644 --- a/test/src/com/xilinx/rapidwright/device/TestTile.java +++ b/test/src/com/xilinx/rapidwright/device/TestTile.java @@ -35,7 +35,7 @@ public class TestTile { "xcku025,true", "xcku035,false" }) - public void testGetWireConnections(String partName, boolean expectThrow) { + public void testGetWireConnectionsThrows(String partName, boolean expectThrow) { Device dev = Device.getDevice(partName); Tile tile = dev.getTile("RCLK_CLE_M_L_X31Y149"); Executable e = () -> tile.getWireConnections(8); @@ -47,6 +47,16 @@ public void testGetWireConnections(String partName, boolean expectThrow) { } } + @ParameterizedTest + @CsvSource({ + "xcvp1002,CLK_REBUF_VERT_VNOC_BAO_TILE_X30Y471,IF_WRAP_CLK_V_BOT_CLK_VDISTR21,[]", + }) + public void testGetWireConnections(String partName, String tileName, String wireName, String wireConnections) { + Device dev = Device.getDevice(partName); + Tile tile = dev.getTile(tileName); + Assertions.assertEquals(wireConnections, tile.getWireConnections(wireName).toString()); + } + @ParameterizedTest @CsvSource({ "xcvu5p,LAG_LAG_X30Y250,'[LAGUNA_X6Y140, LAGUNA_X6Y141, LAGUNA_X7Y140, LAGUNA_X7Y141]',true", From 6c97623db1ff9d3a7896c65adf8bda4d93d0932a Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Wed, 6 Nov 2024 11:22:04 -0800 Subject: [PATCH 2/2] Add another failing testcase Signed-off-by: Eddie Hung --- test/src/com/xilinx/rapidwright/device/TestTile.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/src/com/xilinx/rapidwright/device/TestTile.java b/test/src/com/xilinx/rapidwright/device/TestTile.java index 6e97547e4..f10691f0d 100644 --- a/test/src/com/xilinx/rapidwright/device/TestTile.java +++ b/test/src/com/xilinx/rapidwright/device/TestTile.java @@ -49,7 +49,11 @@ public void testGetWireConnectionsThrows(String partName, boolean expectThrow) { @ParameterizedTest @CsvSource({ + // get_nodes -downhill -of [get_nodes -of [get_wires CLK_REBUF_VERT_VNOC_BAO_TILE_X30Y471/IF_WRAP_CLK_V_BOT_CLK_VDISTR21]] "xcvp1002,CLK_REBUF_VERT_VNOC_BAO_TILE_X30Y471,IF_WRAP_CLK_V_BOT_CLK_VDISTR21,[]", + // get_nodes -downhill -of [get_nodes -of [get_wires CLK_REBUF_VERT_VNOC_ACO_TILE_X30Y279/IF_WRAP_CLK_V_BOT_CLK_VDISTR21]] + "xcvp1002,CLK_REBUF_VERT_VNOC_ACO_TILE_X30Y279,IF_WRAP_CLK_V_BOT_CLK_VDISTR21," + + "'[RCLK_BRAM_CLKBUF_CORE_X24Y239/IF_HCLK_R_CLK_HDISTR21, CLK_VNOC_AAO_TILE_X30Y239/CLKE2_PD_OPT_DELAY_SSIT_142_I]'", }) public void testGetWireConnections(String partName, String tileName, String wireName, String wireConnections) { Device dev = Device.getDevice(partName);