From a55fac3184bd2de1789b8b625bb8538aa7778beb Mon Sep 17 00:00:00 2001 From: Chris Lavin Date: Fri, 12 Jul 2024 17:08:36 -0600 Subject: [PATCH 1/3] Adding HDIOB types (#1028) Signed-off-by: Chris Lavin --- src/com/xilinx/rapidwright/util/Utils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/xilinx/rapidwright/util/Utils.java b/src/com/xilinx/rapidwright/util/Utils.java index 0597aa1e6..6d3b5fa4e 100644 --- a/src/com/xilinx/rapidwright/util/Utils.java +++ b/src/com/xilinx/rapidwright/util/Utils.java @@ -384,6 +384,9 @@ public static boolean isIOB(SiteTypeEnum s) { SiteTypeEnum.IOB, SiteTypeEnum.IOBM, SiteTypeEnum.IOBS, + SiteTypeEnum.HDIOB, + SiteTypeEnum.HDIOB_M, + SiteTypeEnum.HDIOB_S, SiteTypeEnum.HPIOB, SiteTypeEnum.HPIOB_M, SiteTypeEnum.HPIOB_S, From 8131a2336ff8423638f75beefd04fd3ff693c256 Mon Sep 17 00:00:00 2001 From: eddieh-xlnx Date: Fri, 12 Jul 2024 16:20:01 -0700 Subject: [PATCH 2/3] [EDIFTools] writeTclLoadScriptForPartialEncryptedDesigns abspath (#1029) Write *_load.tcl into same dir as DCP rather than into current working dir Signed-off-by: Eddie Hung --- src/com/xilinx/rapidwright/edif/EDIFTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/xilinx/rapidwright/edif/EDIFTools.java b/src/com/xilinx/rapidwright/edif/EDIFTools.java index 1c997a8bc..bc3ced3db 100644 --- a/src/com/xilinx/rapidwright/edif/EDIFTools.java +++ b/src/com/xilinx/rapidwright/edif/EDIFTools.java @@ -1019,7 +1019,7 @@ public static void writeTclLoadScriptForPartialEncryptedDesigns(EDIFNetlist edif lines.add("read_checkpoint {" + pathDCPFileName + "}"); lines.add("set_property top "+edif.getName()+" [current_fileset]"); lines.add("link_design -part " + partName); - Path tclFileName = FileTools.replaceExtension(pathDCPFileName.getFileName(), LOAD_TCL_SUFFIX); + Path tclFileName = FileTools.replaceExtension(pathDCPFileName, LOAD_TCL_SUFFIX); try { Files.write(tclFileName, lines); } catch (IOException e) { From e024bff7306167de12d032699a97ffb87aeed2fd Mon Sep 17 00:00:00 2001 From: eddieh-xlnx Date: Tue, 16 Jul 2024 09:01:47 -0700 Subject: [PATCH 3/3] [VivadoTools] Source *_load.tcl from same dir as DCP (#1032) Signed-off-by: Eddie Hung --- src/com/xilinx/rapidwright/util/VivadoTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/xilinx/rapidwright/util/VivadoTools.java b/src/com/xilinx/rapidwright/util/VivadoTools.java index 67ca7b5de..40ae8aa77 100644 --- a/src/com/xilinx/rapidwright/util/VivadoTools.java +++ b/src/com/xilinx/rapidwright/util/VivadoTools.java @@ -305,7 +305,7 @@ public static String reportRouteStatus(String netName, Path dcp, Path workdir, b private static String createTclDCPLoadCommand(Path dcp, boolean encrypted) { if (encrypted) { - Path tclFileName = FileTools.replaceExtension(dcp.getFileName(), EDIFTools.LOAD_TCL_SUFFIX); + Path tclFileName = FileTools.replaceExtension(dcp, EDIFTools.LOAD_TCL_SUFFIX); return "source {" + tclFileName + "}; "; } else { return "open_checkpoint {" + dcp + "}; ";