Merge pull request #8855 from AcKoucher/mpl-fix-best-result

mpl: remove unneeded checks and fix condition to store best result

Author: maliberty

src/mpl/src/SimulatedAnnealingCore.cpp

@@ -730,8 +730,8 @@ void SimulatedAnnealingCore<T>::fastSA()
         continue;
       }
 
-      const bool improved = cost < pre_cost || best_result_.empty();
-      if ((!is_best_result_valid_ || is_valid) && improved) {
+      const bool found_new_best_result = cost < best_result_.cost;
+      if ((!is_best_result_valid_ || is_valid) && found_new_best_result) {
         updateBestResult(cost);
         is_best_result_valid_ = is_valid;
       }
@@ -766,9 +766,8 @@ void SimulatedAnnealingCore<T>::fastSA()
   calPenalty();
   cost = calNormCost();
 
-  const bool is_valid = isValid();
-  const bool improved = cost < best_result_.cost || best_result_.empty();
-  if ((is_best_result_valid_ && !is_valid) || !improved) {
+  const bool found_new_best_result = cost < best_result_.cost;
+  if ((is_best_result_valid_ && !isValid()) || !found_new_best_result) {
     useBestResult();
   }
 }

src/mpl/test/boundary_push1.defok

@@ -183,10 +183,10 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 4 ;
-    - MACRO_1 HM_100x100_1x1 + FIXED ( 239440 610 ) S ;
-    - MACRO_2 HM_100x100_1x1 + FIXED ( 600 241970 ) S ;
+    - MACRO_1 HM_100x100_1x1 + FIXED ( 239440 241970 ) S ;
+    - MACRO_2 HM_100x100_1x1 + FIXED ( 239440 610 ) S ;
     - MACRO_3 HM_100x100_1x1 + FIXED ( 600 610 ) S ;
-    - MACRO_4 HM_100x100_1x1 + FIXED ( 239440 241970 ) S ;
+    - MACRO_4 HM_100x100_1x1 + FIXED ( 600 241970 ) S ;
 END COMPONENTS
 PINS 4 ;
     - io_1 + NET io_1 + DIRECTION INPUT + USE SIGNAL ;

src/mpl/test/boundary_push2.defok

@@ -183,8 +183,8 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 54 ;
-    - MACRO_1 HM_100x100_1x1 + FIXED ( 239440 18530 ) S ;
-    - MACRO_2 HM_100x100_1x1 + FIXED ( 600 219570 ) S ;
+    - MACRO_1 HM_100x100_1x1 + FIXED ( 600 219570 ) S ;
+    - MACRO_2 HM_100x100_1x1 + FIXED ( 239440 18530 ) S ;
     - MACRO_3 HM_100x100_1x1 + FIXED ( 600 18530 ) S ;
     - MACRO_4 HM_100x100_1x1 + FIXED ( 239440 219570 ) S ;
     - _001_ DFF_X1 + PLACED ( 197971 217497 ) N ;

src/mpl/test/boundary_push3.defok

@@ -183,10 +183,10 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 54 ;
-    - MACRO_1 HM_100x100_1x1 + FIXED ( 18200 610 ) S ;
-    - MACRO_2 HM_100x100_1x1 + FIXED ( 18200 241970 ) S ;
-    - MACRO_3 HM_100x100_1x1 + FIXED ( 219400 241970 ) S ;
-    - MACRO_4 HM_100x100_1x1 + FIXED ( 219400 610 ) S ;
+    - MACRO_1 HM_100x100_1x1 + FIXED ( 219400 610 ) S ;
+    - MACRO_2 HM_100x100_1x1 + FIXED ( 219400 241970 ) S ;
+    - MACRO_3 HM_100x100_1x1 + FIXED ( 18200 610 ) S ;
+    - MACRO_4 HM_100x100_1x1 + FIXED ( 18200 241970 ) S ;
     - _001_ DFF_X1 + PLACED ( 215573 199801 ) N ;
     - _002_ DFF_X1 + PLACED ( 215573 199801 ) N ;
     - _003_ DFF_X1 + PLACED ( 215573 199801 ) N ;

src/mpl/test/guides1.defok

@@ -339,16 +339,16 @@ TRACKS Y 140 DO 282 STEP 3200 LAYER metal9 ;
 TRACKS X 190 DO 282 STEP 3200 LAYER metal10 ;
 TRACKS Y 140 DO 282 STEP 3200 LAYER metal10 ;
 COMPONENTS 10 ;
-    - U1 HM_100x400_4x4 + FIXED ( 665880 16590 ) FN ;
+    - U1 HM_100x400_4x4 + FIXED ( 665880 16610 ) S ;
     - U10 HM_100x100_1x1 + FIXED ( 17880 448450 ) S ;
-    - U2 HM_100x100_1x1 + FIXED ( 17880 16550 ) FN ;
-    - U3 HM_100x100_1x1 + FIXED ( 17880 664470 ) FN ;
-    - U4 HM_100x100_1x1 + FIXED ( 17880 232430 ) FN ;
+    - U2 HM_100x100_1x1 + FIXED ( 233880 664610 ) S ;
+    - U3 HM_100x100_1x1 + FIXED ( 233880 232430 ) FN ;
+    - U4 HM_100x100_1x1 + FIXED ( 17880 232570 ) S ;
     - U5 HM_100x100_1x1 + FIXED ( 233880 448450 ) S ;
-    - U6 HM_100x400_4x4 + FIXED ( 449880 16590 ) N ;
-    - U7 HM_100x100_1x1 + FIXED ( 233880 16550 ) N ;
-    - U8 HM_100x100_1x1 + FIXED ( 233880 664610 ) FS ;
-    - U9 HM_100x100_1x1 + FIXED ( 233880 232430 ) N ;
+    - U6 HM_100x400_4x4 + FIXED ( 449880 16610 ) FS ;
+    - U7 HM_100x100_1x1 + FIXED ( 17880 664610 ) S ;
+    - U8 HM_100x100_1x1 + FIXED ( 233880 16550 ) N ;
+    - U9 HM_100x100_1x1 + FIXED ( 17880 16550 ) N ;
 END COMPONENTS
 NETS 12 ;
     - w1 ( U2 I1 ) ( U1 O1 ) + USE SIGNAL ;