Merge pull request #8488 from The-OpenROAD-Project-staging/fix-omp-bzl

rm runtime/src/test-touch.c from the omp bazel build

Author: maliberty

.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

@@ -8,6 +8,27 @@ package(features = ["layering_check"])
 cc_test(
     name = "cut_abc_test",
     srcs = ["cpp/TestAbc.cc"],
+    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",
+    ],
     linkstatic = True,  # TODO: remove once deps define all symbols
     deps = [
         "//src/cut",

src/cut/test/BUILD

@@ -62,19 +62,22 @@ using cut::LogicCut;
 using cut::LogicExtractorFactory;
 using ::testing::Contains;
 
-std::once_flag init_abc_flag;
+static std::once_flag init_abc_flag;
+
+static const std::string prefix("_main/src/cut/test/");
 
 class AbcTest : public tst::Fixture
 {
  protected:
   void SetUp() override
   {
     std::call_once(init_abc_flag, []() { abc::Abc_Start(); });
-    library_ = readLiberty("./Nangate45/Nangate45_typ.lib");
+    library_ = readLiberty(prefix + "Nangate45/Nangate45_typ.lib");
 
     odb::dbTech* tech
-        = loadTechLef("nangate45", "./Nangate45/Nangate45_tech.lef");
-    loadLibaryLef(tech, "nangate45", "./Nangate45/Nangate45_stdcell.lef");
+        = loadTechLef("nangate45", prefix + "Nangate45/Nangate45_tech.lef");
+    loadLibaryLef(
+        tech, "nangate45", prefix + "Nangate45/Nangate45_stdcell.lef");
 
     sta::Units* units = library_->units();
     power_unit_ = units->powerUnit();
@@ -87,7 +90,7 @@ class AbcTest : public tst::Fixture
     ord::dbVerilogNetwork verilog_network(sta_.get());
 
     sta::VerilogReader verilog_reader(&verilog_network);
-    verilog_reader.read(file_name.c_str());
+    verilog_reader.read(getFilePath(file_name).c_str());
 
     ord::dbLinkDesign(top.c_str(),
                       &verilog_network,
@@ -143,11 +146,11 @@ class AbcTestSky130 : public AbcTest
   {
     std::call_once(init_abc_flag, []() { abc::Abc_Start(); });
 
-    library_ = readLiberty("./sky130/sky130_fd_sc_hd__ss_n40C_1v40.lib");
+    library_ = readLiberty(prefix + "sky130/sky130_fd_sc_hd__ss_n40C_1v40.lib");
 
-    odb::dbTech* tech = loadTechLef("sky130", "./sky130/sky130hd.tlef");
-    odb::dbLib* lib
-        = loadLibaryLef(tech, "sky130", "./sky130/sky130hd_std_cell.lef");
+    odb::dbTech* tech = loadTechLef("sky130", prefix + "sky130/sky130hd.tlef");
+    odb::dbLib* lib = loadLibaryLef(
+        tech, "sky130", prefix + "sky130/sky130hd_std_cell.lef");
 
     sta_->postReadLef(tech, lib);
 
@@ -163,20 +166,20 @@ class AbcTestAsap7 : public AbcTest
     std::call_once(init_abc_flag, []() { abc::Abc_Start(); });
 
     std::array<const char*, 5> liberty_paths
-        = {"./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"};
+        = {"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"};
 
     for (const char* liberty_path : liberty_paths) {
-      library_ = readLiberty(liberty_path);
+      library_ = readLiberty(prefix + liberty_path);
     }
 
     odb::dbTech* tech
-        = loadTechLef("asap7", "./asap7/asap7_tech_1x_201209.lef");
+        = loadTechLef("asap7", prefix + "asap7/asap7_tech_1x_201209.lef");
     odb::dbLib* lib = loadLibaryLef(
-        tech, "asap7", "./asap7/asap7sc7p5t_28_R_1x_220121a.lef");
+        tech, "asap7", prefix + "asap7/asap7sc7p5t_28_R_1x_220121a.lef");
 
     sta_->postReadLef(tech, lib);
 
@@ -353,7 +356,7 @@ TEST_F(AbcTest, ExtractsAndGateCorrectly)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("simple_and_gate_extract.v");
+  LoadVerilog(prefix + "simple_and_gate_extract.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -378,7 +381,7 @@ TEST_F(AbcTest, ExtractsEmptyCutSetCorrectly)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("empty_cut_set.v");
+  LoadVerilog(prefix + "empty_cut_set.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -402,7 +405,7 @@ TEST_F(AbcTest, ExtractSideOutputsCorrectly)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("side_outputs_extract.v");
+  LoadVerilog(prefix + "side_outputs_extract.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -433,7 +436,7 @@ TEST_F(AbcTest, BuildAbcMappedNetworkFromLogicCut)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("side_outputs_extract_logic_depth.v");
+  LoadVerilog(prefix + "side_outputs_extract_logic_depth.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -479,7 +482,7 @@ TEST_F(AbcTest, BuildComplexLogicCone)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("aes_nangate45.v", /*top=*/"aes_cipher_top");
+  LoadVerilog(prefix + "aes_nangate45.v", /*top=*/"aes_cipher_top");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -503,7 +506,7 @@ TEST_F(AbcTest, InsertingMappedLogicCutDoesNotThrow)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("aes_nangate45.v", /*top=*/"aes_cipher_top");
+  LoadVerilog(prefix + "aes_nangate45.v", /*top=*/"aes_cipher_top");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -533,7 +536,7 @@ TEST_F(AbcTest,
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("side_outputs_extract_logic_depth.v");
+  LoadVerilog(prefix + "side_outputs_extract_logic_depth.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Vertex* flop_input_vertex = nullptr;
@@ -595,7 +598,7 @@ TEST_F(AbcTestSky130, EnsureThatSky130MultiOutputConstCellsAreMapped)
   factory.AddDbSta(sta_.get());
   AbcLibrary abc_library = factory.Build();
 
-  LoadVerilog("sky130_const_cell.v");
+  LoadVerilog(prefix + "sky130_const_cell.v");
 
   sta::dbNetwork* network = sta_->getDbNetwork();
   sta::Instance* flop_input_instance = network->findInstance("_403_");

src/cut/test/cpp/TestAbc.cc

@@ -176,6 +176,10 @@ filegroup(
 cc_test(
     name = "dbsta_hconn_unittest",
     srcs = ["cpp/TestHconn.cpp"],
+    data = [
+        "Nangate45/Nangate45.lef",
+        "Nangate45/Nangate45_typ.lib",
+    ],
     linkstatic = True,  # TODO: remove once deps define all symbols
     deps = [
         "//src/dbSta",

src/dbSta/test/BUILD

@@ -37,6 +37,8 @@
 
 namespace odb {
 
+static const std::string prefix("_main/src/dbSta/test/");
+
 /*
   Extract the hierarchical information in human readable format.
   Shows the dbNet and dbModNet view of the database.
@@ -216,9 +218,9 @@ class TestHconn : public ::tst::Fixture
   void SetUp() override
   {
     // this will be so much easier with read_def
-    auto path = std::filesystem::canonical("./Nangate45/Nangate45_typ.lib");
-    library_ = readLiberty(path.string().c_str());
-    lib_ = loadTechAndLib("tech", "Nangate45.lef", "./Nangate45/Nangate45.lef");
+    library_ = readLiberty(prefix + "Nangate45/Nangate45_typ.lib");
+    lib_ = loadTechAndLib(
+        "tech", "Nangate45", prefix + "Nangate45/Nangate45.lef");
 
     db_network_ = sta_->getDbNetwork();
     // turn on hierarchy

src/dbSta/test/cpp/TestHconn.cpp

@@ -166,7 +166,6 @@ if(ENABLE_TESTS)
     ${FLEXROUTE_HOME}/test/gcTest.cpp
     ${FLEXROUTE_HOME}/test/fixture.cpp
     ${FLEXROUTE_HOME}/test/stubs.cpp
-    ${OPENROAD_HOME}/src/gui/src/stub.cpp
   )
 
   target_include_directories(trTest
@@ -176,24 +175,13 @@ if(ENABLE_TESTS)
   )
 
   target_link_libraries(trTest
-    drt
+    drt_lib
     odb
+    GTest::gtest
+    GTest::gtest_main
+    GTest::gmock
   )
 
-  # Use the shared library if found.  We need to pass this info to
-  # the code to select the corresponding include.  Using the shared
-  # library speeds up compilation.
-  if (Boost_unit_test_framework_FOUND)
-    message(STATUS "Boost unit_test_framework library found")
-    target_link_libraries(trTest
-      Boost::unit_test_framework
-    )
-    target_compile_definitions(trTest
-      PRIVATE
-      HAS_BOOST_UNIT_TEST_LIBRARY
-    )
-  endif()
-
   add_test(NAME trTest COMMAND trTest)
   add_dependencies(build_and_test trTest)
 

src/drt/CMakeLists.txt

@@ -125,6 +125,7 @@ cc_test(
         "//src/drt:db_hdrs",
         "//src/odb",
         "//src/utl",
-        "@boost.test",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
     ],
 )