Move access point swapMaster test to odb

Signed-off-by: Jaehyun Kim <jhkim@precisioninno.com>

Author: jhkim-pii

src/odb/src/db/dbInst.cpp

@@ -1220,6 +1220,7 @@ bool dbInst::swapMaster(dbMaster* new_master_)
     dbITerm* iterm = (dbITerm*) block->iterm_tbl_->getPtr(iterm_id);
     iterm->clearPrefAccessPoints();
   }
+  inst->pin_access_idx_ = -1;
 
   // remove reference to inst_hdr
   _dbInstHdr* old_inst_hdr

src/odb/test/cpp/TestAccessPoint.cpp

@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <filesystem>
 #include <fstream>
 #include <ios>
@@ -76,5 +77,49 @@ TEST_F(SimpleDbFixture, test_default)
   dbDatabase::destroy(db2);
 }
 
+TEST_F(SimpleDbFixture, SwapMasterClearsAndInvalidatesAccessPoints)
+{
+  createSimpleDB();
+  dbBlock* block = db_->getChip()->getBlock();
+  dbLib* lib = db_->findLib("lib1");
+  ASSERT_NE(lib, nullptr);
+  dbMaster* old_master = db_->findMaster("and2");
+  ASSERT_NE(old_master, nullptr);
+  dbMaster* new_master
+      = createMaster2X1(lib, "and2_x4", 2000, 1000, "a", "b", "o");
+  ASSERT_NE(new_master, nullptr);
+  dbMTerm* old_term = old_master->findMTerm("a");
+  ASSERT_NE(old_term, nullptr);
+  dbMTerm* new_term = new_master->findMTerm("a");
+  ASSERT_NE(new_term, nullptr);
+
+  // Create APs on both masters so a stale pin-access index would be visible.
+  dbMPin* old_pin = dbMPin::create(old_term);
+  ASSERT_NE(old_pin, nullptr);
+  dbAccessPoint* old_ap = dbAccessPoint::create(block, old_pin, 0);
+  ASSERT_NE(old_ap, nullptr);
+  dbMPin* new_pin = dbMPin::create(new_term);
+  ASSERT_NE(new_pin, nullptr);
+  dbAccessPoint* new_ap = dbAccessPoint::create(block, new_pin, 0);
+  ASSERT_NE(new_ap, nullptr);
+
+  dbInst* inst = dbInst::create(block, old_master, "i1");
+  ASSERT_NE(inst, nullptr);
+  dbITerm* iterm = inst->getITerm(old_term);
+  ASSERT_NE(iterm, nullptr);
+  inst->setPinAccessIdx(0);
+  iterm->setAccessPoint(old_pin, old_ap);
+  ASSERT_EQ(iterm->getPrefAccessPoints().size(), 1);
+  ASSERT_EQ(iterm->getAccessPoints().at(old_pin).size(), 1);
+
+  ASSERT_TRUE(inst->swapMaster(new_master));
+  dbITerm* swapped_iterm = inst->findITerm("a");
+  ASSERT_NE(swapped_iterm, nullptr);
+
+  EXPECT_EQ(inst->getPinAccessIdx(), static_cast<uint32_t>(-1));
+  EXPECT_TRUE(swapped_iterm->getPrefAccessPoints().empty());
+  EXPECT_TRUE(swapped_iterm->getAccessPoints().empty());
+}
+
 }  // namespace
 }  // namespace odb

src/rsz/test/BUILD

@@ -379,12 +379,9 @@ cc_test(
         "Nangate45/Nangate45.lef",
         "Nangate45/Nangate45_typ.lib",
     ] + glob(["cpp/TestBufferRemoval3*.v"]),
