Merge remote-tracking branch 'origin/master' into secure-setup-qor

Author: precisionmoon

src/gui/BUILD

@@ -34,50 +34,74 @@ cc_library(
     ],
 )
 
-qt6_library(
-    name = "gui_qt",
-    srcs = glob(
-        include = [
-            "src/*.cpp",
+# A Qt 'headless' build is added for environments that require GUI features
+# but do not have an attached display. This requires setting 'qt_gui_platform'
+# to `headless`, and subsituting the dependency in the top-level BUILD.
+QT_GUI_PLATFORMS = {
+    "headless": "_headless",
+    "native": "",
+}
+
+[
+    qt6_library(
+        name = "gui_qt" + suffix,
+        srcs = glob(
+            include = [
+                "src/*.cpp",
+            ],
+            exclude = [
+                "src/stub.cpp",
+                "src/stub_heatMap.cpp",
+            ],
+        ) + [
+            ":gui_swig",
+            ":tcl",
         ],
-        exclude = [
-            "src/stub.cpp",
-            "src/stub_heatMap.cpp",
+        hdrs = [
+            "include/gui/MakeGui.h",
+            "include/gui/gui.h",
+            "include/gui/heatMap.h",
         ],
-    ) + [
-        ":gui_swig",
-        ":tcl",
-    ],
+        defines = [
+            "STATIC_QPA_PLUGIN_XCB=1",
+        ],
+        includes = [
+            "include",
+            "src",
+            "ui",
+        ],
+        moc_hdrs = glob(["src/*.h"]),
+        qt_gui_platform = platform,
+        uic_srcs = glob(["ui/*.ui"]) if platform == "native" else [],
+        deps = [
+            ":qt_resources",
+            "//:ord",
+            "//src/dbSta",
+            "//src/dbSta:dbNetwork",
+            "//src/odb",
+            "//src/sta:opensta_lib",
+            "//src/utl",
+            "//third-party/gif-h:gif_h",
+            "@boost.algorithm",
+            "@boost.geometry",
+            "@boost.multi_array",
+            "@boost.stacktrace",
+            "@spdlog",
+            "@tk_tcl//:tcl",
+        ] + ([":uic_lib"] if platform == "headless" else []),
+    )
+    for platform, suffix in QT_GUI_PLATFORMS.items()
+]
+
+# This is used to work around the limitation of the `qt6_library` rule which
+# only supports use of one `qt6_library` rule using `uic_srcs` per package.
+cc_library(
+    name = "uic_lib",
     hdrs = [
-        "include/gui/MakeGui.h",
-        "include/gui/gui.h",
-        "include/gui/heatMap.h",
-    ],
-    defines = [
-        "STATIC_QPA_PLUGIN_XCB=1",
-    ],
-    includes = [
-        "include",
-        "src",
-        "ui",
-    ],
-    moc_hdrs = glob(["src/*.h"]),
-    uic_srcs = glob(["ui/*.ui"]),
-    deps = [
-        ":qt_resources",
-        "//:ord",
-        "//src/dbSta",
-        "//src/dbSta:dbNetwork",
-        "//src/odb",
-        "//src/sta:opensta_lib",
-        "//src/utl",
-        "//third-party/gif-h:gif_h",
-        "@boost.algorithm",
-        "@boost.geometry",
-        "@boost.multi_array",
-        "@boost.stacktrace",
-        "@spdlog",
-        "@tk_tcl//:tcl",
+        ":ui/ui_findDlg.h",
+        ":ui/ui_gotoDlg.h",
+        ":ui/ui_highlightGroupDlg.h",
+        ":ui/ui_selectedWidget.h",
     ],
 )
 

src/mpl/src/clusterEngine.cpp

@@ -1027,46 +1027,57 @@ void ClusteringEngine::buildDataFlowConnections()
     }
 
     const int driver_id = itr->second;
+    Cluster* driver_cluster = tree_->maps.id_to_cluster.at(driver_id);
 
     for (int hops = 0; hops < max_num_of_hops_; hops++) {
       std::set<int> sink_clusters = computeSinks(insts[hops]);
       const float conn_weight = computeConnWeight(hops);
       for (auto& sink : sink_clusters) {
-        tree_->maps.id_to_cluster[driver_id]->addConnection(sink, conn_weight);
-        tree_->maps.id_to_cluster[sink]->addConnection(driver_id, conn_weight);
+        Cluster* sink_cluster = tree_->maps.id_to_cluster.at(sink);
+        connect(driver_cluster, sink_cluster, conn_weight);
       }
     }
   }
 
   // macros to ffs
   for (const auto& [iterm, insts] : data_connections_.macro_pins_and_regs) {
     const int driver_id = tree_->maps.inst_to_cluster_id.at(iterm->getInst());
+    Cluster* driver_cluster = tree_->maps.id_to_cluster.at(driver_id);
 
     for (int hops = 0; hops < max_num_of_hops_; hops++) {
       std::set<int> sink_clusters = computeSinks(insts[hops]);
       const float conn_weight = computeConnWeight(hops);
       for (auto& sink : sink_clusters) {
-        tree_->maps.id_to_cluster[driver_id]->addConnection(sink, conn_weight);
-        tree_->maps.id_to_cluster[sink]->addConnection(driver_id, conn_weight);
+        Cluster* sink_cluster = tree_->maps.id_to_cluster.at(sink);
+        connect(driver_cluster, sink_cluster, conn_weight);
       }
     }
   }
 
   // macros to macros
   for (const auto& [iterm, insts] : data_connections_.macro_pins_and_macros) {
     const int driver_id = tree_->maps.inst_to_cluster_id.at(iterm->getInst());
+    Cluster* driver_cluster = tree_->maps.id_to_cluster.at(driver_id);
 
     for (int hops = 0; hops < max_num_of_hops_; hops++) {
       std::set<int> sink_clusters = computeSinks(insts[hops]);
       const float conn_weight = computeConnWeight(hops);
       for (auto& sink : sink_clusters) {
-        tree_->maps.id_to_cluster[driver_id]->addConnection(sink, conn_weight);
-        tree_->maps.id_to_cluster[sink]->addConnection(driver_id, conn_weight);
+        Cluster* sink_cluster = tree_->maps.id_to_cluster.at(sink);
+        connect(driver_cluster, sink_cluster, conn_weight);
       }
     }
   }
 }
 
