Merge remote-tracking branch 'origin/master' into dpl-remove-pad-fillers

Author: gadfort

README.md

@@ -329,7 +329,7 @@ save_flow_metrics_limits <TEST_NAME>
 
 ``` text
 openroad [-help] [-version] [-no_init] [-exit] [-gui]
-         [-threads count|max] [-log file_name] cmd_file
+         [-threads count|max] [-log file_name] [-db file_name] cmd_file
   -help              show help and exit
   -version           show version and exit
   -no_init           do not read .openroad init file
@@ -339,6 +339,7 @@ openroad [-help] [-version] [-no_init] [-exit] [-gui]
   -gui               start in gui mode
   -python            start with python interpreter [limited to db operations]
   -log <file_name>   write a log in <file_name>
+  -db <file_name>    open a .odb database at startup
   cmd_file           source cmd_file
 ```
 

src/Main.cc

@@ -88,6 +88,7 @@ int cmd_argc;
 char** cmd_argv;
 static const char* log_filename = nullptr;
 static const char* metrics_filename = nullptr;
+static const char* read_odb_filename = nullptr;
 static bool no_settings = false;
 static bool minimize = false;
 
@@ -243,6 +244,7 @@ int main(int argc, char* argv[])
     std::filesystem::remove(metrics_filename, err_ignored);
   }
 
+  read_odb_filename = findCmdLineKey(argc, argv, "-db");
   no_settings = findCmdLineFlag(argc, argv, "-no_settings");
   minimize = findCmdLineFlag(argc, argv, "-minimize");
 
