Merge remote-tracking branch 'upstream/master' into gpl-update-routability-vector

gudeh · gudeh · commit b9781fc9b21a · 2025-05-16T10:24:55.000Z
diff --git a/.github/workflows/github-actions-are-differences-found.yml b/.github/workflows/github-actions-are-differences-found.yml
@@ -0,0 +1,20 @@
+name: Check that OK files are up to date
+
+on:
+  pull_request:
+
+jobs:
+  diffs:
+    runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check ok files
+        run: |
+          set +e
+          grep --include="*.ok" -Rn "Differences found "
+          if [[ "$?" == "0" ]]; then
+            exit 1
+          fi
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -55,7 +55,7 @@ _installCommonDev() {
     # tools versions
     osName="linux"
     if [[ "${arch}" == "aarch64" ]]; then
-        cmakeChecksum="6a6af752af4b1eae175e1dd0459ec850"
+        cmakeChecksum="938ea8e8ecbcef24f33a7d286a00541c"
     else
         cmakeChecksum="f4d3e86abf624d73ee8dae826bbd6121"
     fi
diff --git a/src/dbSta/test/report_cell_usage_modinsts_metrics.jsonok b/src/dbSta/test/report_cell_usage_modinsts_metrics.jsonok
@@ -11,10 +11,10 @@
 	"design__instance__area__class:sequential_cell__in_module:block1": 1000,
 	"design__instance__count__in_module:block1": 3,
 	"design__instance__area__in_module:block1": 3000,
-	"design__instance__count__class:buffer__in_module:block1.b2": 2,
-	"design__instance__area__class:buffer__in_module:block1.b2": 2000,
-	"design__instance__count__class:sequential_cell__in_module:block1.b2": 1,
-	"design__instance__area__class:sequential_cell__in_module:block1.b2": 1000,
-	"design__instance__count__in_module:block1.b2": 3,
-	"design__instance__area__in_module:block1.b2": 3000
+	"design__instance__count__class:buffer__in_module:block1_b2": 2,
+	"design__instance__area__class:buffer__in_module:block1_b2": 2000,
+	"design__instance__count__class:sequential_cell__in_module:block1_b2": 1,
+	"design__instance__area__class:sequential_cell__in_module:block1_b2": 1000,
+	"design__instance__count__in_module:block1_b2": 3,
+	"design__instance__area__in_module:block1_b2": 3000
 }
diff --git a/src/dbSta/test/report_cell_usage_modinsts_metrics.ok b/src/dbSta/test/report_cell_usage_modinsts_metrics.ok
@@ -25,6 +25,4 @@ Cell type report:                       Count       Area
 Cell instance report:
   snl_bufx1                                 2    2000.00
   snl_ffqx1                                 1    1000.00
-Differences found at line 14.
-	"design__instance__count__class:buffer__in_module:block1.b2": 2,
-	"design__instance__count__class:buffer__in_module:block1_b2": 2,
+No differences found.
diff --git a/src/gpl/test/simple01-td-tune.defok b/src/gpl/test/simple01-td-tune.defok
diff --git a/src/gpl/test/simple01-td-tune.ok b/src/gpl/test/simple01-td-tune.ok
@@ -169,6 +169,4 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-1008]     - For 80% usage of free space: 0.6400
 [INFO GPL-1009]     - For 50% usage of free space: 1.0240
 worst slack max 1.40
-Differences found at line 63.
-    - _276_ NOR2_X4 + PLACED ( 8992 31218 ) N ;
-    - _276_ NOR2_X4 + PLACED ( 5382 29224 ) N ;
+No differences found.
diff --git a/src/gpl/test/simple01-td.defok b/src/gpl/test/simple01-td.defok
diff --git a/src/gpl/test/simple01-td.ok b/src/gpl/test/simple01-td.ok
@@ -152,6 +152,4 @@ Iteration | Overflow |     HPWL (um) |  HPWL(%) |   Penalty | Group
 [INFO GPL-1008]     - For 80% usage of free space: 0.6396
 [INFO GPL-1009]     - For 50% usage of free space: 1.0234
 worst slack max 1.40