+void ClusteringEngine::connect(Cluster* a,
+                               Cluster* b,
+                               const float connection_weight) const
+{
+  a->addConnection(b, connection_weight);
+  b->addConnection(a, connection_weight);
+}
+
 float ClusteringEngine::computeConnWeight(const int hops)
 {
   const float base_remoteness_factor = 2.0;
@@ -1863,7 +1874,7 @@ bool ClusteringEngine::attemptMerge(Cluster* receiver, Cluster* incomer)
       for (const auto& [cluster_id, connection_weight] : incomer_connections) {
         Cluster* cluster = tree_->maps.id_to_cluster.at(cluster_id);
         cluster->removeConnection(incomer_id);
-        cluster->addConnection(receiver->getId(), connection_weight);
+        cluster->addConnection(receiver, connection_weight);
       }
     }
 
@@ -1928,13 +1939,12 @@ void ClusteringEngine::buildNetListConnections()
     if (driver_cluster_id != -1 && !load_clusters_ids.empty()
         && load_clusters_ids.size() < tree_->large_net_threshold) {
       const float weight = net_has_io_pin ? tree_->virtual_weight : 1.0;
+      Cluster* driver_cluster = tree_->maps.id_to_cluster.at(driver_cluster_id);
 
       for (const int load_cluster_id : load_clusters_ids) {
-        if (load_cluster_id != driver_cluster_id) { /* undirected connection */
-          tree_->maps.id_to_cluster[driver_cluster_id]->addConnection(
-              load_cluster_id, weight);
-          tree_->maps.id_to_cluster[load_cluster_id]->addConnection(
-              driver_cluster_id, weight);
+        if (load_cluster_id != driver_cluster_id) {
+          Cluster* load_cluster = tree_->maps.id_to_cluster.at(load_cluster_id);
+          connect(driver_cluster, load_cluster, weight);
         }
       }
     }

src/mpl/src/clusterEngine.h

@@ -241,6 +241,7 @@ class ClusteringEngine
   void clearConnections();
   void buildNetListConnections();
   void buildDataFlowConnections();
+  void connect(Cluster* a, Cluster* b, float connection_weight) const;
 
   // Methods for data flow
   void createDataFlow();

src/mpl/src/object.cpp

@@ -568,13 +568,9 @@ void Cluster::initConnection()
   connections_map_.clear();
 }
 