@@ -449,6 +451,21 @@ static int tclAppInit(int& argc,
 
     const bool gui_enabled = gui::Gui::enabled();
 
+    if (read_odb_filename) {
+      std::string cmd = fmt::format("read_db {{{}}}", read_odb_filename);
+      if (!gui_enabled) {
+        if (Tcl_Eval(interp, cmd.c_str()) != TCL_OK) {
+          fprintf(stderr,
+                  "Error: failed to read_db %s: %s\n",
+                  read_odb_filename,
+                  Tcl_GetStringResult(interp));
+          exit(1);
+        }
+      } else {
+        gui::Gui::get()->addRestoreStateCommand(cmd);
+      }
+    }
+
     const char* home = getenv("HOME");
     if (!findCmdLineFlag(argc, argv, "-no_init") && home) {
       const char* restore_state_cmd = "include -echo -verbose {{{}}}";
@@ -525,7 +542,7 @@ static void showUsage(const char* prog, const char* init_filename)
 {
   printf("Usage: %s [-help] [-version] [-no_init] [-no_splash] [-exit] ", prog);
   printf("[-gui] [-threads count|max] [-log file_name] [-metrics file_name] ");
-  printf("[-no_settings] [-minimize] cmd_file\n");
+  printf("[-db file_name] [-no_settings] [-minimize] cmd_file\n");
   printf("  -help                 show help and exit\n");
   printf("  -version              show version and exit\n");
   printf("  -no_init              do not read %s init file\n", init_filename);
@@ -543,6 +560,7 @@ static void showUsage(const char* prog, const char* init_filename)
   printf("  -log <file_name>      write a log in <file_name>\n");
   printf(
       "  -metrics <file_name>  write metrics in <file_name> in JSON format\n");
+  printf("  -db <file_name>      open a .odb database at startup\n");
   printf("  cmd_file              source cmd_file\n");
 }
 

src/cts/BUILD

@@ -19,7 +19,6 @@ cc_library(
         "src/CtsObserver.h",
         "src/HTreeBuilder.h",
         "src/LatencyBalancer.h",
-        "src/LevelBalancer.h",
         "src/SinkClustering.h",
         "src/TreeBuilder.h",
         "src/Util.h",
@@ -41,7 +40,6 @@ cc_library(
         "src/CtsOptions.cpp",
         "src/HTreeBuilder.cpp",
         "src/LatencyBalancer.cpp",
-        "src/LevelBalancer.cpp",
         "src/SinkClustering.cpp",
         "src/TechChar.cpp",
         "src/TreeBuilder.cpp",

src/cts/README.md

@@ -151,6 +151,7 @@ set_cts_config
     [-sink_clustering_levels levels]
     [-sink_clustering_max_diameter max_diameter]
     [-sink_clustering_size cluster_size]
+    [-skip_nets <list_of_clk_nets_to_skip>]
     [-tree_buf <buf>]
     [-wire_unit wire_unit]
 ```
@@ -176,6 +177,7 @@ set_cts_config
 | `-sink_clustering_max_diameter` | Specifies maximum diameter (in microns) of sink cluster for the register tree. The allowed values are integers `[0, MAX_INT]`. If this is not specified the diameter will be automatically chosen between `50, 100 or 200`, based on the tree buffer max cap. |
 | `-sink_clustering_size` | Specifies the maximum number of sinks per cluster for the register tree. The allowed values are integers `[0, MAX_INT]`. If this is not specified the size will be automatically chosen between `10, 20 or 30` based on the tree buffer max cap. |
 | `-sink_clustering_levels` | ... |
+| `-skip_nets` | Tcl list containing the clock nets to be skipped (e.g. `{net1, net2}`). If the net is a root clock net, the whole clock is skipped, otherwise only the subnet specified is skipped. |
 | `-wire_unit` | Minimum unit distance between buffers for a specific wire. If this parameter is omitted, the code gets the value from ten times the height of `-root_buffer`. |
 
 ### Report CTS configuration
@@ -208,6 +210,7 @@ reset_cts_config
     [-sink_clustering_levels]
     [-sink_clustering_max_diameter]
     [-sink_clustering_size]
+    [-skip_nets]
     [-tree_buf]
     [-wire_unit]
 ```

src/cts/include/cts/TritonCTS.h

@@ -208,22 +208,6 @@ class TritonCTS
   void setAllClocksPropagated();
   void repairClockNets();
   void balanceMacroRegisterLatencies();
-  float getVertexClkArrival(sta::Vertex* sinkVertex,
-                            odb::dbNet* topNet,
-                            odb::dbITerm* iterm);
-  void computeAveSinkArrivals(TreeBuilder* builder, sta::Graph* graph);
-  void computeSinkArrivalRecur(odb::dbNet* topClokcNet,
-                               odb::dbITerm* iterm,
-                               float& sumArrivals,
-                               unsigned& numSinks,
-                               sta::Graph* graph);
-  bool propagateClock(odb::dbITerm* input);
-  void adjustLatencies(TreeBuilder* macroBuilder, TreeBuilder* registerBuilder);
-  void computeTopBufferDelay(TreeBuilder* builder);
-  odb::dbInst* insertDelayBuffer(odb::dbInst* driver,
-                                 const std::string& clockName,
-                                 int locX,
-                                 int locY);
 
   sta::dbSta* openSta_ = nullptr;
   sta::dbNetwork* network_ = nullptr;

src/cts/src/CMakeLists.txt

@@ -14,7 +14,6 @@ add_library(cts_lib
     TechChar.cpp
     TritonCTS.cpp
     Clustering.cpp
-    LevelBalancer.cpp
     LatencyBalancer.cpp
     CtsOptions.cpp
 )

src/cts/src/CtsOptions.h

@@ -125,6 +125,17 @@ class CtsOptions : public odb::dbBlockCallBackObj
     clockNetsObjs_ = nets;
   }
   std::vector<odb::dbNet*> getClockNetsObjs() const { return clockNetsObjs_; }
+  void setSkipNets(odb::dbNet* nets) { skipNets_.push_back(nets); }
+  std::vector<odb::dbNet*> getSkipNets() const { return skipNets_; }
+  std::string getSkipNetsToString() const
+  {
+    std::ostringstream skip_nets_names;
+    for (const odb::dbNet* db_net : skipNets_) {
+      skip_nets_names << db_net->getConstName() << " ";
+    }
+    return skip_nets_names.str();
+  }
+  void resetSkipNets() { skipNets_.clear(); }
   void setMetricsFile(const std::string& metricFile)
   {
     metricFile_ = metricFile;
@@ -266,8 +277,6 @@ class CtsOptions : public odb::dbBlockCallBackObj
     return macroSinkClustersSizeSet_;
   }
   unsigned getNumStaticLayers() const { return numStaticLayers_; }
-  void setBalanceLevels(bool balance) { balanceLevels_ = balance; }
-  bool getBalanceLevels() const { return balanceLevels_; }
   void setNumStaticLayers(unsigned num) { numStaticLayers_ = num; }
   void resetNumStaticLayers() { numStaticLayers_ = 0; }
   void setSinkBuffer(const std::string& buffer) { sinkBuffer_ = buffer; }
@@ -389,11 +398,11 @@ class CtsOptions : public odb::dbBlockCallBackObj
   bool macroMaxDiameterSet_ = false;
   unsigned macroSinkClustersSize_ = 4;
   bool macroSinkClustersSizeSet_ = true;
-  bool balanceLevels_ = false;
   unsigned sinkClusteringLevels_ = 0;
   unsigned numStaticLayers_ = 0;
   std::vector<std::string> bufferList_;
   std::vector<odb::dbNet*> clockNetsObjs_;
+  std::vector<odb::dbNet*> skipNets_;
   utl::Logger* logger_ = nullptr;
   stt::SteinerTreeBuilder* sttBuilder_ = nullptr;
   bool obsAware_ = true;

src/cts/src/LatencyBalancer.cpp

@@ -45,8 +45,6 @@ int LatencyBalancer::run()
                 33,
                 "Balancing latency for clock {}",
                 root_->getClock().getSdcName());
-  worseDelay_ = std::numeric_limits<float>::min();
-  delayBufIndex_ = 0;
   initSta();
   findLeafBuilders(root_);
   buildGraph(root_->getTopInputNet());
@@ -136,8 +134,8 @@ void LatencyBalancer::buildGraph(odb::dbNet* clkInputNet)
   }
   int builderSrcId = graph_.size();
   GraphNode builderSrcNode
-      = GraphNode(builderSrcId, rootSrcName, rootOutputITerm);
-  graph_.push_back(builderSrcNode);
+      = GraphNode(builderSrcId, std::move(rootSrcName), rootOutputITerm);
+  graph_.push_back(std::move(builderSrcNode));
 
   std::stack<int> visitNode;
   visitNode.push(builderSrcId);
@@ -164,7 +162,7 @@ void LatencyBalancer::buildGraph(odb::dbNet* clkInputNet)
         odb::dbInst* sinkInst = sinkIterm->getInst();
         std::string sinkName = sinkInst->getName();
         GraphNode sinkNode = GraphNode(sinkId, sinkName, sinkIterm);
-        graph_.push_back(sinkNode);
+        graph_.push_back(std::move(sinkNode));
         graph_[driverId].childrenIds.push_back(sinkId);
 
         if (inst2builder_.find(sinkName) != inst2builder_.end()) {
@@ -440,7 +438,7 @@ void LatencyBalancer::balanceLatencies(int nodeId)
     if (!previouBufToInsert) {
       previouBufToInsert = bufToInsert;
       sinksInput.clear();
-      sinksInput = children;
+      sinksInput = std::move(children);
       continue;
     }
 
@@ -449,7 +447,7 @@ void LatencyBalancer::balanceLatencies(int nodeId)
         = insertDelayBuffers(numBuffers, srcX, srcY, sinksInput);
 
     sinksInput.clear();
-    sinksInput = children;
+    sinksInput = std::move(children);
     sinksInput.push_back(delauBuffInput);
 
     previouBufToInsert = bufToInsert;

src/cts/src/LatencyBalancer.h

@@ -66,7 +66,9 @@ class LatencyBalancer
         network_(network),
         openSta_(sta),
         wireSegmentUnit_(scalingUnit),
-        capPerDBU_(capPerDBU)
+        capPerDBU_(capPerDBU),
+        worseDelay_(std::numeric_limits<float>::min()),
+        delayBufIndex_(0)
   {
   }
 
@@ -115,9 +117,9 @@ class LatencyBalancer
   sta::dbSta* openSta_ = nullptr;
   sta::Graph* timingGraph_ = nullptr;
   double wireSegmentUnit_;
-  float worseDelay_;
   float bufferDelay_;
   double capPerDBU_;
+  float worseDelay_;
   int delayBufIndex_;
   std::vector<GraphNode> graph_;
   std::map<std::string, TreeBuilder*> inst2builder_;