odb dft: creating dbScanList and also supporting dbBTerm as chain si …

…and so Signed-off-by: Felipe Garay <[email protected]>
fgaray · Mar 20, 2024 · 26d816d · 26d816d
1 parent e4d3d15
commit 26d816d
Show file tree

Hide file tree

Showing 15 changed files with 455 additions and 108 deletions.
diff --git a/src/odb/include/odb/db.h b/src/odb/include/odb/db.h
@@ -144,6 +144,7 @@ class dbPowerDomain;
 class dbPowerSwitch;
 class dbScanChain;
 class dbScanInst;
+class dbScanList;
 class dbScanPartition;
 class dbScanPin;
 class dbTechLayer;
@@ -7660,24 +7661,31 @@ class dbScanChain : public dbObject
  public:
   dbSet<dbScanPartition> getScanPartitions() const;
 
-  dbSet<dbScanInst> getScanInsts() const;
+  dbSet<dbScanList> getScanLists() const;
 
   // User Code Begin dbScanChain
   const std::string& getName() const;
 
   void setName(std::string_view name);
 
   void setScanIn(dbBTerm* scan_in);
-  dbBTerm* getScanIn() const;
+  void setScanIn(dbITerm* scan_in);
+  std::variant<dbBTerm*, dbITerm*> getScanIn() const;
 
   void setScanOut(dbBTerm* scan_out);
-  dbBTerm* getScanOut() const;
+  void setScanOut(dbITerm* scan_out);
+  std::variant<dbBTerm*, dbITerm*> getScanOut() const;
 
   void setScanEnable(dbBTerm* scan_enable);
-  dbBTerm* getScanEnable() const;
+  void setScanEnable(dbITerm* scan_enable);
+  std::variant<dbBTerm*, dbITerm*> getScanEnable() const;
 
-  const std::string& getTestMode() const;
-  void setTestMode(std::string_view test_mode);
+  void setTestMode(dbBTerm* test_mode);
+  void setTestMode(dbITerm* test_mode);
+  std::variant<dbBTerm*, dbITerm*> getTestMode() const;
+
+  void setTestModeName(const std::string& test_mode_name);
+  const std::string& getTestModeName() const;
 
   static dbScanChain* create(dbDft* dft);
   // User Code End dbScanChain
@@ -7714,14 +7722,23 @@ class dbScanInst : public dbObject
   void setAccessPins(const AccessPins& access_pins);
   AccessPins getAccessPins() const;
 
-  std::vector<dbInst*> getInsts() const;
+  dbInst* getInst() const;
 
-  static dbScanInst* create(dbScanChain* scan_chain, dbInst* inst);
-  static dbScanInst* create(dbScanChain* scan_chain,
-                            const std::vector<dbInst*>& insts);
+  static dbScanInst* create(dbScanList* scan_list, dbInst* inst);
   // User Code End dbScanInst
 };
 
+class dbScanList : public dbObject
+{
+ public:
+  dbSet<dbScanInst> getScanInsts() const;
+
+  // User Code Begin dbScanList
+  dbScanInst* add(dbInst* inst);
+  static dbScanList* create(dbScanChain* scan_chain);
+  // User Code End dbScanList
+};
+
 class dbScanPartition : public dbObject
 {
  public:

diff --git a/src/odb/include/odb/dbObject.h b/src/odb/include/odb/dbObject.h
@@ -103,6 +103,7 @@ enum dbObjectType
   dbPowerSwitchObj,
   dbScanChainObj,
   dbScanInstObj,
+  dbScanListObj,
   dbScanPartitionObj,
   dbScanPinObj,
   dbTechLayerObj,

diff --git a/src/odb/src/codeGenerator/schema.json b/src/odb/src/codeGenerator/schema.json
@@ -198,6 +198,12 @@
     },
     {
       "first": "dbScanChain",
+      "second": "dbScanList",
+      "type": "1_n",
+      "tbl_name": "scan_lists_"
+    },
+    {
+      "first": "dbScanList",
       "second": "dbScanInst",
       "type": "1_n",
       "tbl_name": "scan_insts_"

diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanChain.json b/src/odb/src/codeGenerator/schema/scan/dbScanChain.json
@@ -9,21 +9,26 @@
     },
     {
       "name": "scan_in_",
-      "type": "dbId<dbBTerm>",
+      "type": "dbId<dbScanPin>",
       "flags": ["private"]
     },
     {
       "name": "scan_out_",
-      "type": "dbId<dbBTerm>",
+      "type": "dbId<dbScanPin>",
       "flags": ["private"]
     },
     {
       "name": "scan_enable_",
-      "type": "dbId<dbBTerm>",
+      "type": "dbId<dbScanPin>",
       "flags": ["private"]
     },
     {
       "name": "test_mode_",
+      "type": "dbId<dbScanPin>",
+      "flags": ["private"]
+    },
+    {
+      "name": "test_mode_name_",
       "type": "std::string",
       "flags": ["private"]
     }

diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanInst.json b/src/odb/src/codeGenerator/schema/scan/dbScanInst.json
@@ -18,8 +18,8 @@
       "flags": ["private"]
     },
     {
-      "name": "insts_",
-      "type": "dbVector<dbId<dbInst>>",
+      "name": "inst_",
+      "type": "dbId<dbInst>",
       "flags": ["private"]
     },
     {
@@ -68,6 +68,7 @@
   "cpp_includes": [
     "dbScanPin.h",
     "dbDft.h",
-    "dbScanChain.h"
+    "dbScanChain.h",
+    "dbScanList.h"
   ]
 }
diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanList.json b/src/odb/src/codeGenerator/schema/scan/dbScanList.json
@@ -0,0 +1,7 @@
+{
+  "name": "dbScanList",
+  "type": "dbObject",
+  "cpp_includes": [
+    "dbScanChain.h"
+  ]
+}
diff --git a/src/odb/src/db/CMakeLists.txt b/src/odb/src/db/CMakeLists.txt
@@ -104,6 +104,7 @@ add_library(db
     dbPowerSwitch.cpp
     dbScanChain.cpp
     dbScanInst.cpp
+    dbScanList.cpp
     dbScanPartition.cpp
     dbScanPin.cpp
     dbTechLayer.cpp

diff --git a/src/odb/src/db/dbObject.cpp b/src/odb/src/db/dbObject.cpp
@@ -107,6 +107,7 @@ static const char* name_tbl[] = {"dbDatabase",
                                  "dbPowerSwitch",
                                  "dbScanChain",
                                  "dbScanInst",
+                                 "dbScanList",
                                  "dbScanPartition",
                                  "dbScanPin",
                                  "dbTechLayer",