Merge branch 'master' of https://github.com/The-OpenROAD-Project-private/OpenROAD into secure-integrate-hier-fixes4

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

.github/workflows/github-actions-are-odb-files-generated.yml

@@ -16,6 +16,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: 'recursive'
       - name: setup
         run: |
           python3 -m venv venv

.github/workflows/github-actions-lint-tcl.yml

@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
       - name: Install Dependencies
         run: |
           python3 -m venv venv

MODULE.bazel

@@ -79,6 +79,7 @@ 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

@@ -165,6 +165,22 @@ ObjectId dbNetwork::getDbNwkObjectId(const dbObject* object) const
   return 0;
 }
 
+// We have exactly 8 values available in the lower 3 bits of the
+// pointer due to these classes all having 8 byte alignment. Used
+// to avoid having to call into the database to figure out the
+// type information, which requires a lot of pointer indirection.
+
+// Used to get the value of the pointer tag.
+static constexpr std::uintptr_t kPointerTagMask = std::uintptr_t(0b111U);
+
+enum class PinPointerTags : std::uintptr_t
+{
+  kNone = 0U,
+  kDbIterm = 1U,
+  kDbBterm = 2U,
+  kDbModIterm = 3U,
+};
+
 class DbLibraryIterator1 : public Iterator<Library*>
 {
  public:
@@ -470,14 +486,14 @@ bool DbNetPinIterator::hasNext()
   while (iitr_ != iitr_end_) {
     dbITerm* iterm = *iitr_;
     if (!iterm->getSigType().isSupply()) {
-      next_ = reinterpret_cast<Pin*>(*iitr_);
+      next_ = network_->dbToSta(*iitr_);
       ++iitr_;
       return true;
     }
     iitr_++;
   }
   if ((mitr_ != mitr_end_) && (network_->hasHierarchy())) {
-    next_ = reinterpret_cast<Pin*>(*mitr_);
+    next_ = network_->dbToSta(*mitr_);
     ++mitr_;
     return true;
   }
@@ -1212,14 +1228,20 @@ ObjectId dbNetwork::id(const Pin* pin) const
 
   if (hierarchy_) {
     // get the id for hierarchical objects using dbid.
-    const dbObject* obj = reinterpret_cast<const dbObject*>(pin);
+    std::uintptr_t tag_value
+        = reinterpret_cast<std::uintptr_t>(pin) & kPointerTagMask;
+    // Need to cast to char pin to avoid compiler error for pointer
+    // arithmetic on incomplete types
+    const char* char_pin = reinterpret_cast<const char*>(pin);
+    const dbObject* obj
+        = reinterpret_cast<const dbObject*>(char_pin - tag_value);
     return getDbNwkObjectId(obj);
   }
   if (iterm != nullptr) {
     return iterm->getId() << 1;
   }
   if (bterm != nullptr) {
-    return (bterm->getId() << 1) + 1;
+    return (bterm->getId() << 1) | 1U;
   }
   return 0;
 }
