Merge remote-tracking branch 'private/master' into gpl_remove_filler_removal_cap

Author: LucasYuki

.bazelrc

@@ -14,6 +14,7 @@ common --incompatible_disallow_empty_glob
 
 build --cxxopt "-std=c++17"        --host_cxxopt "-std=c++17"
 build --cxxopt "-xc++"             --host_cxxopt "-xc++"
+build --cxxopt "-DBAZEL_BUILD"     --host_cxxopt "-DBAZEL_BUILD"
 
 # Needed for floating point stability in FFT (fft_test will check this).
 # See also https://kristerw.github.io/2021/11/09/fp-contract/

MODULE.bazel

@@ -79,7 +79,6 @@ bazel_dep(name = "boost.smart_ptr", version = BOOST_VERSION)
 bazel_dep(name = "boost.spirit", version = BOOST_VERSION)
 bazel_dep(name = "boost.stacktrace", version = BOOST_VERSION)
 bazel_dep(name = "boost.system", version = BOOST_VERSION)
-bazel_dep(name = "boost.test", version = BOOST_VERSION + ".bcr.1")
 bazel_dep(name = "boost.thread", version = BOOST_VERSION + ".bcr.2")
 bazel_dep(name = "boost.tokenizer", version = BOOST_VERSION)
 bazel_dep(name = "boost.unordered", version = BOOST_VERSION)

MODULE.bazel.lock

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

bazel/openmp/bundled.BUILD.bazel

@@ -38,6 +38,7 @@
   stdenv,
   overrideSDK,
   git,
+  yaml-cpp,
 }: let
   or-tools' =
     (or-tools.override {
@@ -111,6 +112,7 @@
       cbc
       re2
       gtest
+      yaml-cpp
     ];
 
     nativeBuildInputs = [

default.nix

@@ -109,7 +109,31 @@ _installCommonDev() {
     fi
     if [ ${bisonInstalledVersion} != ${bisonVersion} ]; then
         cd "${baseDir}"
-        eval wget https://ftp.gnu.org/gnu/bison/bison-${bisonVersion}.tar.gz
+
+        mirrors=(
+            "https://ftp.gnu.org/gnu/bison"
+            "https://ftpmirror.gnu.org/bison"
+            "https://mirrors.kernel.org/gnu/bison"
+            "https://mirrors.dotsrc.org/gnu/bison"
+        )
+
+        success=0
+        for mirror in "${mirrors[@]}"; do
+            url="${mirror}/bison-${bisonVersion}.tar.gz"
+            echo "Trying to download bison from: $url"
+            if wget "$url"; then
+                success=1
+                break
+            else
+                echo "Failed to download from $mirror"
+            fi
+        done
+
+        if [ $success -ne 1 ]; then
+            echo "Error: could not download bison-${bisonVersion}.tar.gz from any mirror."
+            exit 1
+        fi
+
         md5sum -c <(echo "${bisonChecksum} bison-${bisonVersion}.tar.gz") || exit 1
         tar xf bison-${bisonVersion}.tar.gz
         cd bison-${bisonVersion}

etc/DependencyInstaller.sh

@@ -185,7 +185,6 @@ cc_test(
     name = "cts_unittest",
     srcs = ["cts_unittest.cc"],
     features = ["-layering_check"],  # TODO: accesses private headers
-    linkstatic = True,  # TODO: remove once deps define all symbols
     deps = [
         "//src/cts",
         "//src/utl",

src/cts/test/BUILD

@@ -27,12 +27,11 @@ target_sources(cut
 target_link_libraries(cut
   PUBLIC
     rsz_lib
-    libabc
+    ${ABC_LIBRARY}
   PRIVATE
     odb
     dbSta
     OpenSTA
     dbSta_lib
     utl_lib
-    ${ABC_LIBRARY}
  )

src/cut/src/CMakeLists.txt

@@ -8,7 +8,27 @@ package(features = ["layering_check"])
 cc_test(
     name = "cut_abc_test",
     srcs = ["cpp/TestAbc.cc"],
-    linkstatic = True,  # TODO: remove once deps define all symbols
+    data = [
+        "Nangate45/Nangate45_stdcell.lef",
+        "Nangate45/Nangate45_tech.lef",
+        "Nangate45/Nangate45_typ.lib",
+        "aes_nangate45.v",
+        "asap7/asap7_tech_1x_201209.lef",
+        "asap7/asap7sc7p5t_28_R_1x_220121a.lef",
+        "asap7/asap7sc7p5t_AO_RVT_FF_nldm_211120.lib.gz",
+        "asap7/asap7sc7p5t_INVBUF_RVT_FF_nldm_220122.lib.gz",
+        "asap7/asap7sc7p5t_OA_RVT_FF_nldm_211120.lib.gz",
+        "asap7/asap7sc7p5t_SEQ_RVT_FF_nldm_220123.lib",
+        "asap7/asap7sc7p5t_SIMPLE_RVT_FF_nldm_211120.lib.gz",
+        "empty_cut_set.v",
+        "side_outputs_extract.v",
+        "side_outputs_extract_logic_depth.v",
+        "simple_and_gate_extract.v",
+        "sky130/sky130_fd_sc_hd__ss_n40C_1v40.lib",
+        "sky130/sky130hd.tlef",
+        "sky130/sky130hd_std_cell.lef",
+        "sky130_const_cell.v",
+    ],
     deps = [
         "//src/cut",
         "//src/dbSta",

src/cut/test/BUILD

@@ -8,7 +8,7 @@ target_link_libraries(CutGTests
         GTest::gmock
         dbSta_lib
         utl_lib
-        libabc
+        ${ABC_LIBRARY}
         cut
         tst
         ${TCL_LIBRARY}