-void Cluster::addConnection(int cluster_id, float weight)
+void Cluster::addConnection(Cluster* cluster, const float connection_weight)
 {
-  if (connections_map_.find(cluster_id) == connections_map_.end()) {
-    connections_map_[cluster_id] = weight;
-  } else {
-    connections_map_[cluster_id] += weight;
-  }
+  connections_map_[cluster->getId()] += connection_weight;
 }
 
 void Cluster::removeConnection(int cluster_id)

src/mpl/src/object.h

@@ -209,7 +209,7 @@ class Cluster
 
   // Connection signature support
   void initConnection();
-  void addConnection(int cluster_id, float weight);
+  void addConnection(Cluster* cluster, float connection_weight);
   void removeConnection(int cluster_id);
   const ConnectionsMap& getConnectionsMap() const;
   bool isSameConnSignature(const Cluster& cluster, float net_threshold);

src/odb/src/db/dbModInst.cpp

@@ -664,7 +664,8 @@ dbModInst* dbModInst::swapMaster(dbModule* new_module)
   // Remove any dangling nets
   std::vector<dbNet*> nets_to_delete;
   for (dbNet* net : parent->getOwner()->getNets()) {
-    if (net->getITerms().empty()) {
+    if (net->getITerms().empty() && net->getBTerms().empty()
+        && !net->isSpecial()) {
       nets_to_delete.emplace_back(net);
     }
   }

src/rsz/README.md

@@ -1,13 +1,17 @@
-# Gate Resizer
+#Gate Resizer
 
-Gate Resizer commands are described below.  The `resizer` commands stop when
-the design area is `-max_utilization util` percent of the core area. `util`
-is between 0 and 100.  The `resizer` stops and reports an error if the max
-utilization is exceeded.
+Gate Resizer commands are described below.The `resizer` commands stop when the
+            design area is `
+        - max_utilization util` percent of the core area. `util` is between 0
+    and 100. The `resizer` stops and reports an error if the max utilization is
+            exceeded.
 
-## Commands
+        ##Commands
 
-```{note}
+```
+{
+  note
+}
 - Parameters in square brackets `[-param param]` are optional.
 - Parameters without square brackets `-param2 param2` are required.
 ```
@@ -247,7 +251,7 @@ repair_timing
 | `-setup_margin` | Add additional setup slack margin. |
 | `-hold_margin` | Add additional hold slack margin. |
 | `-allow_setup_violations` | While repairing hold violations, buffers are not inserted that will cause setup violations unless `-allow_setup_violations` is specified. |
-| `-sequence` | Specify a particular order of setup timing optimizations. The default is "unbuffer,sizeup,swap,buffer,clone,split". Obeys skip flags also. |
+| `-sequence` | Specify a particular order of setup timing optimizations. The default is "unbuffer,vt_swap,sizeup,swap,buffer,clone,split". Obeys skip flags also. |
 | `-skip_pin_swap` | Flag to skip pin swap. The default is to perform pin swap transform during setup fixing. |
 | `-skip_gate_cloning` | Flag to skip gate cloning. The default is to perform gate cloning transform during setup fixing. |
 | `-skip_size_down` | Flag to skip gate down sizing. The default is to perform non-critical fanout gate down sizing transform during setup fixing. |
@@ -603,7 +607,7 @@ buffer_ports
 repair_design -max_wire_length 100
 repair_tie_fanout LOGIC0_X1/Z
 repair_tie_fanout LOGIC1_X1/Z
-# clock tree synthesis...
+#clock tree synthesis...
 repair_timing
 ```
 

src/rsz/src/RepairSetup.cc

@@ -460,7 +460,14 @@ bool RepairSetup::repairSetup(const float setup_slack_margin,
 
   if (!skip_last_gasp) {
     // do some last gasp setup fixing before we give up
-    OptoParams params(setup_slack_margin, verbose);
+    OptoParams params(setup_slack_margin,
+                      verbose,
+                      skip_pin_swap,
+                      skip_gate_cloning,
+                      skip_size_down,
+                      skip_buffering,
+                      skip_buffer_removal,
+                      skip_vt_swap);
     params.iteration = opto_iteration;
     params.initial_tns = initial_tns;
     repairSetupLastGasp(params, num_viols);
@@ -850,10 +857,14 @@ bool RepairSetup::terminateProgress(const int iteration,
 void RepairSetup::repairSetupLastGasp(const OptoParams& params, int& num_viols)
 {
   move_sequence.clear();
-  move_sequence = {resizer_->vt_swap_speed_move_.get(),
-                   resizer_->size_up_match_move_.get(),
-                   resizer_->size_up_move_.get(),
-                   resizer_->swap_pins_move_.get()};
+  if (!params.skip_vt_swap) {
+    move_sequence.push_back(resizer_->vt_swap_speed_move_.get());
+  }
+  move_sequence.push_back(resizer_->size_up_match_move_.get());
+  move_sequence.push_back(resizer_->size_up_move_.get());
+  if (!params.skip_pin_swap) {
+    move_sequence.push_back(resizer_->swap_pins_move_.get());
+  }
 
   // Sort remaining failing endpoints
   const VertexSet* endpoints = sta_->endpoints();

src/rsz/src/RepairSetup.hh

@@ -58,9 +58,29 @@ struct OptoParams
   float initial_tns;
   const float setup_slack_margin;
   const bool verbose;
-
-  OptoParams(const float margin, const bool verbose)
-      : setup_slack_margin(margin), verbose(verbose)
+  const bool skip_pin_swap;
+  const bool skip_gate_cloning;
+  const bool skip_size_down;
+  const bool skip_buffering;
+  const bool skip_buffer_removal;
+  const bool skip_vt_swap;
+
+  OptoParams(const float margin,
+             const bool verbose,
+             const bool skip_pin_swap,
+             const bool skip_gate_cloning,
+             const bool skip_size_down,
+             const bool skip_buffering,
+             const bool skip_buffer_removal,
+             const bool skip_vt_swap)
+      : setup_slack_margin(margin),
+        verbose(verbose),
+        skip_pin_swap(skip_pin_swap),
+        skip_gate_cloning(skip_gate_cloning),
+        skip_size_down(skip_size_down),
+        skip_buffering(skip_buffering),
+        skip_buffer_removal(skip_buffer_removal),
+        skip_vt_swap(skip_vt_swap)
   {
     iteration = 0;
     initial_tns = 0.0;

src/rsz/test/BUILD

@@ -63,6 +63,7 @@ TESTS = [
     "repair_fanout6_multi",
     "repair_fanout7",
     "repair_fanout7_multi",
+    "repair_fanout7_skip_pin_swap",
     "repair_fanout8",
     "repair_fanout8_multi",
     "repair_hold1",
@@ -203,6 +204,7 @@ filegroup(
 extra_deps = {
     "repair_fanout6_multi": ["repair_fanout6.tcl"],
     "repair_fanout7_multi": ["repair_fanout7.tcl"],
+    "repair_fanout7_skip_pin_swap": ["repair_fanout7.tcl"],
     "repair_fanout8_multi": ["repair_fanout8.tcl"],
     "repair_setup1_multi": ["repair_setup1.tcl"],
     "repair_setup2_multi": ["repair_setup2.tcl"],