-Differences found at line 63.
-    - _276_ NOR2_X4 + PLACED ( 9098 31400 ) N ;
-    - _276_ NOR2_X4 + PLACED ( 9983 31947 ) N ;
+No differences found.
diff --git a/src/gui/src/clockWidget.cpp b/src/gui/src/clockWidget.cpp
@@ -47,6 +47,7 @@ namespace gui {
 ClockTreeRenderer::ClockTreeRenderer(ClockTree* tree)
     : tree_(tree), max_depth_(1), path_to_(nullptr)
 {
+  addDisplayControl(render_label_, true);
 }
 
 void ClockTreeRenderer::drawObjects(Painter& painter)
@@ -55,6 +56,10 @@ void ClockTreeRenderer::drawObjects(Painter& painter)
     return;
   }
 
+  if (!checkDisplayControl(render_label_)) {
+    return;
+  }
+
   auto* descriptor = Gui::get()->getDescriptor<odb::dbNet*>();
   if (descriptor == nullptr) {
     return;
diff --git a/src/gui/src/clockWidget.h b/src/gui/src/clockWidget.h
@@ -67,6 +67,7 @@ class ClockTreeRenderer : public Renderer
   odb::dbITerm* path_to_;
 
   static constexpr int pen_width_ = 2;
+  static constexpr const char* render_label_ = "Clock trees";
 
   void drawTree(Painter& painter,
                 const Descriptor* descriptor,
diff --git a/src/gui/src/displayControls.cpp b/src/gui/src/displayControls.cpp
@@ -267,6 +267,8 @@ DisplayControls::DisplayControls(QWidget* parent)
 
   auto* root = model_->invisibleRootItem();
 
+  custom_controls_start_ = -1;
+
   auto layers
       = makeParentItem(layers_group_, "Layers", root, Qt::Checked, true);
   view_->expand(layers->index());
@@ -535,6 +537,9 @@ DisplayControls::DisplayControls(QWidget* parent)
 
   connect(
       this, &DisplayControls::colorChanged, this, &DisplayControls::changed);
+
+  custom_controls_start_ = root->rowCount();
+
   // register renderers
   if (gui::Gui::get() != nullptr) {
     for (auto renderer : gui::Gui::get()->renderers()) {
@@ -1241,8 +1246,20 @@ void DisplayControls::save()
 
 void DisplayControls::restore()
 {
+  // Collect current controls in case some were removed after save was called.
+  std::map<std::string, QStandardItem*> all_controls;
+  collectControls(model_->invisibleRootItem(), Visible, all_controls);
+  collectControls(model_->invisibleRootItem(), Selectable, all_controls);
+  std::set<QStandardItem*> controls;
+
+  for (auto& [control_name, control] : all_controls) {
+    controls.insert(control);
+  }
+
   for (auto& [control, state] : saved_state_) {
-    control->setCheckState(state);
+    if (controls.find(control) != controls.end()) {
+      control->setCheckState(state);
+    }
   }
 }
 
@@ -1912,6 +1929,7 @@ void DisplayControls::registerRenderer(Renderer* renderer)
     }
 
     auto& add_rows = custom_controls_[renderer];
+
     add_rows.insert(add_rows.begin(), rows.begin(), rows.end());
   }
 
@@ -1923,6 +1941,22 @@ void DisplayControls::registerRenderer(Renderer* renderer)
       renderer->setSettings(setting->second);
     }
   }
+
+  // Sort custom_controls
+  std::vector<QList<QStandardItem*>> custom_controls;
+  while (model_->invisibleRootItem()->rowCount() > custom_controls_start_) {
+    custom_controls.push_back(
+        model_->takeRow(model_->invisibleRootItem()->rowCount() - 1));
+  }
+  std::stable_sort(custom_controls.begin(),
+                   custom_controls.end(),
+                   [](const QList<QStandardItem*>& list0,
+                      const QList<QStandardItem*>& list1) {
+                     return list0[Name]->text() < list1[Name]->text();
+                   });
+  for (const auto& row : custom_controls) {
+    model_->appendRow(row);
+  }
 }
 
 void DisplayControls::unregisterRenderer(Renderer* renderer)
