Merge remote-tracking branch 'private/master' into gpl-update-large-tests

Author: gudeh

.bazelrc

@@ -75,8 +75,8 @@ test --build_tests_only
 build --jobs=200
 
 # Enable local disk caching to supplement the remote cache.
-# The location can be overridden by setting the OPENROAD_BAZEL_CACHE env variable.
-build --disk_cache=$(OPENROAD_BAZEL_CACHE:-~/.cache/bazel-disk-cache)
+build --disk_cache=~/.cache/bazel-disk-cache
+build --repository_cache=~/.cache/bazel-repository-cache
 
 # --- CI Settings (write access) ---
 build:ci --remote_cache=https://storage.googleapis.com/openroad-bazel-cache
@@ -94,5 +94,7 @@ build:openroad-dev --remote_upload_local_results=false
 # Developers need the actual output files to run and use them.
 build:openroad-dev --remote_download_toplevel
 build:openroad-dev --google_default_credentials=true
+build:openroad-dev --disk_cache=/workspace/.cache/bazel-disk-cache
+build:openroad-dev --repository_cache=/workspace/.cache/bazel-repository-cache
 
 try-import %workspace%/user.bazelrc

Jenkinsfile

@@ -250,27 +250,25 @@ def getParallelTests(String image) {
 }
 
 def bazelTest = {
-    stage ('Build with Bazel') {
-        node {
-            stage('Setup Bazel Build') {
-                checkout scm;
-                sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
-            }
-            withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
-                stage('Bazel Build') {
-                    withCredentials([file(credentialsId: 'bazel-cache-sa', variable: 'GCS_SA_KEY')]) {
-                        timeout(time: 120, unit: 'MINUTES') {
-                            def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic';
-                            if (env.BRANCH_NAME != 'master') {
-                                cmd += ' --remote_upload_local_results=false';
-                            }
-                            cmd += ' --google_credentials=$GCS_SA_KEY';
-                            try {
-                                sh label: 'Bazel Build', script: cmd + ' ...';
-                            } catch (e) {
-                                currentBuild.result = 'FAILURE';
-                                sh label: 'Bazel Build (keep_going)', script: cmd + ' --keep_going ...';
-                            }
+    node {
+        stage('Setup') {
+            checkout scm;
+            sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
+        }
+        withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
+            stage('bazelisk test ...') {
+                withCredentials([file(credentialsId: 'bazel-cache-sa', variable: 'GCS_SA_KEY')]) {
+                    timeout(time: 120, unit: 'MINUTES') {
+                        def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic';
+                        if (env.BRANCH_NAME != 'master') {
+                            cmd += ' --remote_upload_local_results=false';
+                        }
+                        cmd += ' --google_credentials=$GCS_SA_KEY';
+                        try {
+                            sh label: 'Bazel Build', script: cmd + ' ...';
+                        } catch (e) {
+                            currentBuild.result = 'FAILURE';
+                            sh label: 'Bazel Build (keep_going)', script: cmd + ' --keep_going ...';
                         }
                     }
                 }
@@ -323,7 +321,7 @@ node {
         ))
     ]);
     parallel(
-            "Bazel Tests": bazelTest,
+            "Bazel": bazelTest,
             "Docker Tests": dockerTests
     );
     stage('Send Email Report') {

bazel/openmp/bundled.BUILD.bazel

@@ -85,7 +85,6 @@ cc_library(
         "runtime/src/ompt-event-specific.h",
         "runtime/src/ompt-general.cpp",
         "runtime/src/ompt-internal.h",
-        "runtime/src/ompt-specific.cpp",
         "runtime/src/ompt-specific.h",
         "runtime/src/test-touch.c",
         "runtime/src/z_Linux_asm.S",

etc/DependencyInstaller.sh

@@ -22,7 +22,7 @@ _equivalenceDeps() {
         cd yosys
         # use of no-register flag is required for some compilers,
         # e.g., gcc and clang from RHEL8
-        make -j $(nproc) PREFIX="${yosysPrefix}" ABC_ARCHFLAGS=-Wno-register
+        make -j ${numThreads} PREFIX="${yosysPrefix}" ABC_ARCHFLAGS=-Wno-register
         make install
     ) fi
 
@@ -33,7 +33,7 @@ _equivalenceDeps() {
         git clone --depth=1 -b "${yosysVersion}" https://github.com/YosysHQ/eqy
         cd eqy
         export PATH="${yosysPrefix}/bin:${PATH}"
-        make -j $(nproc) PREFIX="${eqyPrefix}"
+        make -j ${numThreads} PREFIX="${eqyPrefix}"
         make install PREFIX="${eqyPrefix}"
     )
     fi
@@ -45,7 +45,7 @@ _equivalenceDeps() {
         git clone --depth=1 -b "${yosysVersion}" --recursive https://github.com/YosysHQ/sby
         cd sby
         export PATH="${eqyPrefix}/bin:${PATH}"
-        make -j $(nproc) PREFIX="${sbyPrefix}" install
+        make -j ${numThreads} PREFIX="${sbyPrefix}" install
     )
     fi
 }
@@ -64,8 +64,8 @@ _installCommonDev() {
     cmakeVersionSmall=${cmakeVersionBig}.6
     pcreVersion=10.42
     pcreChecksum="37d2f77cfd411a3ddf1c64e1d72e43f7"
-    swigVersion=4.1.0
-    swigChecksum="794433378154eb61270a3ac127d9c5f3"
+    swigVersion=4.3.0
+    swigChecksum="9f74c7f402aa28d9f75e67d1990ee6fb"
     boostVersionBig=1.86
     boostVersionSmall=${boostVersionBig}.0
     boostChecksum="ac857d73bb754b718a039830b07b9624"
@@ -112,7 +112,7 @@ _installCommonDev() {
         tar xf bison-${bisonVersion}.tar.gz
         cd bison-${bisonVersion}
         ./configure --prefix=${bisonPrefix}
-        make -j install
+        make -j ${numThreads} install
         echo "bison ${bisonVersion} installed (from ${bisonInstalledVersion})."
     else
         echo "bison ${bisonVersion} already installed."
@@ -128,8 +128,8 @@ _installCommonDev() {
         tar xf flex-${flexVersion}.tar.gz
         cd flex-${flexVersion}
         ./configure --prefix=${flexPrefix}
-        make -j $(nproc)
-        make -j $(nproc) install
+        make -j ${numThreads}
+        make -j ${numThreads} install
     else
         echo "Flex already installed."
     fi
@@ -154,8 +154,8 @@ _installCommonDev() {
         fi
         ./autogen.sh
         ./configure --prefix=${swigPrefix}
-        make -j $(nproc)
-        make -j $(nproc) install
+        make -j ${numThreads}
+        make -j ${numThreads} install
     else
         echo "Swig already installed."
     fi
@@ -171,7 +171,7 @@ _installCommonDev() {
         tar -xf boost_${boostVersionUnderscore}.tar.gz
         cd boost_${boostVersionUnderscore}
         ./bootstrap.sh --prefix="${boostPrefix}"
-        ./b2 install --with-iostreams --with-test --with-serialization --with-system --with-thread -j $(nproc)
+        ./b2 install --with-iostreams --with-test --with-serialization --with-system --with-thread -j ${numThreads}
     else
         echo "Boost already installed."
     fi
@@ -184,7 +184,7 @@ _installCommonDev() {
         git clone --depth=1 -b ${eigenVersion} https://gitlab.com/libeigen/eigen.git
         cd eigen
         ${cmakePrefix}/bin/cmake -DCMAKE_INSTALL_PREFIX="${eigenPrefix}" -B build .
-        ${cmakePrefix}/bin/cmake --build build -j $(nproc) --target install
+        ${cmakePrefix}/bin/cmake --build build -j ${numThreads} --target install
     else
         echo "Eigen already installed."
     fi
@@ -198,7 +198,7 @@ _installCommonDev() {
         cd cudd
         autoreconf
         ./configure --prefix=${cuddPrefix}
-        make -j $(nproc) install
+        make -j ${numThreads} install
     else
         echo "Cudd already installed."
     fi
@@ -223,7 +223,7 @@ _installCommonDev() {
         git clone --depth=1 -b ${lemonVersion} https://github.com/The-OpenROAD-Project/lemon-graph.git
         cd lemon-graph
         ${cmakePrefix}/bin/cmake -DCMAKE_INSTALL_PREFIX="${lemonPrefix}" -B build .
-        ${cmakePrefix}/bin/cmake --build build -j $(nproc) --target install
+        ${cmakePrefix}/bin/cmake --build build -j ${numThreads} --target install
     else
         echo "Lemon already installed."
     fi
@@ -240,7 +240,7 @@ _installCommonDev() {
         git clone --depth=1 -b "v${spdlogVersion}" https://github.com/gabime/spdlog.git
         cd spdlog
         ${cmakePrefix}/bin/cmake -DCMAKE_INSTALL_PREFIX="${spdlogPrefix}" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DSPDLOG_BUILD_EXAMPLE=OFF -B build .
-        ${cmakePrefix}/bin/cmake --build build -j $(nproc) --target install
+        ${cmakePrefix}/bin/cmake --build build -j ${numThreads} --target install
         echo "spdlog ${spdlogVersion} installed (from ${spdlogInstalledVersion})."
     else
         echo "spdlog ${spdlogVersion} already installed."
@@ -329,7 +329,7 @@ _installOrTools() {
         git clone --depth=1 -b "v${orToolsVersionBig}" https://github.com/google/or-tools.git
         cd or-tools
         ${cmakePrefix}/bin/cmake -S. -Bbuild -DBUILD_DEPS:BOOL=ON -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_SAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${orToolsPath} -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w"
-        ${cmakePrefix}/bin/cmake --build build --config Release --target install -v -j $(nproc)
+        ${cmakePrefix}/bin/cmake --build build --config Release --target install -v -j ${numThreads}
     else
         if [[ $osVersion == rodete ]]; then
             osVersion=11
@@ -587,16 +587,13 @@ Then, rerun this script.
 EOF
         exit 1
     fi
-    brew install bison boost cmake eigen flex fmt groff libomp or-tools pandoc pyqt5 python spdlog tcl-tk zlib
+    brew install bison boost cmake eigen flex fmt groff libomp or-tools pandoc pyqt5 python spdlog tcl-tk zlib swig
 
     # Some systems need this to correctly find OpenMP package during build
     brew link --force libomp
 
     # Lemon is not in the homebrew-core repo
     brew install The-OpenROAD-Project/lemon-graph/lemon-graph
-
-    # Install swig 4.1.1
-    _installHomebrewPackage "swig" "c83c8aaa6505c3ea28c35bc45a54234f79e46c5d" "s/"
 }
 
 _installDebianCleanUp() {
@@ -774,6 +771,9 @@ Usage: $0 -all
        $0 -constant-build-dir
                                 # Use constant build directory, instead of
                                 #    random one.
+       $0 -threads=<N>          #
+                                # Limit number of compiling threads. Default is
+                                # all available numThreads.
 
 EOF
     exit "${1:-1}"
@@ -786,6 +786,7 @@ isLocal="false"
 equivalenceDeps="no"
 CI="no"
 saveDepsPrefixes=""
+numThreads=$(nproc)
 # temp dir to download and compile
 baseDir=$(mktemp -d /tmp/DependencyInstaller-XXXXXX)
 
@@ -862,6 +863,9 @@ while [ "$#" -gt 0 ]; do
         -save-deps-prefixes=*)
             saveDepsPrefixes=$(realpath ${1#-save-deps-prefixes=})
             ;;
+        -threads=*)
+            numThreads=${1}
+            ;;
         *)
             echo "unknown option: ${1}" >&2
             _help

src/cts/BUILD

@@ -24,6 +24,7 @@ cc_library(
         "src/Util.h",
     ],
     visibility = ["//visibility:private"],
+    deps = ["//src/sta:opensta_lib"],
 )
 
 cc_library(
@@ -77,6 +78,7 @@ cc_library(
     ],
     includes = ["include"],
     deps = [
+        ":cts",
         ":private_hdrs",
         "//:ord",
         "//src/dbSta",

src/cts/src/TritonCTS.cpp

@@ -2359,7 +2359,7 @@ bool TritonCTS::propagateClock(odb::dbITerm* input)
 
   // Clock Gater / Latch improvised as clock gater
   if (inputPort) {
-    return inputPort->isClockGateClock() || libertyCell->isLatchData(inputPort);
+    return inputPort->isClockGateClock() || inputPort->isLatchData();
   }
 
   return false;

src/cts/test/BUILD

@@ -166,8 +166,8 @@ cc_test(
     linkstatic = True,  # TODO: remove once deps define all symbols
     deps = [
         "//src/cts",
-        "//src/grt",
         "//src/utl",
+        "//src/grt",  # work around cyclic dependncy between rsz and grt
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],

src/dbSta/src/dbSta.cc

@@ -166,6 +166,9 @@ class dbStaCbk : public dbBlockCallBackObj
   void inDbBTermSetSigType(dbBTerm* bterm, const dbSigType& sig_type) override;
 
  private:
+  // for inDbInstSwapMasterBefore/inDbInstSwapMasterAfter
+  bool swap_master_arcs_equiv_ = false;
+
   dbSta* sta_;
   dbNetwork* network_ = nullptr;
   Logger* logger_;
@@ -724,17 +727,10 @@ void dbSta::deleteInstance(Instance* inst)
 
 void dbSta::replaceCell(Instance* inst, Cell* to_cell, LibertyCell* to_lib_cell)
 {
+  // do not call `Sta::replaceCell` as sta's before/after hooks are called
+  // from db callbacks
   NetworkEdit* network = networkCmdEdit();
-  LibertyCell* from_lib_cell = network->libertyCell(inst);
-  if (sta::equivCells(from_lib_cell, to_lib_cell)) {
-    replaceEquivCellBefore(inst, to_lib_cell);
-    network->replaceCell(inst, to_cell);
-    replaceEquivCellAfter(inst);
-  } else {
-    replaceCellBefore(inst, to_lib_cell);
-    network->replaceCell(inst, to_cell);
-    replaceCellAfter(inst);
-  }
+  network->replaceCell(inst, to_cell);
 }
 
 void dbSta::deleteNet(Net* net)
@@ -933,20 +929,25 @@ void dbStaCbk::inDbInstSwapMasterBefore(dbInst* inst, dbMaster* master)
   LibertyCell* to_lib_cell = network_->libertyCell(network_->dbToSta(master));
   LibertyCell* from_lib_cell = network_->libertyCell(inst);
   Instance* sta_inst = network_->dbToSta(inst);
-  if (sta::equivCells(from_lib_cell, to_lib_cell)) {
+
+  swap_master_arcs_equiv_ = sta::equivCellsArcs(from_lib_cell, to_lib_cell);
+
+  if (swap_master_arcs_equiv_) {
     sta_->replaceEquivCellBefore(sta_inst, to_lib_cell);
   } else {
-    logger_->error(STA,
-                   1000,
-                   "instance {} swap master {} is not equivalent",
-                   inst->getConstName(),
-                   master->getConstName());
+    sta_->replaceCellBefore(sta_inst, to_lib_cell);
   }
 }
 
 void dbStaCbk::inDbInstSwapMasterAfter(dbInst* inst)
 {
-  sta_->replaceEquivCellAfter(network_->dbToSta(inst));
+  Instance* sta_inst = network_->dbToSta(inst);
+
+  if (swap_master_arcs_equiv_) {
+    sta_->replaceEquivCellAfter(sta_inst);
+  } else {
+    sta_->replaceCellAfter(sta_inst);
+  }
 }
 
 void dbStaCbk::inDbNetDestroy(dbNet* db_net)

src/dft/BUILD

@@ -52,6 +52,7 @@ cc_library(
         "include",
     ],
     deps = [
+        ":dft",
         "//:ord",
         "//src/dbSta",
         "//src/dft/src/architect",

src/drt/BUILD

@@ -270,6 +270,7 @@ cc_library(
     ],
     deps = [
         ":db_hdrs",
+        ":drt",
         "//:ord",
         "//src/dst",
         "//src/gui",