Merge branch 'master' of https://github.com/The-OpenROAD-Project-private/OpenROAD into secure-fix-dbsta-for-read-vcd

Author: jhkim-pii

src/gui/src/dbDescriptors.cpp

@@ -4438,9 +4438,11 @@ Descriptor::Properties DbMarkerCategoryDescriptor::getDBProperties(
 
   odb::dbObject* parent = category->getParent();
   if (parent != top) {
-    if (parent->getObjectType() == odb::dbObjectType::dbBlockObj) {
+    if (parent->getObjectType() == odb::dbObjectType::dbChipObj) {
+      // TODO: fix this
       props.push_back(
-          {"Parent", gui->makeSelected(static_cast<odb::dbBlock*>(parent))});
+          {"Parent",
+           gui->makeSelected(static_cast<odb::dbChip*>(parent)->getBlock())});
     } else {
       props.push_back(
           {"Parent",

src/gui/src/gui.cpp

@@ -97,14 +97,14 @@ static void message_handler(QtMsgType type,
       debugPrint(logger, utl::GUI, "qt", 1, print_msg);
       break;
     case QtInfoMsg:
-      logger->info(utl::GUI, 75, print_msg);
+      logger->info(utl::GUI, 75, "{}", print_msg);
       break;
     case QtWarningMsg:
-      logger->warn(utl::GUI, 76, print_msg);
+      logger->warn(utl::GUI, 76, "{}", print_msg);
       break;
     case QtCriticalMsg:
     case QtFatalMsg:
-      logger->error(utl::GUI, 77, print_msg);
+      logger->error(utl::GUI, 77, "{}", print_msg);
       break;
   }
 }
@@ -1553,7 +1553,7 @@ void Gui::gifEnd()
 
   if (gif_->writer == nullptr) {
     logger_->warn(utl::GUI,
-                  75,
+                  107,
                   "Nothing to save to {}. No frames added to gif.",
                   gif_->filename);
     gif_ = nullptr;

src/gui/src/mainWindow.cpp

@@ -1895,7 +1895,7 @@ void MainWindow::openDesign()
         open_->setEnabled(false);
         ord::OpenRoad::openRoad()->readDb(file.toStdString().c_str());
         logger_->warn(utl::GUI,
-                      77,
+                      109,
                       "Timing data is not stored in {} and must be loaded "
                       "separately, if needed.",
                       file.toStdString());
@@ -1904,7 +1904,7 @@ void MainWindow::openDesign()
       }
     }
     if (!found) {
-      logger_->error(utl::GUI, 76, "Unknown filetype: {}", file.toStdString());
+      logger_->error(utl::GUI, 108, "Unknown filetype: {}", file.toStdString());
     }
   } catch (const std::exception&) {
     // restore option

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 ;