Merge pull request #8602 from The-OpenROAD-Project-staging/pdk-fixtures

Improve the pdk tst fixtures

Author: maliberty

src/odb/test/cpp/TestAbstractLef.cc

@@ -21,6 +21,8 @@ namespace odb {
 
 using ::testing::HasSubstr;
 
+using tst::Sky130Fixture;
+
 TEST_F(Sky130Fixture, AbstractLefWriterMapsTieOffToSignal)
 {
   // Arrange

src/odb/test/cpp/TestPolygonalFloorplan.cc

@@ -20,6 +20,8 @@
 
 namespace odb {
 
+using tst::Nangate45Fixture;
+
 TEST_F(Nangate45Fixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
 {
   // Act

src/rsz/test/BUILD

@@ -248,7 +248,7 @@ cc_test(
         "//src/rsz",
         "//src/sta:opensta_lib",
         "//src/stt",
-        "//src/tst",
+        "//src/tst:nangate45_fixture",
         "//src/utl",
         "@googletest//:gtest",
         "@googletest//:gtest_main",

src/rsz/test/cpp/TestBufferRemoval.cc

@@ -32,7 +32,7 @@
 #include "sta/Units.hh"
 #include "stt/SteinerTreeBuilder.h"
 #include "tcl.h"
-#include "tst/fixture.h"
+#include "tst/nangate45_fixture.h"
 #include "utl/CallBackHandler.h"
 #include "utl/Logger.h"
 #include "utl/deleter.h"
@@ -41,7 +41,7 @@ namespace rsz {
 
 static const std::string prefix("_main/src/rsz/test/");
 
-class BufRemTest : public tst::Fixture
+class BufRemTest : public tst::Nangate45Fixture
 {
  protected:
   BufRemTest()
@@ -59,38 +59,29 @@ class BufRemTest : public tst::Fixture
              &dp_),
         ep_(&logger_, &callback_handler_, db_.get(), sta_.get(), &stt_, &grt_),
         resizer_(&logger_, db_.get(), sta_.get(), &stt_, &grt_, &dp_, &ep_)
-  {
-  }
-
-  void SetUp() override
   {
     library_ = readLiberty(prefix + "Nangate45/Nangate45_typ.lib");
-    loadTechAndLib("tech", "Nangate45", prefix + "Nangate45/Nangate45.lef");
-
     db_network_ = sta_->getDbNetwork();
-
-    // create a chain consisting of 4 buffers
-    odb::dbChip* chip = odb::dbChip::create(db_.get(), db_->getTech());
-    odb::dbBlock* block = odb::dbBlock::create(chip, "top");
-    db_network_->setBlock(block);
-    block->setDieArea(odb::Rect(0, 0, 1000, 1000));
+    db_network_->setBlock(block_);
+    block_->setDieArea(odb::Rect(0, 0, 1000, 1000));
     // register proper callbacks for timer like read_def
-    sta_->postReadDef(block);
+    sta_->postReadDef(block_);
 
+    // create a chain consisting of 4 buffers
     const char* layer = "metal1";
 
-    makeBTerm(block,
+    makeBTerm(block_,
               "in1",
               {.bpins = {{.layer_name = layer, .rect = {0, 0, 10, 10}}}});
 
     odb::dbBTerm* outPort = makeBTerm(
-        block,
+        block_,
         "out1",
         {.io_type = odb::dbIoType::OUTPUT,
          .bpins = {{.layer_name = layer, .rect = {990, 990, 1000, 1000}}}});
 
     makeBTerm(
-        block,
+        block_,
         "out2",
         {.io_type = odb::dbIoType::OUTPUT,
          .bpins = {{.layer_name = layer, .rect = {980, 980, 1000, 990}}}});
@@ -102,7 +93,7 @@ class BufRemTest : public tst::Fixture
                         const char* out_net) {
       odb::dbMaster* master = db_->findMaster(master_name);
       return tst::Fixture::makeInst(
-          block,
+          block_,
           master,
           inst_name,
           {.location = location,
@@ -148,9 +139,6 @@ TEST_F(BufRemTest, SlackImproves)
       = sta_->vertexArrival(outVertex_, sta::RiseFall::rise(), pathAnalysisPt_);
 
   // Remove buffers 'b2' and 'b3' from the buffer chain
-  odb::dbChip* chip = db_->getChip();
-  odb::dbBlock* block = chip->getBlock();
-
   resizer_.initBlock();
   db_->setLogger(&logger_);
 
@@ -161,11 +149,11 @@ TEST_F(BufRemTest, SlackImproves)
     resizer_.logger()->setDebugLevel(utl::RSZ, "journal", 1);
 
     auto insts = std::make_unique<sta::InstanceSeq>();
-    odb::dbInst* inst1 = block->findInst("b2");
+    odb::dbInst* inst1 = block_->findInst("b2");
     sta::Instance* sta_inst1 = db_network_->dbToSta(inst1);
     insts->emplace_back(sta_inst1);
 
-    odb::dbInst* inst2 = block->findInst("b3");
+    odb::dbInst* inst2 = block_->findInst("b3");
     sta::Instance* sta_inst2 = db_network_->dbToSta(inst2);
     insts->emplace_back(sta_inst2);
 

src/tst/BUILD

@@ -16,6 +16,7 @@ cc_library(
     ],
     includes = ["."],
     visibility = ["//visibility:public"],
+    deps = [":tst"],
 )
 
 cc_library(
@@ -26,6 +27,7 @@ cc_library(
     ],
     includes = ["."],
     visibility = ["//visibility:public"],
+    deps = [":tst"],
 )
 
 cc_library(

src/tst/include/tst/nangate45_fixture.h

@@ -7,12 +7,12 @@
 #include "odb/db.h"
 #include "tst/fixture.h"
 
-namespace odb {
+namespace tst {
 
 class Nangate45Fixture : public tst::Fixture
 {
  protected:
-  void SetUp() override
+  Nangate45Fixture()
   {
     lib_ = loadTechAndLib("ng45", "ng45", "_main/test/Nangate45/Nangate45.lef");
     chip_ = odb::dbChip::create(db_.get(), db_->getTech());
@@ -26,4 +26,4 @@ class Nangate45Fixture : public tst::Fixture
   odb::dbBlock* block_;
 };
 
-}  // namespace odb
+}  // namespace tst

src/tst/include/tst/sky130_fixture.h

@@ -6,11 +6,11 @@
 #include "odb/db.h"
 #include "tst/fixture.h"
 
-namespace odb {
+namespace tst {
 class Sky130Fixture : public tst::Fixture
 {
  protected:
-  void SetUp() override
+  Sky130Fixture()
   {
     lib_ = loadTechAndLib(
         "sky130", "sky130", "_main/test/sky130hd/sky130_fd_sc_hd_merged.lef");
@@ -25,4 +25,4 @@ class Sky130Fixture : public tst::Fixture
   odb::dbChip* chip_;
   odb::dbBlock* block_;
 };
-}  // namespace odb
+}  // namespace tst