Merge branch 'master' of https://github.com/The-OpenROAD-Project-private/OpenROAD into trivial

Author: jhkim-pii

WORKSPACE

@@ -8,9 +8,9 @@ workspace(name = "openroad")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-rules_hdl_git_hash = "4bfc8987e521f2002e7b898ba94d3df4c6204913"
+rules_hdl_git_hash = "80266603b55778dd30531c9b286152a7b664fbb7"
 
-rules_hdl_git_sha256 = "227ac0288299f2b0f31a188113cef9f733258398fd616215275bddab1e43d019"
+rules_hdl_git_sha256 = "38f04d38cfbf46c52643325b496673d607ce5ea6fda99dc1dfa3997a520bb0c2"
 
 http_archive(
     name = "rules_hdl",

src/odb/include/odb/db.h

@@ -3263,6 +3263,12 @@ class dbInst : public dbObject
   ///
   bool isEndCap() const;
 
+  ///
+  /// Get the scan version of this instance.
+  /// Returns nullptr if this instance has no scan version.
+  ///
+  dbScanInst* getScanInst() const;
+
   void setPinAccessIdx(uint idx);
 
   uint getPinAccessIdx() const;
@@ -8440,6 +8446,8 @@ class dbScanInst : public dbObject
 
   dbInst* getInst() const;
 
+  void insertAtFront(dbScanList* scan_list);
+
   static dbScanInst* create(dbScanList* scan_list, dbInst* inst);
   // User Code End dbScanInst
 };
@@ -8452,9 +8460,8 @@ class dbScanInst : public dbObject
 class dbScanList : public dbObject
 {
  public:
-  dbSet<dbScanInst> getScanInsts() const;
-
   // User Code Begin dbScanList
+  dbSet<dbScanInst> getScanInsts() const;
   dbScanInst* add(dbInst* inst);
   static dbScanList* create(dbScanPartition* scan_partition);
   // User Code End dbScanList

src/odb/include/odb/dbId.h

@@ -40,3 +40,17 @@ class dbId
 };
 
 }  // namespace odb
+
+// Enable unordered_map/set usage
+namespace std {
+
+template <typename T>
+struct hash<odb::dbId<T>>
+{
+  std::size_t operator()(const odb::dbId<T>& db_id) const
+  {
+    return std::hash<unsigned int>()(db_id);
+  }
+};
+
+}  // namespace std

src/odb/src/codeGenerator/schema.json

@@ -153,6 +153,15 @@
       "reversible": "true",
       "orderReversed": "true",
       "sequential": 0
+    },
+    {
+      "name": "dbScanListScanInstItr",
+      "parentObject": "dbScanInst",
+      "tableName": "scan_inst_tbl",
+      "reversible": "true",
+      "orderReversed": "true",
+      "sequential": 0,
+      "includes": ["dbScanList.h", "dbScanInst.h"]
     }
   ],
   "relations":[
@@ -301,12 +310,6 @@
       "type": "1_n",
       "tbl_name": "scan_lists_"
     },
-    {
-      "parent": "dbScanList",
-      "child": "dbScanInst",
-      "type": "1_n",
-      "tbl_name": "scan_insts_"
-    },
     {
       "parent": "dbDft",
       "child": "dbScanChain",

src/odb/src/codeGenerator/schema/scan/dbScanInst.json

@@ -42,6 +42,18 @@
       "type": "uint",
       "default": "0",
       "flags": ["private"]
+    },
+    {
+      "name": "_next_list_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": ["private"],
+      "schema":"db_schema_block_owns_scan_insts"
+    },
+    {
+      "name": "_prev_list_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": ["private"],
+      "schema":"db_schema_block_owns_scan_insts"
     }
   ],
   "enums": [

src/odb/src/codeGenerator/schema/scan/dbScanList.json

@@ -9,6 +9,27 @@
     "optimizing the scan chain."],
   "cpp_includes": [
     "dbScanChain.h",
-    "dbScanPartition.h"
+    "dbScanPartition.h",
+    "dbDft.h",
+    "dbScanListScanInstItr.h"],
+  "fields": [
+    {
+      "name": "_unused",
+      "type": "uint",
+      "flags": [
+        "private"
+      ],
+      "default": 0,
+      "comment": "// As the elements of a free dbTable are 12 bytes long, we need this additional member in order to make _dbScanList big enough to allow safe casting between table members.",
+      "schema": "db_schema_block_owns_scan_insts"
+    },
+    {
+      "name": "_first_scan_inst",
+      "type": "dbId<_dbScanInst>",
+      "flags": [
+        "private"
+      ],
+      "schema": "db_schema_block_owns_scan_insts"
+    }
   ]
 }

