Merge remote-tracking branch 'origin/master' into hermetic-llvm-toolchain

Signed-off-by: Matt Liberty <mliberty@precisioninno.com>

# Conflicts:
#	MODULE.bazel
#	MODULE.bazel.lock

Author: maliberty

BUILD.bazel

@@ -584,10 +584,14 @@ sh_test(
 sh_binary(
     name = "tidy_tcl",
     srcs = ["//bazel:tcl_tidy.sh"],
-    args = ["$(rootpath //bazel:tclfmt)"],
+    args = [
+        "$(rootpath //bazel:tclfmt)",
+        "$(rootpath @git)",
+    ],
     data = [
         "tclint.toml",
         "//bazel:tclfmt",
+        "@git",
     ],
 )
 
@@ -633,9 +637,13 @@ sh_test(
 sh_binary(
     name = "tidy_bzl",
     srcs = ["//bazel:bzl_tidy.sh"],
-    args = ["$(rootpath @buildifier_prebuilt//:buildifier)"],
+    args = [
+        "$(rootpath @buildifier_prebuilt//:buildifier)",
+        "$(rootpath @git)",
+    ],
     data = [
         "@buildifier_prebuilt//:buildifier",
+        "@git",
     ],
 )
 

MODULE.bazel

@@ -363,7 +363,7 @@ alias(
     visibility = ["//visibility:public"],
 )
 """,
-    path = "bazel",
+    path = "bazel/slang-compat",
 )
 
 # --- Overrides ---

bazel/bzl_tidy.sh

@@ -5,12 +5,13 @@
 # Auto-format all Bazel files in-place using buildifier.
 set -euo pipefail
 TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+GIT="$(realpath "$2")"
 cd "${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
 # `-c submodule.recurse=false` keeps git ls-files from descending into
 # submodules (src/sta, third-party/abc, third-party/slang-elab and the
 # fmt sub-submodule nested in it) — we never want to rewrite files
 # owned by another repo. The override is needed because CI sets
 # submodule.recurse=true globally.
-git -c submodule.recurse=false ls-files \
+"${GIT}" -c submodule.recurse=false ls-files \
         '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
     | xargs -0 "$TOOL" -mode=fix -lint=fix

bazel/fix_lint.sh

@@ -17,13 +17,12 @@ BZL_LINT_BUILDIFIER="$8"
 GIT="$9"
 
 export BUILD_WORKSPACE_DIRECTORY="${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
-
 # TCL: auto-format then lint
-"${TCL_TIDY_SH}" "${TCLFMT}"
+"${TCL_TIDY_SH}" "${TCLFMT}" "${GIT}"
 "${TCL_LINT_SH}" "${TCLINT}" "${GIT}" || rc=$?
 
 # Bazel: auto-format then lint
-"${BZL_TIDY_SH}" "${BZL_FMT_BUILDIFIER}"
+"${BZL_TIDY_SH}" "${BZL_FMT_BUILDIFIER}" "${GIT}"
 "${BZL_LINT_SH}" "${BZL_LINT_BUILDIFIER}" "${GIT}" || rc=$?
 
 "${GIT}" -C "$BUILD_WORKSPACE_DIRECTORY" status

bazel/slang-compat/README

@@ -0,0 +1,3 @@
+Placeholder directory for the @slang alias build
+file to internally manifest.
+(see MODULE.bazel, new_local_repository(name="slang"))

bazel/tcl_lint_test.sh

@@ -6,7 +6,7 @@
 
 set -euo pipefail
 
-TOOL="$(realpath "$1")"
+TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 GIT="$(realpath "$2")"
 
 # With rules_python's script bootstrap (bootstrap_impl=script), a py_binary

bazel/tcl_tidy.sh

@@ -5,5 +5,6 @@
 # Auto-format all TCL files in-place.
 set -euo pipefail
 TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+GIT="$(realpath "$2")"
 cd "${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
-git ls-files '*.tcl' -z | xargs -0 "$TOOL" --in-place
+"${GIT}" ls-files '*.tcl' -z | xargs -0 "$TOOL" --in-place

src/OpenRoad.cc

@@ -520,6 +520,7 @@ void OpenRoad::read3Dbx(const std::string& filename)
 {
   odb::ThreeDBlox parser(logger_, db_, sta_);
   parser.readDbx(filename);
+  db_->constructUnfoldedModel();
   db_->triggerPostRead3Dbx(db_->getChip());
   check3DBlox();
 }

src/dbSta/test/cpp/TestReadVerilog.cpp

@@ -185,4 +185,74 @@ TEST_F(TestReadVerilog, DeepDescendantModBTermCollision)
   EXPECT_EQ(txclk_modnet->getModBTerms().size(), 1u);
 }
 
+TEST_F(TestReadVerilog, EscapedBracketScalarNames)
+{
+  const testing::TestInfo* test_info
+      = testing::UnitTest::GetInstance()->current_test_info();
+  const std::string test_name
+      = std::string(test_info->test_suite_name()) + "_" + test_info->name();
+
+  readVerilogAndSetup(test_name + ".v", /*init_default_sdc=*/false);
+
+  odb::dbBTerm* raw_bterm = block_->findBTerm("foo[3]");
+  odb::dbBTerm* leading_escape_bterm = block_->findBTerm("\\foo[3]");
+  odb::dbBTerm* escaped_bterm = block_->findBTerm("foo\\[3\\]");
+  EXPECT_EQ(raw_bterm, nullptr);
+  EXPECT_EQ(leading_escape_bterm, nullptr);
+  ASSERT_NE(escaped_bterm, nullptr);
+  EXPECT_STREQ(escaped_bterm->getConstName(), "foo\\[3\\]");
+
+  odb::dbModule* child = block_->findModule("child");
+  ASSERT_NE(child, nullptr);
+
+  EXPECT_EQ(child->findModBTerm("foo[3]"), nullptr);
+  EXPECT_EQ(child->findModBTerm("\\foo[3]"), nullptr);
+  odb::dbModBTerm* escaped_modbterm = child->findModBTerm("foo\\[3\\]");
+  ASSERT_NE(escaped_modbterm, nullptr);
+
+  EXPECT_EQ(child->getModNet("foo[3]"), nullptr);
+  EXPECT_EQ(child->getModNet("\\foo[3]"), nullptr);
+  odb::dbModNet* escaped_modnet = child->getModNet("foo\\[3\\]");
+  ASSERT_NE(escaped_modnet, nullptr);
+  EXPECT_EQ(escaped_modbterm->getModNet(), escaped_modnet);
+}
+
+TEST_F(TestReadVerilog, BusBitAndEscapedScalarAreDistinct)
+{
+  const testing::TestInfo* test_info
+      = testing::UnitTest::GetInstance()->current_test_info();
+  const std::string test_name
+      = std::string(test_info->test_suite_name()) + "_" + test_info->name();
+
+  readVerilogAndSetup(test_name + ".v", /*init_default_sdc=*/false);
+
+  odb::dbBTerm* bus_bit_bterm = block_->findBTerm("foo[3]");
+  odb::dbBTerm* leading_escape_bterm = block_->findBTerm("\\foo[3]");
+  odb::dbBTerm* escaped_bterm = block_->findBTerm("foo\\[3\\]");
+  ASSERT_NE(bus_bit_bterm, nullptr);
+  EXPECT_EQ(leading_escape_bterm, nullptr);
+  ASSERT_NE(escaped_bterm, nullptr);
+  EXPECT_NE(bus_bit_bterm, escaped_bterm);
+
+  odb::dbModule* child = block_->findModule("child");
+  ASSERT_NE(child, nullptr);
+
+  odb::dbModBTerm* bus_port = child->findModBTerm("foo");
+  odb::dbModBTerm* bus_bit_port = child->findModBTerm("foo[3]");
+  odb::dbModBTerm* escaped_port = child->findModBTerm("foo\\[3\\]");
+  ASSERT_NE(bus_port, nullptr);
+  ASSERT_NE(bus_bit_port, nullptr);
+  EXPECT_EQ(child->findModBTerm("\\foo[3]"), nullptr);
+  ASSERT_NE(escaped_port, nullptr);
+  EXPECT_NE(bus_bit_port, escaped_port);
+
+  odb::dbModNet* bus_bit_modnet = child->getModNet("foo[3]");
+  odb::dbModNet* escaped_modnet = child->getModNet("foo\\[3\\]");
+  ASSERT_NE(bus_bit_modnet, nullptr);
+  EXPECT_EQ(child->getModNet("\\foo[3]"), nullptr);
+  ASSERT_NE(escaped_modnet, nullptr);
+  EXPECT_NE(bus_bit_modnet, escaped_modnet);
+  EXPECT_EQ(escaped_port->getModNet(), escaped_modnet);
+}
+
 }  // namespace sta

src/dbSta/test/cpp/TestReadVerilog_BusBitAndEscapedScalarAreDistinct.v

@@ -0,0 +1,29 @@
+module top (foo,
+    \foo[3] ,
+    out_bus,
+    out_scalar);
+ input [7:0] foo;
+ input \foo[3] ;
+ output out_bus;
+ output out_scalar;
+
+ child u_child (.foo(foo),
+    .\foo[3] (\foo[3] ),
+    .out_bus(out_bus),
+    .out_scalar(out_scalar));
+endmodule
+
+module child (foo,
+    \foo[3] ,
+    out_bus,
+    out_scalar);
+ input [7:0] foo;
+ input \foo[3] ;
+ output out_bus;
+ output out_scalar;
+
+ BUF_X1 bus_load (.A(foo[3]),
+    .Z(out_bus));
+ BUF_X1 scalar_load (.A(\foo[3] ),
+    .Z(out_scalar));
+endmodule