Merge remote-tracking branch 'private/master' into gpl-binSize-float

Author: gudeh

.bazelrc

@@ -55,4 +55,4 @@ build --incompatible_strict_action_env
 #build --remote_cache=https://storage.googleapis.com/megaboom-bazel-artifacts
 #build --remote_cache_compression=true
 
-try-import %workspace$/user.bazelrc
+try-import %workspace%/user.bazelrc

Jenkinsfile

@@ -224,6 +224,20 @@ def getParallelTests(String image) {
 }
 
 node {
+
+    def isDefaultBranch = (env.BRANCH_NAME == 'master') 
+    def daysToKeep = '20';
+    def numToKeep = (isDefaultBranch ? '-1' : '10');
+
+    properties([
+        buildDiscarder(logRotator(
+            daysToKeepStr:         daysToKeep,
+            artifactDaysToKeepStr: daysToKeep,
+
+            numToKeepStr:          numToKeep,
+            artifactNumToKeepStr:  numToKeep
+        ))
+    ]);
     stage('Checkout') {
         checkout scm;
     }

include/ord/InitOpenRoad.hh

@@ -12,5 +12,6 @@ namespace ord {
 // Call this inside of Tcl_Main.
 void initOpenRoad(Tcl_Interp* interp,
                   const char* log_filename,
-                  const char* metrics_filename);
+                  const char* metrics_filename,
+                  bool batch_mode);
 }  // namespace ord

include/ord/OpenRoad.hh

@@ -128,7 +128,8 @@ class OpenRoad
   static void setOpenRoad(OpenRoad* app, bool reinit_ok = false);
   void init(Tcl_Interp* tcl_interp,
             const char* log_filename,
-            const char* metrics_filename);
+            const char* metrics_filename,
+            bool batch_mode);
 
   Tcl_Interp* tclInterp() { return tcl_interp_; }
   utl::Logger* getLogger() { return logger_; }

src/Main.cc

@@ -102,7 +102,7 @@ FOREACH_TOOL(X)
 #undef X
 
 #if PY_VERSION_HEX >= 0x03080000
-static void initPython(int argc, char* argv[])
+static void initPython(int argc, char* argv[], const bool exit_after_cmd_file)
 #else
 static void initPython()
 #endif
@@ -115,11 +115,10 @@ static void initPython()
   FOREACH_TOOL(X)
 #undef X
 #if PY_VERSION_HEX >= 0x03080000
-  bool inspect = !findCmdLineFlag(argc, argv, "-exit");
   PyConfig config;
   PyConfig_InitPythonConfig(&config);
   PyConfig_SetBytesArgv(&config, argc, argv);
-  config.inspect = inspect;
+  config.inspect = !exit_after_cmd_file;
   Py_InitializeFromConfig(&config);
   PyConfig_Clear(&config);
 #else
@@ -294,7 +293,8 @@ int main(int argc, char* argv[])
     the_tech_and_design.design
         = std::make_unique<ord::Design>(the_tech_and_design.tech.get());
     ord::OpenRoad::setOpenRoad(the_tech_and_design.design->getOpenRoad());
-    ord::initOpenRoad(interp, log_filename, metrics_filename);
+    const bool exit = findCmdLineFlag(cmd_argc, cmd_argv, "-exit");
+    ord::initOpenRoad(interp, log_filename, metrics_filename, exit);
     if (!findCmdLineFlag(cmd_argc, cmd_argv, "-no_splash")) {
       showSplash();
     }
@@ -318,11 +318,10 @@ int main(int argc, char* argv[])
     }
 
 #if PY_VERSION_HEX >= 0x03080000
-    initPython(cmd_argc, cmd_argv);
+    initPython(cmd_argc, cmd_argv, exit);
     return Py_RunMain();
 #else
     initPython();
