Fix assertions

Signed-off-by: Eddie Hung <[email protected]>

Author: eddieh-xlnx

src/com/xilinx/rapidwright/rwroute/RouteNode.java

@@ -219,10 +219,10 @@ private void setBaseCost(Series series) {
                             if (series == Series.UltraScalePlus || series == Series.UltraScale) {
                                 if (wireName.charAt(0) == 'E' || wireName.charAt(0) == 'W') {
                                     // Horizontal doubles can U-turn to get length 0
-                                    assert(enableComprehensiveAssertions && wireName.matches("(EE|WW)2_[EW]_BEG[0-7]"));
+                                    assert(!enableComprehensiveAssertions || wireName.matches("(EE|WW)2_[EW]_BEG[0-7]"));
                                 } else {
                                     // Two specific vertical doubles have an extra PIP
-                                    assert(enableComprehensiveAssertions && wireName.matches("(NN|SS)2_[EW]_BEG0"));
+                                    assert(!enableComprehensiveAssertions || wireName.matches("(NN|SS)2_[EW]_BEG0"));
                                 }
                             }
                             assert(!getAllDownhillPIPs().isEmpty());

src/com/xilinx/rapidwright/rwroute/RouteNodeGraph.java

@@ -480,7 +480,7 @@ private void populateLagunaLookups(Device device, Tile[][] lagunaTiles) {
                                 if (inode.getTile() != imux.getTile()) {
                                     continue;
                                 }
-                                assert(enableComprehensiveAssertions && inodePattern.matcher(inode.getWireName()).matches());
+                                assert(!enableComprehensiveAssertions || inodePattern.matcher(inode.getWireName()).matches());
 
                                 for (Node intInt : inode.getAllUphillNodes()) {
                                     if (intInt.getTile() != inode.getTile()) {
@@ -490,7 +490,7 @@ private void populateLagunaLookups(Device device, Tile[][] lagunaTiles) {
                                         continue;
                                     }
                                     if (!intIntPattern.matcher(intInt.getWireName()).matches()) {
-                                        assert(enableComprehensiveAssertions && singlePattern.matcher(intInt.getWireName()).matches());
+                                        assert(!enableComprehensiveAssertions || singlePattern.matcher(intInt.getWireName()).matches());
                                         continue;
                                     }
                                     bs[1].set(intInt.getWireIndex());
@@ -502,11 +502,11 @@ private void populateLagunaLookups(Device device, Tile[][] lagunaTiles) {
                                         assert(sdq.getIntentCode() == IntentCode.NODE_LOCAL);
 
                                         if (sdq.getTile() != intInt.getTile()) {
-                                            assert(enableComprehensiveAssertions && sdqNodeFtPattern.matcher(sdq.getWireName()).matches());
+                                            assert(!enableComprehensiveAssertions || sdqNodeFtPattern.matcher(sdq.getWireName()).matches());
                                             continue;
                                         }
                                         // The following assertion is expected to hold, but commented out for performance reasons
-                                        assert(enableComprehensiveAssertions && sdqNodePattern.matcher(sdq.getWireName()).matches());
+                                        assert(!enableComprehensiveAssertions || sdqNodePattern.matcher(sdq.getWireName()).matches());
                                         bs[1].set(sdq.getWireIndex());
                                     }
                                 }