@@ -2768,17 +2790,32 @@ void dbNetwork::staToDb(const Pin* pin,
   iterm = nullptr;
   bterm = nullptr;
   moditerm = nullptr;
-  if (pin) {
-    dbObject* obj = reinterpret_cast<dbObject*>(const_cast<Pin*>(pin));
-    dbObjectType type = obj->getObjectType();
-    if (type == dbITermObj) {
-      iterm = static_cast<dbITerm*>(obj);
-    } else if (type == dbBTermObj) {
-      bterm = static_cast<dbBTerm*>(obj);
-    } else if (type == dbModITermObj) {
-      moditerm = static_cast<dbModITerm*>(obj);
-    } else {
-      logger_->error(ORD, 2018, "Pin is not ITerm or BTerm or modITerm.");
+
+  // Get the value of the tag
+  std::uintptr_t pointer_with_tag = reinterpret_cast<std::uintptr_t>(pin);
+  PinPointerTags tag_value
+      = static_cast<PinPointerTags>(pointer_with_tag & kPointerTagMask);
+
+  // Cast to char* and avoid casting an integral type to pointer type
+  // by doing pointer arithmetic. Compiler apparently prefer this sytle.
+  const char* char_pointer_pin = reinterpret_cast<const char*>(pin);
+  char* pointer_without_tag = const_cast<char*>(
+      char_pointer_pin - static_cast<std::uintptr_t>(tag_value));
+
+  if (pointer_without_tag) {
+    switch (tag_value) {
+      case PinPointerTags::kDbIterm:
+        iterm = reinterpret_cast<dbITerm*>(pointer_without_tag);
+        break;
+      case PinPointerTags::kDbBterm:
+        bterm = reinterpret_cast<dbBTerm*>(pointer_without_tag);
+        break;
+      case PinPointerTags::kDbModIterm:
+        moditerm = reinterpret_cast<dbModITerm*>(pointer_without_tag);
+        break;
+      case PinPointerTags::kNone:
+        logger_->error(ORD, 2018, "Pin is not ITerm or BTerm or modITerm.");
+        break;
     }
   }
 }
@@ -2941,7 +2978,10 @@ Instance* dbNetwork::dbToSta(dbModInst* inst) const
 
 Pin* dbNetwork::dbToSta(dbModITerm* mod_iterm) const
 {
-  return reinterpret_cast<Pin*>(mod_iterm);
+  char* unaligned_pointer = reinterpret_cast<char*>(mod_iterm);
+  return reinterpret_cast<Pin*>(
+      unaligned_pointer
+      + static_cast<std::uintptr_t>(PinPointerTags::kDbModIterm));
 }
 
 Net* dbNetwork::dbToSta(dbModNet* net) const
@@ -2986,12 +3026,18 @@ const Net* dbNetwork::dbToSta(const dbModNet* net) const
 
 Pin* dbNetwork::dbToSta(dbBTerm* bterm) const
 {
-  return reinterpret_cast<Pin*>(bterm);
+  char* unaligned_pointer = reinterpret_cast<char*>(bterm);
+  return reinterpret_cast<Pin*>(
+      unaligned_pointer
+      + static_cast<std::uintptr_t>(PinPointerTags::kDbBterm));
 }
 
 Pin* dbNetwork::dbToSta(dbITerm* iterm) const
 {
-  return reinterpret_cast<Pin*>(iterm);
+  char* unaligned_pointer = reinterpret_cast<char*>(iterm);
+  return reinterpret_cast<Pin*>(
+      unaligned_pointer
+      + static_cast<std::uintptr_t>(PinPointerTags::kDbIterm));
 }
 
 Term* dbNetwork::dbToStaTerm(dbBTerm* bterm) const
@@ -3687,9 +3733,12 @@ void dbNetwork::hierarchicalConnect(dbITerm* source_pin,
       }
       if (dest_mod_net) {
         dlogHierConnReusingConnection(dest_db_module, dest_mod_net);
-        dbNet* dest_flat_net = flatNet((Pin*) dest_pin);
-        disconnectPin((Pin*) dest_pin);
-        connectPin((Pin*) dest_pin, (Net*) dest_flat_net, (Net*) dest_mod_net);
+        Pin* sta_dest_pin = dbToSta(dest_pin);
+        dbNet* dest_flat_net = flatNet(sta_dest_pin);
+        disconnectPin(sta_dest_pin);
+        connectPin(sta_dest_pin,
+                   (Net*) dest_flat_net,
+                   (Net*) dest_mod_net);  // jk: check
         return;
       }
     }
@@ -3746,14 +3795,15 @@ void dbNetwork::hierarchicalConnect(dbITerm* source_pin,
         dlogHierConnCreatingTopNet(connection_name, highest_common_module);
 
         // Get base name of source_pin_flat_net
-        dbNet* source_pin_flat_net = flatNet((Pin*) source_pin);
+        Pin* sta_source_pin = dbToSta(source_pin);
+        dbNet* source_pin_flat_net = flatNet(sta_source_pin);
         const char* base_name = name(dbToSta(source_pin_flat_net));
 
         // Create and connect dbModNet
         source_db_mod_net = dbModNet::create(highest_common_module, base_name);
         top_mod_dest->connect(source_db_mod_net);
-        disconnectPin((Pin*) source_pin);
-        connectPin((Pin*) source_pin,
+        disconnectPin(sta_source_pin);
+        connectPin(sta_source_pin,
                    (Net*) source_pin_flat_net,
                    (Net*) source_db_mod_net);
         top_net = source_db_mod_net;
@@ -3775,22 +3825,25 @@ void dbNetwork::hierarchicalConnect(dbITerm* source_pin,
     // the hiearchy tree
 
     // reassociate the dest pin
-    dbModNet* dest_pin_mod_net = hierNet((Pin*) dest_pin);
+
+    Pin* sta_dest_pin = dbToSta(dest_pin);
+    dbModNet* dest_pin_mod_net = hierNet(sta_dest_pin);
     if (dest_pin_mod_net) {
-      dbNet* dest_pin_flat_net = flatNet((Pin*) dest_pin);
+      dbNet* dest_pin_flat_net = flatNet(sta_dest_pin);
       dlogHierConnReassociatingDstPin(dest_pin_flat_net, dest_pin_mod_net);
       dest_pin->disconnect();
       connectPin(
-          (Pin*) dest_pin, (Net*) dest_pin_flat_net, (Net*) dest_pin_mod_net);
+          sta_dest_pin, (Net*) dest_pin_flat_net, (Net*) dest_pin_mod_net);
     }
 
     // reassociate the source pin
-    dbModNet* source_pin_mod_net = hierNet((Pin*) source_pin);
+    Pin* sta_source_pin = dbToSta(source_pin);
+    dbModNet* source_pin_mod_net = hierNet(sta_source_pin);
     if (source_pin_mod_net) {
-      dbNet* source_pin_flat_net = flatNet((Pin*) source_pin);
+      dbNet* source_pin_flat_net = flatNet(sta_source_pin);
       dlogHierConnReassociatingSrcPin(source_pin_flat_net, source_pin_mod_net);
       source_pin->disconnect();
-      connectPin((Pin*) source_pin,
+      connectPin(sta_source_pin,
                  (Net*) source_pin_flat_net,
                  (Net*) source_pin_mod_net);
     }

src/dbSta/src/dbNetwork.cc

@@ -302,7 +302,9 @@ bool PlacementDRC::checkPadding(const Node* cell,
     for (GridY grid_y{y}; grid_y < cell_y_end; grid_y++) {
       const Pixel* pixel = grid_->gridPixel(grid_x, grid_y);
       if (pixel == nullptr) {  // at the core edge
-        if (!cell->isFixed()) {
+        const bool left_edge = x == 0;
+        const bool right_edge = cell_x_end == grid_->getRowSiteCount();
+        if (!cell->isFixed() && !left_edge && !right_edge) {
           // Padding violation with the core edge.
           return false;
         }

src/dpl/src/PlacementDRC.cpp

@@ -56,6 +56,7 @@ COMPULSORY_TESTS = [
     "pad06",
     "pad07",
     "pad08",
+    "pad09",
     "regions1",
     "regions2",
     "regions3",

src/dpl/test/BUILD

@@ -59,6 +59,7 @@ or_integration_tests(
     pad06
     pad07
     pad08
+    pad09
     regions1
     regions2
     regions3

src/dpl/test/CMakeLists.txt

@@ -33,16 +33,14 @@ VIAS 3 ;
     - via5_960x2800 + VIARULE Via5Array-0 + CUTSIZE 280 280  + LAYERS metal5 metal6 via5  + CUTSPACING 320 320  + ENCLOSURE 40 60 40 60  + ROWCOL 5 2  ;
     - via6_960x2800 + VIARULE Via6Array-0 + CUTSIZE 280 280  + LAYERS metal6 metal7 via6  + CUTSPACING 320 320  + ENCLOSURE 340 360 340 360  + ROWCOL 4 1  ;
 END VIAS
-COMPONENTS 9 ;
-    - FILLER_0_0 FILLCELL_X2 + SOURCE DIST + PLACED ( 3800 2800 ) FS ;
-    - FILLER_0_25 FILLCELL_X4 + SOURCE DIST + PLACED ( 13300 2800 ) FS ;
-    - FILLER_0_29 FILLCELL_X2 + SOURCE DIST + PLACED ( 14820 2800 ) FS ;
+COMPONENTS 7 ;
+    - FILLER_0_23 FILLCELL_X8 + SOURCE DIST + PLACED ( 12540 2800 ) FS ;
     - FILLER_0_31 FILLCELL_X1 + SOURCE DIST + PLACED ( 15580 2800 ) FS ;
-    - FILLER_0_9 FILLCELL_X16 + SOURCE DIST + PLACED ( 7220 2800 ) FS ;
+    - FILLER_0_7 FILLCELL_X16 + SOURCE DIST + PLACED ( 6460 2800 ) FS ;
     - FILLER_1_0 FILLCELL_X32 + SOURCE DIST + PLACED ( 3800 5600 ) N ;
     - FILLER_2_0 FILLCELL_X32 + SOURCE DIST + PLACED ( 3800 8400 ) FS ;
     - FILLER_3_0 FILLCELL_X32 + SOURCE DIST + PLACED ( 3800 11200 ) N ;
-    - _277_ BUF_X4 + PLACED ( 4560 2800 ) FS ;
+    - _277_ BUF_X4 + PLACED ( 3800 2800 ) FS ;
 END COMPONENTS
 PINS 2 ;
     - input + NET input + DIRECTION INPUT + USE SIGNAL

src/dpl/test/fillers2.defok

@@ -6,12 +6,12 @@
 [INFO ODB-0133]     Created 2 nets and 2 connections.
 Placement Analysis
 ---------------------------------
-total displacement          3.7 u
-average displacement        3.7 u
-max displacement            3.7 u
+total displacement          3.3 u
+average displacement        3.3 u
+max displacement            3.3 u
 original HPWL               2.3 u
-legalized HPWL              9.9 u
-delta HPWL                  332 %
+legalized HPWL              9.1 u
+delta HPWL                  299 %
 
-[INFO DPL-0001] Placed 8 filler instances.
+[INFO DPL-0001] Placed 6 filler instances.
 No differences found.