From 0a4103debe352f572fa0560746cecd1945ee5d33 Mon Sep 17 00:00:00 2001 From: Chris Lavin Date: Mon, 18 Nov 2024 17:11:44 -0700 Subject: [PATCH 1/3] Fix no overlap behavior Signed-off-by: Chris Lavin --- src/com/xilinx/rapidwright/design/ModuleInst.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/xilinx/rapidwright/design/ModuleInst.java b/src/com/xilinx/rapidwright/design/ModuleInst.java index b615bff55..12eb98a0b 100644 --- a/src/com/xilinx/rapidwright/design/ModuleInst.java +++ b/src/com/xilinx/rapidwright/design/ModuleInst.java @@ -39,9 +39,6 @@ import com.xilinx.rapidwright.device.Site; import com.xilinx.rapidwright.device.SiteTypeEnum; import com.xilinx.rapidwright.device.Tile; -import com.xilinx.rapidwright.edif.EDIFNet; -import com.xilinx.rapidwright.edif.EDIFPortInst; -import com.xilinx.rapidwright.edif.EDIFTools; import com.xilinx.rapidwright.util.MessageGenerator; import com.xilinx.rapidwright.util.Utils; @@ -358,6 +355,11 @@ public boolean place(Site newAnchorSite, boolean skipIncompatible, boolean allow } } + if (existingSiteInst != null && !allowOverlap) { + unplace(); + return false; + } + if (newSite == null || existingSiteInst != null) { //MessageGenerator.briefError("ERROR: No matching site found." + // " (Template Site:" + templateSite.getName() + From 7b29ab04a8df9f69ef414dfaff04b464e3c65220 Mon Sep 17 00:00:00 2001 From: Chris Lavin Date: Tue, 26 Nov 2024 20:10:59 -0700 Subject: [PATCH 2/3] Simplify code Signed-off-by: Chris Lavin --- src/com/xilinx/rapidwright/design/ModuleInst.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/xilinx/rapidwright/design/ModuleInst.java b/src/com/xilinx/rapidwright/design/ModuleInst.java index 12eb98a0b..e9747ea95 100644 --- a/src/com/xilinx/rapidwright/design/ModuleInst.java +++ b/src/com/xilinx/rapidwright/design/ModuleInst.java @@ -353,12 +353,12 @@ public boolean place(Site newAnchorSite, boolean skipIncompatible, boolean allow } } } + if (existingSiteInst != null) { + unplace(); + return false; + } } - if (existingSiteInst != null && !allowOverlap) { - unplace(); - return false; - } if (newSite == null || existingSiteInst != null) { //MessageGenerator.briefError("ERROR: No matching site found." + From 1d1cecee4bc82addc070f3d5c05d81efb9aa14ed Mon Sep 17 00:00:00 2001 From: eddieh-xlnx Date: Tue, 26 Nov 2024 19:24:52 -0800 Subject: [PATCH 3/3] Update src/com/xilinx/rapidwright/design/ModuleInst.java Signed-off-by: eddieh-xlnx --- src/com/xilinx/rapidwright/design/ModuleInst.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/xilinx/rapidwright/design/ModuleInst.java b/src/com/xilinx/rapidwright/design/ModuleInst.java index e9747ea95..5130573dc 100644 --- a/src/com/xilinx/rapidwright/design/ModuleInst.java +++ b/src/com/xilinx/rapidwright/design/ModuleInst.java @@ -359,7 +359,6 @@ public boolean place(Site newAnchorSite, boolean skipIncompatible, boolean allow } } - if (newSite == null || existingSiteInst != null) { //MessageGenerator.briefError("ERROR: No matching site found." + // " (Template Site:" + templateSite.getName() +