-    bool exit = findCmdLineFlag(cmd_argc, cmd_argv, "-exit");
     std::vector<wchar_t*> args;
     args.push_back(Py_DecodeLocale(cmd_argv[0], nullptr));
     if (!exit) {
@@ -463,7 +462,8 @@ static int tclAppInit(int& argc,
     }
 #endif
 
-    ord::initOpenRoad(interp, log_filename, metrics_filename);
+    ord::initOpenRoad(
+        interp, log_filename, metrics_filename, exit_after_cmd_file);
 
     bool no_splash = findCmdLineFlag(argc, argv, "-no_splash");
     if (!no_splash) {

src/OpenRoad.cc

@@ -54,6 +54,7 @@
 #include "upf/MakeUpf.h"
 #include "utl/Logger.h"
 #include "utl/MakeLogger.h"
+#include "utl/Progress.h"
 #include "utl/ScopedTemporaryFile.h"
 #include "utl/decode.h"
 
@@ -139,18 +140,22 @@ void OpenRoad::setOpenRoad(OpenRoad* app, bool reinit_ok)
 
 void initOpenRoad(Tcl_Interp* interp,
                   const char* log_filename,
-                  const char* metrics_filename)
+                  const char* metrics_filename,
+                  const bool batch_mode)
 {
-  OpenRoad::openRoad()->init(interp, log_filename, metrics_filename);
+  OpenRoad::openRoad()->init(
+      interp, log_filename, metrics_filename, batch_mode);
 }
 
 void OpenRoad::init(Tcl_Interp* tcl_interp,
                     const char* log_filename,
-                    const char* metrics_filename)
+                    const char* metrics_filename,
+                    const bool batch_mode)
 {
   tcl_interp_ = tcl_interp;
 
   // Make components.
+  utl::Progress::setBatchMode(batch_mode);
   logger_ = makeLogger(log_filename, metrics_filename);
   db_->setLogger(logger_);
   sta_ = makeDbSta();

src/Tech.cc

@@ -25,7 +25,7 @@ Tech::Tech(Tcl_Interp* interp,
   if (!interp) {
     interp = Tcl_CreateInterp();
     Tcl_Init(interp);
-    app_->init(interp, log_filename, metrics_filename);
+    app_->init(interp, log_filename, metrics_filename, false);
   }
 }
 

src/cts/README.md

@@ -66,6 +66,7 @@ clock_tree_synthesis
     [-dont_use_dummy_load]
     [-sink_buffer_max_cap_derate derate_value]
     [-delay_buffer_derate derate_value]
+    [-library liberty_library_name]
 ```
 
 #### Options
@@ -93,7 +94,17 @@ clock_tree_synthesis
 | `-dont_use_dummy_load` | Don't apply dummy buffer or inverter cells at clock tree leaves to balance loads. The default values is `False`. |
 | `-sink_buffer_max_cap_derate` | Use this option to control automatic buffer selection. To favor strong(weak) drive strength buffers use a small(large) value.  The default value is `0.01`, meaning that buffers are selected by derating max cap limit by 0.01. The value of 1.0 means no derating of max cap limit.  |
 | `-delay_buffer_derate` | This option balances latencies between macro cells and registers by inserting delay buffers.  The default value is `1.0`, meaning all needed delay buffers are inserted.  A value of 0.5 means only half of necessary delay buffers are inserted.  A value of 0.0 means no insertion of delay buffers. |
-| `-library` | This option specifies the name of library from which clock buffers will be selected, such as the LVT or uLVT library.  It is assumed that the library has already been loaded using the read_liberty command.  If this option is not specified, clock buffers will be chosen from the currently loaded libraries, which may not include LVT or uLVT cells. |
+| `-library` | This option specifies the name of Liberty library from which clock buffers will be selected, such as the LVT or uLVT library.  It is assumed that the library has already been loaded using the read_liberty command.  If this option is not specified, clock buffers will be chosen from the currently loaded libraries, which may not include LVT or uLVT cells. |
+
+#### Instance Name Prefixes
+
+`clock_tree_synthesis` uses the following prefixes for the instances that it inserts:
+
+| Instance Prefix | Purpose |
+| ----- | ----- |
+| clkbuf_regs | Splitting registers from macros |
+| clkload | Dummy loads to help balance the clock tree |
+| delaybuf | Delay buffers to help balance the tree |
 
 ### Report CTS
 

src/cts/src/TechChar.cpp

@@ -699,7 +699,7 @@ void TechChar::trimSortBufferList(std::vector<std::string>& buffers)
       if (cap < lowCap || cap > highCap) {
         it = buffers.erase(it);
         // clang-format off
-        debugPrint(logger_, CTS, "buffering", 1, "  removing {}", buf);
+        debugPrint(logger_, CTS, "buffering", 1, "  removing {} outside of low/high max cap", buf);
         // clang-format on
       } else {
         ++it;
@@ -720,9 +720,13 @@ void TechChar::trimSortBufferList(std::vector<std::string>& buffers)
     float prev = getMaxCapLimit(*it);
     ++it;
     while (it != buffers.end()) {
-      float curr = getMaxCapLimit(*it);
+      std::string buf = *it;
+      float curr = getMaxCapLimit(buf);
       if (std::abs(prev - curr) / curr < 0.1) {
         it = buffers.erase(it);
+        // clang-format off
+        debugPrint(logger_, CTS, "buffering", 1, "  removing {} within 10% of prev neighbor's max cap", buf);
+        // clang-format on
       } else {
         ++it;
         prev = curr;

src/odb/test/BUILD

@@ -171,6 +171,7 @@ filegroup(
         "sky130hd/sky130hd_vt.tlef",
         "sky130hd/work_around_yosys/formal_pdk.v",
     ],
+    visibility = ["//src/odb/test/cpp:__subpackages__"],
 )
 
 [