-    features = ["-layering_check"],
     deps = [
         "//src/dbSta",
         "//src/dbSta:dbNetwork",
-        "//src/drt",
-        "//src/dst",
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/tst:integrated_fixture",
@@ -401,12 +398,9 @@ cc_test(
         "Nangate45/Nangate45.lef",
         "Nangate45/Nangate45_typ.lib",
     ] + glob(["cpp/TestBufferRemoval3*.v"]),
-    features = ["-layering_check"],
     deps = [
         "//src/dbSta",
         "//src/dbSta:dbNetwork",
-        "//src/drt",
-        "//src/dst",
         "//src/odb",
         "//src/sta:opensta_lib",
         "//src/tst:integrated_fixture",

src/rsz/test/cpp/CMakeLists.txt

@@ -68,8 +68,6 @@ target_link_libraries(TestBufferRemoval3
         utl_lib
         rsz_lib
         grt_lib
-        drt_lib
-        dst_lib
         dpl_lib
         stt_lib
         odb
@@ -80,7 +78,6 @@ target_link_libraries(TestBufferRemoval3
 target_include_directories(TestBufferRemoval3
     PRIVATE
       ${PROJECT_SOURCE_DIR}/src/rsz/src
-      ${PROJECT_SOURCE_DIR}/src/drt/src
 )
 
 gtest_discover_tests(TestBufferRemoval3

src/rsz/test/cpp/TestBufferRemoval3.cc

@@ -6,20 +6,12 @@
 #include <iterator>
 #include <memory>
 #include <string>
-#include <vector>
 
-#include "../../../odb/src/db/dbAccessPoint.h"
-#include "AbstractGraphicsFactory.h"
 #include "db_sta/dbSta.hh"
-#include "dr/AbstractDRGraphics.h"
-#include "drt/TritonRoute.h"
-#include "dst/Distributed.h"
 #include "gtest/gtest.h"
 #include "odb/db.h"
-#include "pa/AbstractPAGraphics.h"
 #include "sta/NetworkClass.hh"
 #include "sta/VerilogWriter.hh"
-#include "ta/AbstractTAGraphics.h"
 #include "tst/IntegratedFixture.h"
 #include "utl/Logger.h"
 
@@ -40,116 +32,6 @@ class BufRemTest3 : public tst::IntegratedFixture
   bool debug_ = false;  // Set to true to generate debug output
 };
 
-// Dummy GraphicsFactory for drt.initGraphics(). Needed for drt.pinAccess()
-class NullGraphicsFactory : public drt::AbstractGraphicsFactory
-{
- public:
-  void reset(drt::frDebugSettings*,
-             drt::frDesign*,
-             odb::dbDatabase*,
-             utl::Logger*,
-             drt::RouterConfiguration*) override
-  {
-  }
-
-  bool guiActive() override { return false; }
-
-  std::unique_ptr<drt::AbstractDRGraphics> makeUniqueDRGraphics() override
-  {
-    return nullptr;
-  }
-
-  std::unique_ptr<drt::AbstractTAGraphics> makeUniqueTAGraphics() override
-  {
-    return nullptr;
-  }
-
-  std::unique_ptr<drt::AbstractPAGraphics> makeUniquePAGraphics() override
-  {
-    return nullptr;
-  }
-};
-
-static void addTrackGrid(odb::dbBlock* block, const char* layer_name)
-{
-  odb::dbTechLayer* layer = block->getTech()->findLayer(layer_name);
-  ASSERT_NE(layer, nullptr);
-  odb::dbTrackGrid* grid = block->findTrackGrid(layer);
-  if (grid == nullptr) {
-    grid = odb::dbTrackGrid::create(block, layer);
-  }
-  ASSERT_NE(grid, nullptr);
-  grid->addGridPatternX(0, 200, 190);
-  grid->addGridPatternY(0, 200, 190);
-}
-
-static void addBPinShape(odb::dbBlock* block,
-                         const char* bterm_name,
-                         const int x,
-                         const int y)
-{
-  odb::dbBTerm* bterm = block->findBTerm(bterm_name);
-  ASSERT_NE(bterm, nullptr);
-  odb::dbTechLayer* layer = block->getTech()->findLayer("metal2");
-  ASSERT_NE(layer, nullptr);
-  odb::dbBPin* bpin = odb::dbBPin::create(bterm);
-  ASSERT_NE(bpin, nullptr);
-  odb::dbBox* box = odb::dbBox::create(bpin, layer, x, y, x + 190, y + 190);
-  ASSERT_NE(box, nullptr);
-  bpin->setPlacementStatus(odb::dbPlacementStatus::PLACED);
-}
-
-// Reproduce the failing sizeup,buffer ECO sequence.
-// 1. DRT pinAccess first sets a preferred AP and its back-reference.
-// 2. A sizeup-like swapMaster then changes the current MTerm/MPin context
-//    before Resizer removes the buffer.
-// 3. Buffer destruction must clear the AP back-reference.
-TEST_F(BufRemTest3, RemoveBufferAfterSwapMaster)
-{
-  readVerilogAndSetup("TestBufferRemoval3_9.v");
-
-  block_->setDieArea(odb::Rect(0, 0, 40000, 40000));
-  for (const char* layer_name :
-       {"metal1", "metal2", "metal3", "metal4", "metal5"}) {
-    addTrackGrid(block_, layer_name);
-  }
-  addBPinShape(block_, "clk", 0, 2000);
-  addBPinShape(block_, "in", 0, 4000);
-  addBPinShape(block_, "out", 2000, 4000);
-
-  odb::dbInst* buf_inst = block_->findInst("buf1");
-  ASSERT_NE(buf_inst, nullptr);
-  buf_inst->setLocation(0, 0);
-  buf_inst->setPlacementStatus(odb::dbPlacementStatus::PLACED);
-
-  dst::Distributed dist(&logger_);
-  drt::TritonRoute drt(db_.get(), &logger_, &service_registry_, &dist, &stt_);
-  drt.initGraphics(std::make_unique<NullGraphicsFactory>());
-  drt.pinAccess();
-
-  odb::dbITerm* buf_a = buf_inst->findITerm("A");
-  ASSERT_NE(buf_a, nullptr);
-  const std::vector<odb::dbAccessPoint*> pref_aps
-      = buf_a->getPrefAccessPoints();
-  ASSERT_FALSE(pref_aps.empty());
-  odb::_dbAccessPoint* ap_impl
-      = static_cast<odb::_dbAccessPoint*>(pref_aps[0]->getImpl());
-  ASSERT_EQ(ap_impl->iterms_.size(), 1U);
-
-  odb::dbMaster* sized_master = db_->findMaster("BUF_X4");
-  ASSERT_NE(sized_master, nullptr);
-  ASSERT_TRUE(buf_inst->swapMaster(sized_master));
-
-  sta::Instance* sta_buf = db_network_->dbToSta(buf_inst);
-  ASSERT_NE(sta_buf, nullptr);
-  sta::InstanceSeq insts;
-  insts.emplace_back(sta_buf);
-  resizer_.removeBuffers(insts);
-
-  EXPECT_EQ(block_->findInst("buf1"), nullptr);
-  EXPECT_TRUE(ap_impl->iterms_.empty());
-}
-
 TEST_F(BufRemTest3, RemoveBufferCase9)
 {
   std::string test_name = "TestBufferRemoval3_9";