DesignComparator to accept a Predicate<Net> for PIP comparisons (#935)

* DesignComparator to accept a Predicate<Net> for PIP comparisons Signed-off-by: Eddie Hung <[email protected]> * Fix polarity Signed-off-by: Eddie Hung <[email protected]> --------- Signed-off-by: Eddie Hung <[email protected]>
Xilinx · Jan 8, 2024 · 9d20688 · 9d20688
1 parent e9dcad1
commit 9d20688
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/src/com/xilinx/rapidwright/design/compare/DesignComparator.java b/src/com/xilinx/rapidwright/design/compare/DesignComparator.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.function.Predicate;
 
 import com.xilinx.rapidwright.design.Cell;
 import com.xilinx.rapidwright.design.Design;
@@ -55,8 +56,8 @@ public class DesignComparator {
     private int diffCount;
     /** Flag indicating if PIP flags should be compared (default: false) */
     private boolean comparePIPFlags = false;
-    /** Flag indicating if routing (PIPs) should be compared (default: true) */
-    private boolean comparePIPs = true;
+    /** Predicate indicating if routing (PIPs) should be compared for given Net (default: true) */
+    private Predicate<Net> comparePIPs = (net) -> true;
     /**
      * Flag indicating if placement information should be compared (default: true)
      */
@@ -182,23 +183,21 @@ public void setComparePIPFlags(boolean comparePIPFlags) {
     }
 
     /**
-     * Gets the comparePIPs flag indicating if a design's PIPs should be compared by
-     * DesignComparator.
+     * Sets a flag to tell the design comparator if PIP should be compared.
      * 
-     * @return True if the flag is set, false otherwise (default: true).
+     * @param comparePIPs Desired flag value (default: true).
      */
-    public boolean comparePIPs() {
-        return comparePIPs;
+    public void setComparePIPs(boolean comparePIPs) {
+        this.comparePIPs = (net) -> comparePIPs;
     }
 
     /**
-     * Sets a flag to tell the design comparator if PIP flags should also be
-     * compared.
-     * 
-     * @param comparePIPs Desired flag value (default: true).
+     * Set the predicate for the design comparator if PIPs should be compared for the given Net.
+     *
+     * @param predicate Predicate.
      */
-    public void setComparePIPs(boolean comparePIPs) {
-        this.comparePIPs = comparePIPs;
+    public void setComparePIPs(Predicate<Net> predicate) {
+        this.comparePIPs = predicate;
     }
 
     /**
@@ -207,7 +206,7 @@ public void setComparePIPs(boolean comparePIPs) {
      * 
      * @return True if the flag is set, false otherwise (default: true).
      */
-    public boolean comparePlacement() {
+    public boolean getComparePlacement() {
         return comparePlacement;
     }
 
@@ -352,7 +351,7 @@ private Map<String, PIP> getPIPMap(Net net) {
     public int compareNets(Net gold, Net test) {
         int init = getDiffCount();
 
-        if (!comparePIPs) {
+        if (!comparePIPs.test(gold) && !comparePIPs.test(test)) {
             return getDiffCount() - init;
         }