Skip to content

[EDIFNetlist] exportEDIF() to use getLibrariesInExportOrder() #1148

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[EDIFNetlist] exportEDIF() to use getLibrariesInExportOrder() #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ec40d
[EDIFNetlist] exportEDIF() to use getLibrariesInExportOrder()
eddieh-xlnx Feb 13, 2025
cc5d978
Fix broken test that uses EDIFCell from singleton library
eddieh-xlnx Feb 14, 2025
f886134
Same for other failing test
eddieh-xlnx Feb 14, 2025
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
9 changes: 1 addition & 8 deletions src/com/xilinx/rapidwright/edif/EDIFNetlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,14 +802,7 @@ public void exportEDIF(OutputStream out, boolean stable) throws IOException {
}
os.write(EXPORT_CONST_DOUBLE_CLOSE);

List<EDIFLibrary> librariesToWrite = new ArrayList<>();
librariesToWrite.add(getHDIPrimitivesLibrary());
for (EDIFLibrary lib : EDIFTools.sortIfStable(getLibrariesMap().values(), stable)) {
if (lib.isHDIPrimitivesLibrary()) {
continue;
}
librariesToWrite.add(lib);
}
List<EDIFLibrary> librariesToWrite = getLibrariesInExportOrder();

if (dos != null) {
Deque<Future<ParallelDCPInput>> streamFutures = new ArrayDeque<>();
Expand Down
12 changes: 8 additions & 4 deletions test/src/com/xilinx/rapidwright/edif/TestEDIFNetlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,10 @@ public void testBussedPortNamingCollision(@TempDir Path path) {

EDIFCell top = origNetlist.getTopCell();

EDIFCellInst ff = top.createChildCellInst("ff", Design.getPrimitivesLibrary().getCell("FDRE"));
origNetlist.getHDIPrimitivesLibrary().addCell(ff.getCellType());
EDIFCell fdre = new EDIFCell(Design.getUnisimCell(Unisim.FDRE));
EDIFLibrary hdi = origNetlist.getHDIPrimitivesLibrary();
hdi.addCell(fdre);
EDIFCellInst ff = top.createChildCellInst("ff", fdre);

String portName = "unfortunate_name";

Expand Down Expand Up @@ -456,8 +458,10 @@ public void testBussedPortReNamingCollision(@TempDir Path path) {

EDIFCell top = origNetlist.getTopCell();

EDIFCellInst ff = top.createChildCellInst("ff", Design.getPrimitivesLibrary().getCell("FDRE"));
origNetlist.getHDIPrimitivesLibrary().addCell(ff.getCellType());
EDIFCell fdre = new EDIFCell(Design.getUnisimCell(Unisim.FDRE));
EDIFLibrary hdi = origNetlist.getHDIPrimitivesLibrary();
hdi.addCell(fdre);
EDIFCellInst ff = top.createChildCellInst("ff", fdre);

String portName = "unfortunate_name";

Expand Down
Loading