Merge branch 'master' into speedup1

Author: gadfort

.github/workflows/github-actions-quarterly-tag.yml

@@ -0,0 +1,52 @@
+name: Quarterly Release Tag
+
+on:
+  schedule:
+    # Midnight UTC on the first day of each quarter (Jan, Apr, Jul, Oct)
+    - cron: '0 0 1 1,4,7,10 *'
+  workflow_dispatch:
+
+concurrency:
+  group: quarterly-tag
+  cancel-in-progress: false
+
+jobs:
+  create-tag:
+    name: Create quarterly tag
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Determine tag name
+        id: tag
+        run: |
+          month=$(date -u +%-m)
+          year=$(date -u +%y)
+          case $month in
+          1|2|3)   quarter=1 ;;
+          4|5|6)   quarter=2 ;;
+          7|8|9)   quarter=3 ;;
+          10|11|12) quarter=4 ;;
+          esac
+          tag="${year}Q${quarter}"
+          echo "tag=$tag" >> "$GITHUB_OUTPUT"
+          echo "Quarterly tag: $tag"
+
+      - name: Configure git user
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Create and push tag
+        env:
+          TAG: ${{ steps.tag.outputs.tag }}
+        run: |
+          if git ls-remote --tags origin "refs/tags/$TAG" | grep -q .; then
+          echo "Tag $TAG already exists, skipping."
+          exit 0
+          fi
+          git tag --annotate "$TAG" -m "Quarterly release $TAG"
+          git push origin "$TAG"

BUILD.bazel

@@ -160,6 +160,21 @@ OPENROAD_DEFINES = [
     "ABC_NAMESPACE=abc",
 ]
 
+cc_library(
+    name = "tcl_readline_setup",
+    srcs = ["src/tcl_readline_setup.cc"],
+    hdrs = ["src/tcl_readline_setup.h"],
+    visibility = ["//src/sta:__pkg__"],
+    deps = [
+        "@tcl_lang//:tcl",
+        # tclreadline: provides ENABLE_READLINE define + links libtclreadline.
+        # On systems without tclreadline these are empty stub targets (no-op).
+        # See: https://github.com/The-OpenROAD-Project/OpenROAD/issues/7115
+        "@tclreadline",
+        "@tclreadline//:tclreadline_defs",
+    ],
+)
+
 cc_binary(
     name = "openroad",
     srcs = [
@@ -177,19 +192,15 @@ cc_binary(
         ":openroad_version",
         ":opt_notification",
         ":ord",
+        ":tcl_readline_setup",
         "//bazel:tcl_library_init",
-        "@rules_cc//cc/runfiles",  # sets BAZEL_CURRENT_REPOSITORY
         "//src/cut",
         "//src/gui",
         "//src/sta:opensta_lib",
         "//src/utl",
         "@boost.stacktrace",
+        "@rules_cc//cc/runfiles",  # sets BAZEL_CURRENT_REPOSITORY
         "@tcl_lang//:tcl",
-        # tclreadline: provides ENABLE_READLINE define + links libtclreadline.
-        # On systems without tclreadline these are empty stub targets (no-op).
-        # See: https://github.com/The-OpenROAD-Project/OpenROAD/issues/7115
-        "@tclreadline",
-        "@tclreadline//:tclreadline_defs",
     ],
 )
 

etc/bazel-make-compilation-db.sh

@@ -70,7 +70,9 @@ cat >> compile_flags.txt <<EOF
 -DBUILD_GUI=true
 EOF
 
-# If there are two styles of comp-dbs, tools might have issues. Warn user.
-if [ -r compile_commands.json ]; then
-  printf "\n\033[1;31mSuggest to remove old compile_commands.json to not interfere with compile_flags.txt\033[0m\n\n"
-fi
+# If there are two styles of comp-dbs, tools might choose wrong one. Warn user.
+for f in compile_commands.json build/compile_commands.json ; do
+  if [ -r "$f" ]; then
+    printf "\n\033[1;31mSuggest to remove old %s to not interfere with compile_flags.txt\033[0m\n\n" "$f"
+  fi
+done

src/CMakeLists.txt

@@ -32,6 +32,7 @@ set(OPENROAD_SOURCE
   Design.cc
   Timing.cc
   Tech.cc
+  tcl_readline_setup.cc
   OpenRoad.cc
   Main.cc
   )

src/Main.cc

@@ -18,11 +18,6 @@
 
 #include "boost/stacktrace/stacktrace.hpp"
 #include "tcl.h"
-#ifdef ENABLE_READLINE
-// If you get an error on this include be sure you have
-//   the package tcl-tclreadline-devel installed
-#include "tclreadline.h"
-#endif
 #ifdef ENABLE_PYTHON3
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -47,6 +42,8 @@
 #include "bazel/tcl_library_init.h"
 #endif
 
+#include "tcl_readline_setup.h"
+
 using sta::findCmdLineFlag;
 using sta::findCmdLineKey;
 using sta::sourceTclFile;
@@ -317,90 +314,7 @@ int main(int argc, char* argv[])
 }
 
 #ifdef ENABLE_READLINE