src/odb/src/codeGenerator/templates/serializer_out.cpp

@@ -14,13 +14,7 @@
         stream << {{field.name}}bit_field;
       {% else %}
         {% if 'no-serial' not in field.flags %}
-          {% if 'schema' in field %}
-          if (obj.getDatabase()->isSchema({{field.schema}})) {
-          {% endif %}
           stream << {% if field.table %}*{% endif %}obj.{{field.name}};
-          {% if 'schema' in field %}
-          }
-          {% endif %}
         {% endif %}
       {% endif %}
     {% endfor %}

src/odb/src/db/CMakeLists.txt

@@ -161,6 +161,7 @@ add_library(db
     dbModulePortItr.cpp
     dbNetTrackItr.cpp
     dbRegionGroupItr.cpp
+    dbScanListScanInstItr.cpp
     # Generator Code End cpp
 )
 

src/odb/src/db/dbBTerm.cpp

@@ -156,8 +156,6 @@ bool _dbBTerm::operator==(const _dbBTerm& rhs) const
 
 dbOStream& operator<<(dbOStream& stream, const _dbBTerm& bterm)
 {
-  dbBlock* block = (dbBlock*) (bterm.getOwner());
-  _dbDatabase* db = (_dbDatabase*) (block->getDataBase());
   uint* bit_field = (uint*) &bterm._flags;
   stream << *bit_field;
   stream << bterm._ext_id;
@@ -166,25 +164,17 @@ dbOStream& operator<<(dbOStream& stream, const _dbBTerm& bterm)
   stream << bterm._net;
   stream << bterm._next_bterm;
   stream << bterm._prev_bterm;
-  if (db->isSchema(db_schema_update_hierarchy)) {
-    stream << bterm._mnet;
-    stream << bterm._next_modnet_bterm;
-    stream << bterm._prev_modnet_bterm;
-  }
+  stream << bterm._mnet;
+  stream << bterm._next_modnet_bterm;
+  stream << bterm._prev_modnet_bterm;
   stream << bterm._parent_block;
   stream << bterm._parent_iterm;
   stream << bterm._bpins;
   stream << bterm._ground_pin;
   stream << bterm._supply_pin;
-  if (bterm.getDatabase()->isSchema(db_schema_bterm_constraint_region)) {
-    stream << bterm._constraint_region;
-  }
-  if (bterm.getDatabase()->isSchema(db_schema_bterm_mirrored_pin)) {
-    stream << bterm._mirrored_bterm;
-  }
-  if (bterm.getDatabase()->isSchema(db_schema_bterm_is_mirrored)) {
-    stream << bterm._is_mirrored;
-  }
+  stream << bterm._constraint_region;
+  stream << bterm._mirrored_bterm;
+  stream << bterm._is_mirrored;
 
   return stream;
 }

src/odb/src/db/dbBlock.cpp

@@ -91,6 +91,8 @@
 #include "dbSBoxItr.h"
 #include "dbSWire.h"
 #include "dbSWireItr.h"
+#include "dbScanInst.h"
+#include "dbScanListScanInstItr.h"
 #include "dbTable.h"
 #include "dbTable.hpp"
 #include "dbTech.h"
@@ -180,6 +182,9 @@ _dbBlock::_dbBlock(_dbDatabase* db)
   _inst_tbl = new dbTable<_dbInst>(
       db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbInstObj);
 
+  _scan_inst_tbl = new dbTable<_dbScanInst>(
+      db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbScanInstObj);
+
   _module_tbl = new dbTable<_dbModule>(
       db, this, (GetObjTbl_t) &_dbBlock::getObjectTable, dbModuleObj);
 
@@ -338,6 +343,8 @@ _dbBlock::_dbBlock(_dbDatabase* db)
 
   _inst_iterm_itr = new dbInstITermItr(_iterm_tbl);
 
+  _scan_list_scan_inst_itr = new dbScanListScanInstItr(_scan_inst_tbl);
+
   _box_itr = new dbBoxItr<1024>(_box_tbl, nullptr, false);
 
   _swire_itr = new dbSWireItr(_swire_tbl);
@@ -406,6 +413,7 @@ _dbBlock::~_dbBlock()
   delete _net_tbl;
   delete _inst_hdr_tbl;
   delete _inst_tbl;