diff --git a/src/gui/src/displayControls.h b/src/gui/src/displayControls.h
@@ -531,6 +531,7 @@ class DisplayControls : public QDockWidget,
 
   std::map<const odb::dbTechLayer*, ModelRow> layer_controls_;
   std::map<const odb::dbSite*, ModelRow> site_controls_;
+  int custom_controls_start_;
   std::map<Renderer*, std::vector<ModelRow>> custom_controls_;
   std::map<std::string, Renderer::Settings> custom_controls_settings_;
   std::map<QStandardItem*, Qt::CheckState> saved_state_;
diff --git a/src/gui/src/stub_heatMap.cpp b/src/gui/src/stub_heatMap.cpp
@@ -195,4 +195,60 @@ double GlobalRoutingDataSource::getGridYSize() const
   return HeatMapDataSource::getGridYSize();
 }
 
+//////////
+
+HeatMapRenderer::HeatMapRenderer(HeatMapDataSource& datasource)
+    : datasource_(datasource), first_paint_(true)
+{
+}
+
+void HeatMapRenderer::drawObjects(Painter& painter)
+{
+}
+
+std::string HeatMapRenderer::getSettingsGroupName()
+{
+  return groupname_prefix_;
+}
+
+Renderer::Settings HeatMapRenderer::getSettings()
+{
+  return {};
+}
+
+void HeatMapRenderer::setSettings(const Renderer::Settings& settings)
+{
+}
+
+//////////
+PowerDensityDataSource::PowerDensityDataSource(sta::dbSta* sta,
+                                               utl::Logger* logger)
+    : gui::RealValueHeatMapDataSource(logger,
+                                      "W",
+                                      "Power Density",
+                                      "Power",
+                                      "PowerDensity"),
+      sta_(sta)
+{
+}
+
+bool PowerDensityDataSource::populateMap()
+{
+  return false;
+}
+
+void PowerDensityDataSource::combineMapData(bool base_has_value,
+                                            double& base,
+                                            const double new_data,
+                                            const double data_area,
+                                            const double intersection_area,
+                                            const double rect_area)
+{
+}
+
+sta::Corner* PowerDensityDataSource::getCorner() const
+{
+  return nullptr;
+}
+
 }  // namespace gui
diff --git a/src/rcx/src/extRCmodel.cpp b/src/rcx/src/extRCmodel.cpp
@@ -1517,12 +1517,24 @@ extMetRCTable::~extMetRCTable()
     delete _resOver[ii];
     delete _capOver[ii];
     delete _capOverUnder[ii];
+
+    for (uint jj = 0; jj < _wireCnt; jj++) {
+      delete _capOver_open[ii][jj];
+      delete _capUnder_open[ii][jj];
+      delete _capOverUnder_open[ii][jj];
+    }
+    delete[] _capOver_open[ii];
+    delete[] _capUnder_open[ii];
+    delete[] _capOverUnder_open[ii];
   }
   delete[] _resOver;
   delete[] _capOver;
   delete[] _capDiagUnder;
   delete[] _capUnder;
   delete[] _capOverUnder;
+  delete[] _capOver_open;
+  delete[] _capUnder_open;
+  delete[] _capOverUnder_open;
 }
 
 void extMetRCTable::allocDiagUnderTable(uint met,

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ namespace gui {`
`47`	`47`	`ClockTreeRenderer::ClockTreeRenderer(ClockTree* tree)`
`48`	`48`	`: tree_(tree), max_depth_(1), path_to_(nullptr)`
`49`	`49`	`{`
	`50`	`+ addDisplayControl(render_label_, true);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`void ClockTreeRenderer::drawObjects(Painter& painter)`
`@@ -55,6 +56,10 @@ void ClockTreeRenderer::drawObjects(Painter& painter)`
`55`	`56`	`return;`
`56`	`57`	`}`
`57`	`58`
	`59`	`+ if (!checkDisplayControl(render_label_)) {`
	`60`	`+ return;`
	`61`	`+ }`
	`62`	`+`
`58`	`63`	`auto* descriptor = Gui::get()->getDescriptor<odb::dbNet*>();`
`59`	`64`	`if (descriptor == nullptr) {`
`60`	`65`	`return;`