-// A stopgap fallback from the hardcoded TCLRL_LIBRARY path for OpenROAD,
-// not essential for OpenSTA
-static std::string findPathToTclreadlineInit(Tcl_Interp* interp)
-{
-  // TL;DR it is possible to run the OpenROAD binary from within the
-  // official Docker image on a different distribution than the
-  // distribution within the Docker image.
-  //
-  // In this case we have to look up
-  // the location of the tclreadline scripts instead of using the hardcoded
-  // path.
-  //
-  // It is helpful to use the official Docker image as CI infrastructure and
-  // also because it is a good way to have as similar an environment as possible
-  // during testing and deployment.
-  //
-  // See
-  // https://github.com/The-OpenROAD-Project/bazel-orfs/blob/main/docker.BUILD.bazel
-  // for the details on how this is done.
-  //
-  // Running Docker within a bazel isolated environment introduces lots of
-  // problems and is not really done.
-  const char* tcl_script = R"(
-      namespace eval temp {
-        # Check standard Bazel runfiles relative path
-        set runfiles_path [file join [pwd] "external/tclreadline/tclreadlineInit.tcl"]
-        if {[file exists $runfiles_path]} {
-            return $runfiles_path
-        }
-
-        # Check Bazel runfiles in adjacent directories for other run strategies
-        set runfiles_execroot_path [file join [pwd] "../tclreadline/tclreadlineInit.tcl"]
-        if {[file exists $runfiles_execroot_path]} {
-            return $runfiles_execroot_path
-        }
-
-        foreach dir $::auto_path {
-            set folder [file join $dir]
-            set path [file join $folder "tclreadline)" TCLRL_VERSION_STR
-                           R"(" "tclreadlineInit.tcl"]
-            if {[file exists $path]} {
-                return $path
-           }
-        }
-        error "tclreadlineInit.tcl not found in any of the directories in auto_path"
-      }
-    )";
-
-  if (Tcl_Eval(interp, tcl_script) == TCL_ERROR) {
-    std::cerr << "Tcl_Eval failed: " << Tcl_GetStringResult(interp) << '\n';
-    return "";
-  }
-
-  return Tcl_GetStringResult(interp);
-}
-
-static bool TryReadlineStaticInit(Tcl_Interp* interp)
-{
-  Tcl_StaticPackage(
-      interp, "tclreadline", Tclreadline_Init, Tclreadline_SafeInit);
-
-  return Tcl_EvalFile(interp, TCLRL_LIBRARY "/tclreadlineInit.tcl") == TCL_OK;
-}
-
-static bool TryTclBazelInit(Tcl_Interp* interp)
-{
-  // Here, ::tclreadline::library is already set up by SetupTclEnvironment
-  constexpr char kInitializeReadlineLib[] = R"(
-        set ::tclreadline::setup_path [file join $::tclreadline::library "tclreadlineSetup.tcl"]
-        set ::tclreadline::completer_path [file join $::tclreadline::library "tclreadlineCompleter.tcl"]
-        if {[info commands history] == ""} { proc history {args} {} };
-        source [file join $::tclreadline::library "tclreadlineInit.tcl"]
-)";
-
-  return Tcl_Eval(interp, kInitializeReadlineLib) == TCL_OK;
-}
-
-static bool TrySearchPathManuallyInit(Tcl_Interp* interp)
-{
-  const std::string path = findPathToTclreadlineInit(interp);
-  return !path.empty() && Tcl_EvalFile(interp, path.c_str()) == TCL_OK;
-}
-
-static int tclReadlineInit(Tcl_Interp* interp)
+static int tclOrdReadlineInit(Tcl_Interp* interp)
 {
   std::array<const char*, 2> readline_cmds
       = {"ord::setup_tclreadline", "::tclreadline::Loop"};
@@ -452,19 +366,11 @@ static int tclAppInit(int& argc,
     }
 #endif
 
-#ifdef ENABLE_READLINE
     if (!exit_after_cmd_file) {
-      if (Tclreadline_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-      }
-
-      if (!TryReadlineStaticInit(interp) &&  //
-          !TryTclBazelInit(interp) &&        //
-          !TrySearchPathManuallyInit(interp)) {
+      if (ord::SetupTclReadlineLibrary(interp) == TCL_ERROR) {
         printf("Failed to load tclreadline\n");
       }
     }
-#endif
 
     ord::initOpenRoad(
         interp, log_filename, metrics_filename, exit_after_cmd_file);
@@ -545,7 +451,7 @@ static int tclAppInit(int& argc,
   }
 #ifdef ENABLE_READLINE
   if (!gui::Gui::enabled() && !exit_after_cmd_file) {
-    return tclReadlineInit(interp);
+    return tclOrdReadlineInit(interp);
   }
 #endif
   return TCL_OK;

src/cts/src/TechChar.cpp

@@ -32,6 +32,7 @@
 #include "sta/Sdc.hh"
 #include "sta/Search.hh"
 #include "sta/SearchClass.hh"
+#include "sta/StringUtil.hh"
 #include "sta/TableModel.hh"
 #include "sta/TimingArc.hh"
 #include "sta/TimingModel.hh"

src/drt/src/dr/FlexDR_init.cpp

@@ -2732,16 +2732,12 @@ void FlexDRWorker::initMazeCost_fixedObj(const frDesign* design)
       switch (obj->typeId()) {
         case frcBTerm: {  // term no bloat
           auto* net = static_cast<frBTerm*>(obj)->getNet();
-          if (net != nullptr) {
-            frNet2Terms[net].insert(obj);
-          }
+          frNet2Terms[net].insert(obj);
           break;
         }
         case frcInstTerm: {
           auto* net = static_cast<frInstTerm*>(obj)->getNet();
-          if (net != nullptr) {
-            frNet2Terms[net].insert(obj);
-          }
+          frNet2Terms[net].insert(obj);
           if (isRoutingLayer) {
             // unblock planar edge for obs over pin, ap will unblock via edge
             // for legal pin access

src/drt/test/down_access_term.defok

@@ -39,20 +39,20 @@ NETS 1 ;
       NEW met1 ( 135120 155955 ) ( * 158175 )
       NEW met1 ( 112080 155955 ) ( 135120 * )
       NEW met1 ( 112080 155215 ) ( * 155955 )
-      NEW met1 ( 1680 155215 ) ( 112080 * )
-      NEW met1 ( 144720 158175 ) ( 145200 * )
+      NEW met1 ( 135600 158175 ) ( 144240 * )
+      NEW met1 ( 144240 158175 ) ( 145200 * )
       NEW met2 ( 145200 144855 ) ( * 158175 )
-      NEW met1 ( 135600 158175 ) ( 144720 * )
+      NEW met1 ( 1680 155215 ) ( 112080 * )
+      NEW li1 ( 145200 144855 ) L1M1_PR_MR
+      NEW met1 ( 145200 144855 ) M1M2_PR
       NEW met3 ( 1440 155030 ) M3M4_PR
       NEW met4 ( 1440 155030 ) M4M5_PR
       NEW met2 ( 1680 155030 ) M2M3_PR
       NEW met1 ( 1680 155215 ) M1M2_PR
       NEW li1 ( 112080 154845 ) L1M1_PR_MR
       NEW li1 ( 135600 158175 ) L1M1_PR_MR
-      NEW li1 ( 144720 158175 ) L1M1_PR_MR
+      NEW li1 ( 144240 158175 ) L1M1_PR_MR
       NEW met1 ( 145200 158175 ) M1M2_PR
-      NEW li1 ( 145200 144855 ) L1M1_PR_MR
-      NEW met1 ( 145200 144855 ) M1M2_PR
       NEW met3 ( 1440 155030 ) RECT ( -380 -150 0 150 )  ;
 END NETS
 END DESIGN

src/drt/test/gcTest.cpp

@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "db/obj/frMarker.h"
+#include "db/obj/frNet.h"
 #include "db/tech/frConstraint.h"
 #include "db/tech/frViaDef.h"
 #include "fixture.h"