More tweaking

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

Author: eddieh-xlnx

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

@@ -144,7 +144,7 @@ protected void setChildren(RuntimeTracker setChildrenTimer) {
     }
 
     private void setBaseCost() {
-        baseCost = 0.1f;
+        baseCost = 0.2f;
         switch (type) {
             case WIRE:
                 // NOTE: IntentCode is device-dependent
@@ -163,26 +163,26 @@ private void setBaseCost() {
                         break;
                     case NODE_SINGLE:
                         if (length != 0) {
-                            baseCost = 0.8f;
+                            baseCost = 1.0f;
                         }
                         break;
                     case NODE_DOUBLE:
                         if (endTileXCoordinate == getTile().getTileXCoordinate()) {
                             // (NN|SS)2_[EW]_BEG[0-7]
-                            baseCost = 1.2f;
+                            baseCost = 1.25f;
                         } else {
                             // (EE|WW)2_[EW]_BEG[0-7]
-                            baseCost = 0.8f;
+                            baseCost = 1.0f;
                         }
                         break;
                     case NODE_HQUAD:
-                        baseCost = 0.6f;
+                        baseCost = 0.8f;
                         break;
                     case NODE_VQUAD:
                         baseCost = 1.0f;
                         break;
                     case NODE_HLONG:
-                        baseCost = 0.5f;
+                        baseCost = 0.7f;
                         break;
                     case NODE_VLONG:
                         baseCost = 0.8f;

test/src/com/xilinx/rapidwright/rwroute/TestRWRoute.java

@@ -273,35 +273,35 @@ void testSingleConnectionHelper(String partName,
             // One SLR crossing
             // (Too) Close
             "SLICE_X9Y299,SLICE_X9Y300,300",    // On Laguna column
-            "SLICE_X9Y300,SLICE_X9Y299,100",
-            "SLICE_X0Y299,SLICE_X0Y300,300",    // Far from Laguna column
-            "SLICE_X0Y300,SLICE_X0Y299,300",
-            "SLICE_X53Y299,SLICE_X53Y300,100",  // Equidistant from two Laguna columns
-            "SLICE_X53Y300,SLICE_X53Y299,100",
+            "SLICE_X9Y300,SLICE_X9Y299,200",
+            "SLICE_X0Y299,SLICE_X0Y300,200",    // Far from Laguna column
+            "SLICE_X0Y300,SLICE_X0Y299,400",
+            "SLICE_X53Y299,SLICE_X53Y300,300",  // Equidistant from two Laguna columns
+            "SLICE_X53Y300,SLICE_X53Y299,300",
             // Perfect
             "SLICE_X9Y241,SLICE_X9Y300,200",
             "SLICE_X9Y300,SLICE_X9Y241,100",
             "SLICE_X9Y358,SLICE_X9Y299,100",
             "SLICE_X9Y299,SLICE_X9Y358,200",
-            "SLICE_X53Y241,SLICE_X69Y300,200",
-            "SLICE_X53Y358,SLICE_X69Y299,100",
+            "SLICE_X53Y241,SLICE_X69Y300,400",
+            "SLICE_X53Y358,SLICE_X69Y299,300",
             // Far
             "SLICE_X9Y240,SLICE_X9Y359,100",    // On Laguna
             "SLICE_X9Y359,SLICE_X9Y240,200",
-            "SLICE_X162Y240,SLICE_X162Y430,200",
-            "SLICE_X162Y430,SLICE_X162Y240,200",
+            "SLICE_X162Y240,SLICE_X162Y430,400",
+            "SLICE_X162Y430,SLICE_X162Y240,100",
             "SLICE_X0Y240,SLICE_X12Y430,200",   // Far from Laguna
             "SLICE_X0Y430,SLICE_X12Y240,200",
 
             // Two SLR crossings
             "SLICE_X162Y299,SLICE_X162Y599,400",
-            "SLICE_X162Y599,SLICE_X162Y299,300",
+            "SLICE_X162Y599,SLICE_X162Y299,500",
 
             // Three SLR crossings
             "SLICE_X79Y0,SLICE_X79Y899,300",    // Straight up: next to Laguna column
-            "SLICE_X0Y0,SLICE_X0Y899,300",      // Straight up: far from Laguna column
-            "SLICE_X168Y0,SLICE_X168Y899,300",  // Straight up: far from Laguna column
-            "SLICE_X9Y0,SLICE_X162Y899,400",   // Up and right
+            "SLICE_X0Y0,SLICE_X0Y899,500",      // Straight up: far from Laguna column
+            "SLICE_X168Y0,SLICE_X168Y899,400",  // Straight up: far from Laguna column
+            "SLICE_X9Y0,SLICE_X162Y899,400",    // Up and right
             "SLICE_X168Y162,SLICE_X9Y899,400",  // Up and left
     })
     public void testSLRCrossingNonTimingDriven(String srcSiteName, String dstSiteName, long nodesPoppedLimit) {