Merge remote-tracking branch 'origin/master' into bmap

Author: gadfort

src/gui/src/mainWindow.cpp

@@ -1870,7 +1870,17 @@ void MainWindow::showGlobalConnect()
 
 void MainWindow::openDesign()
 {
-  const QString filefilter = "OpenDB (*.odb *.ODB)";
+  const std::vector<QString> exts{".odb", ".odb.gz", ".db", ".db.gz"};
+
+  QString filefilter = "OpenDB (";
+  for (const auto& ext : exts) {
+    if (filefilter.length() != 8) {
+      filefilter += " ";
+    }
+    filefilter += "*" + ext;
+    filefilter += " *" + ext.toUpper();
+  }
+  filefilter += ")";
   const QString file = QFileDialog::getOpenFileName(
       this, "Open Design", QString(), filefilter);
 
@@ -1879,15 +1889,21 @@ void MainWindow::openDesign()
   }
 
   try {
-    if (file.endsWith(".odb", Qt::CaseInsensitive)) {
-      open_->setEnabled(false);
-      ord::OpenRoad::openRoad()->readDb(file.toStdString().c_str());
-      logger_->warn(utl::GUI,
-                    77,
-                    "Timing data is not stored in {} and must be loaded "
-                    "separately, if needed.",
-                    file.toStdString());
-    } else {
+    bool found = false;
+    for (const auto& ext : exts) {
+      if (file.endsWith(ext, Qt::CaseInsensitive)) {
+        open_->setEnabled(false);
+        ord::OpenRoad::openRoad()->readDb(file.toStdString().c_str());
+        logger_->warn(utl::GUI,
+                      77,
+                      "Timing data is not stored in {} and must be loaded "
+                      "separately, if needed.",
+                      file.toStdString());
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
       logger_->error(utl::GUI, 76, "Unknown filetype: {}", file.toStdString());
     }
   } catch (const std::exception&) {
@@ -1898,7 +1914,17 @@ void MainWindow::openDesign()
 
 void MainWindow::saveDesign()
 {
-  const QString filefilter = "OpenDB (*.odb *.ODB)";
+  const std::vector<QString> exts{".odb", ".odb.gz"};
+
+  QString filefilter = "OpenDB (";
+  for (const auto& ext : exts) {
+    if (filefilter.length() != 8) {
+      filefilter += " ";
+    }
+    filefilter += "*" + ext;
+    filefilter += " *" + ext.toUpper();
+  }
+  filefilter += ")";
   const QString file = QFileDialog::getSaveFileName(
       this, "Save Design", QString(), filefilter);
 

src/pad/src/PadPlacer.cpp

@@ -912,7 +912,7 @@ void PlacerPadPlacer::placeInstanceSimple(odb::dbInst* inst,
 
 std::map<odb::dbInst*, int> PlacerPadPlacer::initialPoolMapping() const
 {
-  const auto insts = getInsts();
+  const auto& insts = getInsts();
 
   std::vector<float> position(insts.size());
   for (int i = 0; i < insts.size(); i++) {
@@ -1076,7 +1076,7 @@ std::map<odb::dbInst*, int> PlacerPadPlacer::poolAdjacentViolators(
     const std::map<odb::dbInst*, int>& initial_positions) const
 {
   const double dbus = getBlock()->getDbUnitsPerMicron();
-  const auto insts = getInsts();
+  const auto& insts = getInsts();
   std::vector<float> weights(insts.size());
   std::fill(weights.begin(), weights.end(), 1.0);
 
@@ -1201,8 +1201,7 @@ bool PlacerPadPlacer::padSpreading(
 {
   bool has_violations = false;
 
-  const auto insts = getInsts();
-  const auto inst_widths = getInstWidths();
+  const auto& insts = getInsts();
   const double dbus = getBlock()->getDbUnitsPerMicron();
   const int site_width = getRow()->getSpacing();
 
@@ -1351,8 +1350,7 @@ bool PlacerPadPlacer::padSpreading(
 std::map<odb::dbInst*, int> PlacerPadPlacer::padSpreading(
     const std::map<odb::dbInst*, int>& initial_positions) const
 {
-  const auto insts = getInsts();
-  const auto inst_widths = getInstWidths();
+  const auto& inst_widths = getInstWidths();
 
   // Snap all positions to row index
   std::map<odb::dbInst*, std::unique_ptr<InstAnchors>> positions;