gpl: fix conflicts with concurring open versus recently merged PR

Signed-off-by: Augusto Berndt <[email protected]>

Author: gudeh

.bazelrc

@@ -75,8 +75,8 @@ test --build_tests_only
 build --jobs=200
 
 # Enable local disk caching to supplement the remote cache.
-# The location can be overridden by setting the OPENROAD_BAZEL_CACHE env variable.
-build --disk_cache=$(OPENROAD_BAZEL_CACHE:-~/.cache/bazel-disk-cache)
+build --disk_cache=~/.cache/bazel-disk-cache
+build --repository_cache=~/.cache/bazel-repository-cache
 
 # --- CI Settings (write access) ---
 build:ci --remote_cache=https://storage.googleapis.com/openroad-bazel-cache
@@ -94,5 +94,7 @@ build:openroad-dev --remote_upload_local_results=false
 # Developers need the actual output files to run and use them.
 build:openroad-dev --remote_download_toplevel
 build:openroad-dev --google_default_credentials=true
+build:openroad-dev --disk_cache=/workspace/.cache/bazel-disk-cache
+build:openroad-dev --repository_cache=/workspace/.cache/bazel-repository-cache
 
 try-import %workspace%/user.bazelrc

etc/DependencyInstaller.sh

@@ -64,8 +64,8 @@ _installCommonDev() {
     cmakeVersionSmall=${cmakeVersionBig}.6
     pcreVersion=10.42
     pcreChecksum="37d2f77cfd411a3ddf1c64e1d72e43f7"
-    swigVersion=4.1.0
-    swigChecksum="794433378154eb61270a3ac127d9c5f3"
+    swigVersion=4.3.0
+    swigChecksum="9f74c7f402aa28d9f75e67d1990ee6fb"
     boostVersionBig=1.86
     boostVersionSmall=${boostVersionBig}.0
     boostChecksum="ac857d73bb754b718a039830b07b9624"
@@ -587,16 +587,13 @@ Then, rerun this script.
 EOF
         exit 1
     fi
-    brew install bison boost cmake eigen flex fmt groff libomp or-tools pandoc pyqt5 python spdlog tcl-tk zlib
+    brew install bison boost cmake eigen flex fmt groff libomp or-tools pandoc pyqt5 python spdlog tcl-tk zlib swig
 
     # Some systems need this to correctly find OpenMP package during build
     brew link --force libomp
 
     # Lemon is not in the homebrew-core repo
     brew install The-OpenROAD-Project/lemon-graph/lemon-graph
-
-    # Install swig 4.1.1
-    _installHomebrewPackage "swig" "c83c8aaa6505c3ea28c35bc45a54234f79e46c5d" "s/"
 }
 
 _installDebianCleanUp() {

src/dbSta/src/dbSta.cc

@@ -166,6 +166,9 @@ class dbStaCbk : public dbBlockCallBackObj
   void inDbBTermSetSigType(dbBTerm* bterm, const dbSigType& sig_type) override;
 
  private:
+  // for inDbInstSwapMasterBefore/inDbInstSwapMasterAfter
+  bool swap_master_arcs_equiv_ = false;
+
   dbSta* sta_;
   dbNetwork* network_ = nullptr;
   Logger* logger_;
@@ -724,7 +727,10 @@ void dbSta::deleteInstance(Instance* inst)
 
 void dbSta::replaceCell(Instance* inst, Cell* to_cell, LibertyCell* to_lib_cell)
 {
-  Sta::replaceCell(inst, to_cell, to_lib_cell);
+  // do not call `Sta::replaceCell` as sta's before/after hooks are called
+  // from db callbacks
+  NetworkEdit* network = networkCmdEdit();
+  network->replaceCell(inst, to_cell);
 }
 
 void dbSta::deleteNet(Net* net)
@@ -923,20 +929,25 @@ void dbStaCbk::inDbInstSwapMasterBefore(dbInst* inst, dbMaster* master)
   LibertyCell* to_lib_cell = network_->libertyCell(network_->dbToSta(master));
   LibertyCell* from_lib_cell = network_->libertyCell(inst);
   Instance* sta_inst = network_->dbToSta(inst);
-  if (sta::equivCells(from_lib_cell, to_lib_cell)) {
+
+  swap_master_arcs_equiv_ = sta::equivCellsArcs(from_lib_cell, to_lib_cell);
+
+  if (swap_master_arcs_equiv_) {
     sta_->replaceEquivCellBefore(sta_inst, to_lib_cell);
   } else {
-    logger_->error(STA,
-                   1000,
-                   "instance {} swap master {} is not equivalent",
-                   inst->getConstName(),
-                   master->getConstName());
+    sta_->replaceCellBefore(sta_inst, to_lib_cell);
   }
 }
 
 void dbStaCbk::inDbInstSwapMasterAfter(dbInst* inst)
 {
-  sta_->replaceEquivCellAfter(network_->dbToSta(inst));
+  Instance* sta_inst = network_->dbToSta(inst);
+
+  if (swap_master_arcs_equiv_) {
+    sta_->replaceEquivCellAfter(sta_inst);
+  } else {
+    sta_->replaceCellAfter(sta_inst);
+  }
 }
 
 void dbStaCbk::inDbNetDestroy(dbNet* db_net)

src/gpl/src/graphics.cpp

@@ -350,7 +350,7 @@ void Graphics::reportSelected()
   if (selected_ == kInvalidIndex) {
     return;
   }
-  logger_->report("Inst: {}", nbc_->getGCellByIndex(selected_)->name());
+  logger_->report("Inst: {}", nbc_->getGCellByIndex(selected_)->getName());
 
   if (np_) {
     auto wlCoeffX = np_->getWireLengthCoefX();
@@ -365,7 +365,7 @@ void Graphics::reportSelected()
                       wlGrad.x,
                       wlGrad.y,
                       weight,
-                      gPin->pin()->name());
+                      gPin->pin()->getName());
     }
 
     FloatPoint wlGrad = nbc_->getWireLengthGradientWA(