+  delete _scan_inst_tbl;
   delete _module_tbl;
   delete _modinst_tbl;
   delete _modbterm_tbl;
@@ -450,6 +458,7 @@ _dbBlock::~_dbBlock()
   delete _net_bterm_itr;
   delete _net_iterm_itr;
   delete _inst_iterm_itr;
+  delete _scan_list_scan_inst_itr;
   delete _box_itr;
   delete _swire_itr;
   delete _sbox_itr;
@@ -738,7 +747,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
     (**cbitr)().inDbBlockStreamOutBefore(
         (dbBlock*) &block);  // client ECO initialization  - payam
   }
-  _dbDatabase* db = block.getImpl()->getDatabase();
   dbOStreamScope scope(stream, "dbBlock");
   stream << block._def_units;
   stream << block._dbu_per_micron;
@@ -750,9 +758,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
   stream << block._corner_name_list;
   stream << block._name;
   stream << block._die_area;
-  if (db->isSchema(db_schema_dbblock_blocked_regions_for_pins)) {
-    stream << block._blocked_regions_for_pins;
-  }
+  stream << block._blocked_regions_for_pins;
   stream << block._tech;
   stream << block._chip;
   stream << block._bbox;
@@ -786,22 +792,14 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
   stream << *block._iterm_tbl;
   stream << *block._net_tbl;
   stream << *block._inst_hdr_tbl;
-  if (db->isSchema(db_schema_db_remove_hash)) {
-    stream << *block._module_tbl;
-    stream << *block._inst_tbl;
-  } else {
-    stream << *block._inst_tbl;
-    stream << *block._module_tbl;
-  }
+  stream << *block._module_tbl;
+  stream << *block._inst_tbl;
+  stream << *block._scan_inst_tbl;
   stream << *block._modinst_tbl;
-  if (db->isSchema(db_schema_update_hierarchy)) {
-    stream << *block._modbterm_tbl;
-    if (db->isSchema(db_schema_db_remove_hash)) {
-      stream << *block._busport_tbl;
-    }
-    stream << *block._moditerm_tbl;
-    stream << *block._modnet_tbl;
-  }
+  stream << *block._modbterm_tbl;
+  stream << *block._busport_tbl;
+  stream << *block._moditerm_tbl;
+  stream << *block._modnet_tbl;
   stream << *block._powerdomain_tbl;
   stream << *block._logicport_tbl;
   stream << *block._powerswitch_tbl;
@@ -842,18 +840,13 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
   stream << *block._dft_tbl;
   stream << *block._marker_categories_tbl;
   stream << block._marker_category_hash;
-  if (block.getDatabase()->isSchema(db_schema_dbblock_layers_ranges)) {
-    stream << block._min_routing_layer;
-    stream << block._max_routing_layer;
-    stream << block._min_layer_for_clock;
-    stream << block._max_layer_for_clock;
-  }
-  if (db->isSchema(db_schema_block_pin_groups)) {
-    stream << block._bterm_groups;
-  }
-  if (db->isSchema(db_schema_bterm_top_layer_grid)) {
-    stream << block._bterm_top_layer_grid;
-  }
+  stream << block._min_routing_layer;
+  stream << block._max_routing_layer;
+  stream << block._min_layer_for_clock;
+  stream << block._max_layer_for_clock;
+  stream << block._bterm_groups;
+  stream << block._bterm_top_layer_grid;
+  stream << block._inst_scan_inst_map;
 
   //---------------------------------------------------------- stream out
   // properties
@@ -959,6 +952,9 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
     stream >> *block._inst_tbl;
     stream >> *block._module_tbl;
   }
+  if (db->isSchema(db_schema_block_owns_scan_insts)) {
+    stream >> *block._scan_inst_tbl;
+  }
   stream >> *block._modinst_tbl;
   if (db->isSchema(db_schema_update_hierarchy)) {
     stream >> *block._modbterm_tbl;
@@ -1029,6 +1025,9 @@ dbIStream& operator>>(dbIStream& stream, _dbBlock& block)
   if (db->isSchema(db_schema_bterm_top_layer_grid)) {
     stream >> block._bterm_top_layer_grid;
   }
+  if (db->isSchema(db_schema_map_insts_to_scan_insts)) {
+    stream >> block._inst_scan_inst_map;
+  }
 
   //---------------------------------------------------------- stream in
   // properties