Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to support new array-based sitewire-net changes #1110

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Changes to support new array-based sitewire-net changes #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/src/com/xilinx/rapidwright/design/TestDesign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public void testMovePinsToNewNetDeleteOldNet() {
Assertions.assertTrue(si.routeIntraSiteNet(oldNet, si.getBELPin("A1", "A1"),
si.getBELPin(unisim.toString(), "DI0")));
Assertions.assertEquals("[IN SLICE_X32Y73.A1, OUT SLICE_X32Y73.HQ]", oldNet.getPins().toString());
Assertions.assertEquals("[A1, HQ, A5LUT_O5]", si.getSiteWiresFromNet(oldNet).toString());
Assertions.assertEquals("[A1, A5LUT_O5, HQ]", si.getSiteWiresFromNet(oldNet).toString());

Net newNet = d.createNet("newNet");
SitePinInst h6 = newNet.createPin("H6", si);
Expand All @@ -362,7 +362,7 @@ public void testMovePinsToNewNetDeleteOldNet() {
Assertions.assertNull(d.getNet(oldNet.getName()));
Assertions.assertSame(newNet, d.getNet(newNet.getName()));
Assertions.assertEquals("[IN SLICE_X32Y73.H6, IN SLICE_X32Y73.A1, OUT SLICE_X32Y73.HQ]", newNet.getPins().toString());
Assertions.assertEquals("[H6, A1, HQ, A5LUT_O5]", si.getSiteWiresFromNet(newNet).toString());
Assertions.assertEquals("[A1, A5LUT_O5, H6, HQ]", si.getSiteWiresFromNet(newNet).toString());
Assertions.assertEquals("[INT_X21Y73/INT.VCC_WIRE->>IMUX_E47]", newNet.getPIPs().toString());
}

Expand All @@ -389,7 +389,7 @@ public void testMovePinsToNewNetDeleteOldNetIntraSiteOnly() {
Assertions.assertNull(d.getNet(oldNet.getName()));
Assertions.assertSame(newNet, d.getNet(newNet.getName()));
Assertions.assertEquals("[IN SLICE_X32Y73.H6]", newNet.getPins().toString());
Assertions.assertEquals("[H6, B_O, FFMUXB1_OUT1]", si.getSiteWiresFromNet(newNet).toString());
Assertions.assertEquals("[B_O, FFMUXB1_OUT1, H6]", si.getSiteWiresFromNet(newNet).toString());
Assertions.assertTrue(newNet.getPIPs().isEmpty());
}

Expand Down
8 changes: 4 additions & 4 deletions test/src/com/xilinx/rapidwright/design/compare/TestDesignComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,25 +149,25 @@ public void testDesignComparator() {
Assertions.assertTrue(net.hasPIPs());
test2.removeNet(net);

compareDesign(22, 1, DesignDiffType.NET_MISSING, dc, gold, test2);
compareDesign(28, 1, DesignDiffType.NET_MISSING, dc, gold, test2);
eddieh-xlnx marked this conversation as resolved.
Show resolved Hide resolved

Net extra = new Net("extraNet");
for (PIP p : net.getPIPs()) {
extra.addPIP(p);
}
test2.addNet(extra);

compareDesign(23, 1, DesignDiffType.NET_EXTRA, dc, gold, test2);
compareDesign(29, 1, DesignDiffType.NET_EXTRA, dc, gold, test2);

Assertions.assertTrue(extra.hasPIPs());
clk.addPIP(extra.getPIPs().get(0));

compareDesign(24, 1, DesignDiffType.PIP_EXTRA, dc, gold, test2);
compareDesign(30, 1, DesignDiffType.PIP_EXTRA, dc, gold, test2);

clk.getPIPs().remove(clk.getPIPs().size() - 1);
clk.getPIPs().remove(clk.getPIPs().size() - 1);

compareDesign(24, 1, DesignDiffType.PIP_MISSING, dc, gold, test2);
compareDesign(30, 1, DesignDiffType.PIP_MISSING, dc, gold, test2);

if (dc.comparePIPFlags()) {
clk.getPIPs().get(clk.getPIPs().size() - 1).setIsStub(true);
Expand Down
Loading