Merge remote-tracking branch 'private/master' into gpl-new-regions

Author: gudeh

Jenkinsfile

@@ -1,5 +1,9 @@
 @Library('[email protected]') _
 
+def logHostname() {
+    sh label: "Running on ${env.NODE_NAME}", script: "echo 'Node context established.'"
+}
+
 def baseTests(String image) {
     Map base_tests = [failFast: false];
 
@@ -43,6 +47,7 @@ def baseTests(String image) {
     flow_tests.each { current_test ->
         base_tests["Flow Test - ${current_test}"] = {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage("Setup ${current_test}") {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -78,6 +83,7 @@ def getParallelTests(String image) {
     def ret = [
         'Docs Tester': {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage('Setup Docs Test') {
                         echo "Setting up Docs Tester environment in ${image}";
@@ -101,6 +107,7 @@ def getParallelTests(String image) {
 
         'Build without GUI': {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage('Setup no-GUI Build') {
                         echo "Build without GUI";
@@ -118,6 +125,7 @@ def getParallelTests(String image) {
 
         'Build without Test': {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage('Setup no-test Build') {
                         echo "Build without Tests";
@@ -139,6 +147,7 @@ def getParallelTests(String image) {
 
         'Build on RHEL8': {
             node ('rhel8') {
+                logHostname()
                 stage('Setup RHEL8 Build') {
                     checkout scm;
                 }
@@ -172,6 +181,7 @@ def getParallelTests(String image) {
 
         'Unit Tests Ninja': {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage('Setup Ninja Tests') {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -195,6 +205,7 @@ def getParallelTests(String image) {
 
         'Compile with C++20': {
             node {
+                logHostname()
                 withDockerContainer(args: '-u root', image: image) {
                     stage('Setup C++20 Compile') {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
@@ -213,6 +224,7 @@ def getParallelTests(String image) {
 
 def bazelTest = {
     node {
+        logHostname()
         stage('Setup') {
             checkout scm;
             sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
@@ -265,6 +277,7 @@ def dockerTests = {
         test_os.each { os ->
             build_docker_images["Test Installer - ${os.name}"] = {
                 node {
+                    logHostname()
                     checkout scm;
                     sh label: 'Build Docker image', script: "./etc/DockerHelper.sh create -target=builder -os=${os.image}";
                     sh label: 'Test Docker image', script: "./etc/DockerHelper.sh test -target=builder -os=${os.image} -smoke";

src/dbSta/include/db_sta/dbNetwork.hh

@@ -72,14 +72,14 @@ class dbNetwork : public ConcreteNetwork
   CellPortIterator* portIterator(const Cell* cell) const override;
 
   // sanity checkers
-  void checkAxioms() const;
+  void checkAxioms(odb::dbObject* obj = nullptr) const;
   void checkSanityModBTerms() const;
   void checkSanityModITerms() const;
   void checkSanityModuleInsts() const;
   void checkSanityModInstTerms() const;
   void checkSanityUnusedModules() const;
   void checkSanityTermConnectivity() const;
-  void checkSanityNetConnectivity() const;
+  void checkSanityNetConnectivity(odb::dbObject* obj = nullptr) const;
   void checkSanityInstNames() const;
   void checkSanityNetNames() const;
   void checkSanityModNetNamesInModule(odb::dbModule* module) const;

src/dbSta/src/dbNetwork.cc

@@ -65,6 +65,7 @@ Recommended conclusion: use map for concrete cells. They are invariant.
 #include "odb/dbSet.h"
 #include "odb/dbTypes.h"
 #include "sta/Liberty.hh"
+#include "sta/Network.hh"
 #include "sta/NetworkClass.hh"
 #include "sta/PatternMatch.hh"
 #include "sta/PortDirection.hh"
@@ -4130,8 +4131,15 @@ void dbNetwork::accumulateFlatLoadPinsOnNet(
 }
 
 // Use this API to check if flat & hier connectivities are ok
-void dbNetwork::checkAxioms() const
+void dbNetwork::checkAxioms(odb::dbObject* obj) const
 {
+  // Check with an object if provided
+  if (obj != nullptr) {
+    checkSanityNetConnectivity(obj);
+    return;
+  }
+
+  // Otherwise, check the whole design
   checkSanityModBTerms();
   checkSanityModITerms();
   checkSanityModInstTerms();
@@ -4458,79 +4466,90 @@ void dbNetwork::checkSanityTermConnectivity() const
   }
 }
 
-void dbNetwork::checkSanityNetConnectivity() const
+void dbNetwork::checkSanityNetConnectivity(odb::dbObject* obj) const
 {
-  // Check for hier net and flat net connectivity
-  dbSet<dbModNet> mod_nets = block()->getModNets();
-  for (dbModNet* mod_net : mod_nets) {
-    findRelatedDbNet(mod_net);
-  }
-
-  // Check for incomplete flat net connections
-  for (odb::dbNet* net_db : block_->getNets()) {
-    // Check for multiple drivers.
-    Net* net = dbToSta(net_db);
-    PinSeq loads;
-    PinSeq drvrs;
-    PinSet visited_drvrs(this);
-    FindNetDrvrLoads visitor(nullptr, visited_drvrs, loads, drvrs, this);
-    NetSet visited_nets(this);
-    visitConnectedPins(net, visitor, visited_nets);
-
-    if (drvrs.size() > 1) {
-      bool all_tristate = true;
-      for (const Pin* drvr : drvrs) {
-        LibertyPort* port = libertyPort(drvr);
-        if (!port || !port->direction()->isAnyTristate()) {
-          all_tristate = false;
-          break;
+  //
+  // Check for a specific object if provided
+  //
+  if (obj != nullptr) {
+    // Collect relevant nets from the provided object
+    std::set<odb::dbNet*> nets_to_check;
+    std::set<odb::dbModNet*> mod_nets_to_check;
+
+    auto const obj_type = obj->getObjectType();
+    if (obj_type == odb::dbNetObj) {
+      nets_to_check.insert(static_cast<odb::dbNet*>(obj));
+    } else if (obj_type == odb::dbModNetObj) {
+      mod_nets_to_check.insert(static_cast<odb::dbModNet*>(obj));
+    } else if (obj_type == odb::dbInstObj) {
+      auto inst = static_cast<odb::dbInst*>(obj);
+      for (auto iterm : inst->getITerms()) {
+        if (iterm->getNet() != nullptr) {
+          nets_to_check.insert(iterm->getNet());
+        }
+        if (iterm->getModNet() != nullptr) {
+          mod_nets_to_check.insert(iterm->getModNet());
         }
       }
-
-      if (!all_tristate) {
-        std::string drivers_str;
-        for (const Pin* drvr : drvrs) {
-          drivers_str += " " + std::string(pathName(drvr));
+    } else if (obj_type == odb::dbModInstObj) {
+      auto mod_inst = static_cast<odb::dbModInst*>(obj);
+      for (auto mod_iterm : mod_inst->getModITerms()) {
+        if (mod_iterm->getModNet() != nullptr) {
+          mod_nets_to_check.insert(mod_iterm->getModNet());
         }
-        logger_->error(
-            ORD,
-            2049,
-            "SanityCheck: Net '{}' has multiple non-tristate drivers:{}",
-            name(net),
-            drivers_str);
       }
-    }
-    const uint iterm_count = net_db->getITerms().size();
-    const uint bterm_count = net_db->getBTerms().size();
-    if (iterm_count + bterm_count >= 2) {
-      continue;
+    } else if (obj_type == odb::dbITermObj) {
+      auto iterm = static_cast<odb::dbITerm*>(obj);
+      if (iterm->getNet() != nullptr) {
+        nets_to_check.insert(iterm->getNet());
+      }
+      if (iterm->getModNet() != nullptr) {
+        mod_nets_to_check.insert(iterm->getModNet());
+      }
+    } else if (obj_type == odb::dbBTermObj) {
+      auto bterm = static_cast<odb::dbBTerm*>(obj);
+      if (bterm->getNet() != nullptr) {
+        nets_to_check.insert(bterm->getNet());
+      }
+      if (bterm->getModNet() != nullptr) {
+        mod_nets_to_check.insert(bterm->getModNet());
+      }
+    } else if (obj_type == odb::dbModITermObj) {
+      auto mod_iterm = static_cast<odb::dbModITerm*>(obj);
+      if (mod_iterm->getModNet() != nullptr) {
+        mod_nets_to_check.insert(mod_iterm->getModNet());
+      }
+    } else if (obj_type == odb::dbModBTermObj) {
+      auto mod_bterm = static_cast<odb::dbModBTerm*>(obj);
+      if (mod_bterm->getModNet() != nullptr) {
+        mod_nets_to_check.insert(mod_bterm->getModNet());
+      }
     }
 
-    // Skip power/ground net
-    if (net_db->getSigType().isSupply()) {
-      continue;  // OK: Unconnected power/ground net
+    // Now run checks on the collected nets.
+    for (odb::dbModNet* mod_net : mod_nets_to_check) {
+      findRelatedDbNet(mod_net);
     }
 
-    // A net connected to 1 terminal
-    if (iterm_count == 1) {
-      odb::dbITerm* iterm = *(net_db->getITerms().begin());
-      if (iterm->getIoType() == odb::dbIoType::OUTPUT) {
-        continue;  // OK: Unconnected output pin
-      }
-    } else if (bterm_count == 1) {  // This is a top level port
-      odb::dbBTerm* bterm = *(net_db->getBTerms().begin());
-      if (bterm->getIoType() == odb::dbIoType::INPUT) {
-        continue;  // OK: Unconnected input port
-      }
+    for (odb::dbNet* net_db : nets_to_check) {
+      net_db->checkSanity();
     }
+    return;
+  }
 
-    logger_->warn(ORD,
-                  2039,
-                  "SanityCheck: Net '{}' has less than 2 connections (# of "
-                  "ITerms = {}, # of BTerms = {}).",
-                  net_db->getName(),
-                  iterm_count,
-                  bterm_count);
+  //
+  // Check for all nets in the design
+  //
+
+  // Check for hier net and flat net connectivity
+  dbSet<dbModNet> mod_nets = block()->getModNets();
+  for (dbModNet* mod_net : mod_nets) {
+    findRelatedDbNet(mod_net);
+  }
+
+  // Check for incomplete flat net connections
+  for (odb::dbNet* net_db : block()->getNets()) {
+    net_db->checkSanity();
   }
 }
 

src/dbSta/test/check_axioms.ok

@@ -1,7 +1,10 @@
 [INFO ODB-0227] LEF file: Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
-[WARNING ORD-2039] SanityCheck: Net 'out_unconnected' has less than 2 connections (# of ITerms = 0, # of BTerms = 1).
-[WARNING ORD-2039] SanityCheck: Net 'single_conn_wire' has less than 2 connections (# of ITerms = 0, # of BTerms = 0).
-[WARNING ORD-2039] SanityCheck: Net 'w2' has less than 2 connections (# of ITerms = 0, # of BTerms = 1).
+[WARNING ORD-0011] Hierarchical flow (-hier) is currently in development and may cause multiple issues. Do not use in production environments.
+[WARNING ODB-0050] SanityCheck: dbNet 'out_unconnected' has no driver.
+[WARNING ODB-0051] SanityCheck: dbNet 'out_unconnected' is dangling. It has less than 2 connections (# of ITerms = 0, # of BTerms = 1).
+[WARNING ODB-0051] SanityCheck: dbNet 'single_conn_wire' is dangling. It has less than 2 connections (# of ITerms = 0, # of BTerms = 0).
+[WARNING ODB-0050] SanityCheck: dbNet 'w2' has no driver.
+[WARNING ODB-0051] SanityCheck: dbNet 'w2' is dangling. It has less than 2 connections (# of ITerms = 0, # of BTerms = 1).
 [WARNING ORD-2038] SanityCheck: Module 'i_empty' has no instances.
 [WARNING ORD-2038] SanityCheck: Module 'u1' has no instances.
 [WARNING ORD-2038] SanityCheck: Module 'u2' has no instances.

src/dbSta/test/check_axioms.tcl

@@ -5,7 +5,7 @@ source "helpers.tcl"
 read_liberty Nangate45/Nangate45_typ.lib
 read_lef Nangate45/Nangate45.lef
 read_verilog check_axioms.v
-link_design top
+link_design top -hier
 
 # Run the checks and capture output.
 # The 'catch' command is used because sta::check_axioms will exit with an

src/dbSta/test/check_axioms.v

@@ -1,5 +1,4 @@
 // A standard cell definition for the test.
-// Defined as a blackbox to prevent yosys from optimizing it away.
 module and2 (input A, input B, output Z);
 endmodule
 
@@ -19,18 +18,19 @@ module top (
     output out_unconnected // For ORD-2040
 );
 
-    // For ORD-2038: An instance of a module that has no instances inside.
+    // [WARNING ORD-2038] SanityCheck: Module 'i_empty' has no instances.
     empty_module i_empty();
 
-    // For ORD-2041: non-output ITerm not connected.
+    // [ODB-0050] SanityCheck: 'w2' has no driver.
+    // [ODB-0051] SanityCheck: 'w2' has less than 2 connections
     wire w1, w2;
     and2 u1 (.A(w1), .B(), .Z(w2));
 
-    // For ORD-2039: Net with < 2 connections.
+    // [ODB-0051] SanityCheck: 'single_conn_wire' has less than 2 connections
     wire single_conn_wire;
     and2 u2 (.A(single_conn_wire), .B(top_in), .Z());
 
-    wire dangling_wire; // another case for ORD-2039
+    wire dangling_wire;
 
     // Normal connection to make the design valid for linking.
     assign top_out = w2;

src/ifp/include/ifp/InitFloorplan.hh

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <cstdint>
+#include <limits>
 #include <set>
 #include <string>
 #include <vector>
@@ -51,7 +53,7 @@ class InitFloorplan
                      const std::vector<odb::dbSite*>& additional_sites = {},
                      RowParity row_parity = RowParity::NONE,
                      const std::set<odb::dbSite*>& flipped_sites = {},
-                     int gap = -1);
+                     int gap = std::numeric_limits<std::int32_t>::min());
 
   // The base_site determines the single-height rows.  For hybrid rows it is
   // a site containing a row pattern.
@@ -61,7 +63,7 @@ class InitFloorplan
                      const std::vector<odb::dbSite*>& additional_sites = {},
                      RowParity row_parity = RowParity::NONE,
                      const std::set<odb::dbSite*>& flipped_sites = {},
-                     int gap = -1);
+                     int gap = std::numeric_limits<std::int32_t>::min());
 
   void insertTiecells(odb::dbMTerm* tie_term,
                       const std::string& prefix = "TIEOFF_");
@@ -92,7 +94,7 @@ class InitFloorplan
                            = {},
                            RowParity row_parity = RowParity::NONE,
                            const std::set<odb::dbSite*>& flipped_sites = {},
-                           int gap = -1);
+                           int gap = std::numeric_limits<std::int32_t>::min());
 
   // The base_site determines the single-height rows.  For hybrid rows it is
   // a site containing a row pattern.
@@ -101,15 +103,15 @@ class InitFloorplan
                 const std::vector<odb::dbSite*>& additional_sites = {},
                 RowParity row_parity = RowParity::NONE,
                 const std::set<odb::dbSite*>& flipped_sites = {},
-                int gap = -1);
+                int gap = std::numeric_limits<std::int32_t>::min());
 
   // Create rows for a polygon core area using true polygon-aware generation
   void makePolygonRows(const odb::Polygon& core_polygon,
                        odb::dbSite* base_site,
                        const std::vector<odb::dbSite*>& additional_sites = {},
                        RowParity row_parity = RowParity::NONE,
                        const std::set<odb::dbSite*>& flipped_sites = {},
-                       int gap = -1);
+                       int gap = std::numeric_limits<std::int32_t>::min());
 
   void makeTracks();
   void makeTracks(odb::dbTechLayer* layer,
@@ -178,6 +180,8 @@ class InitFloorplan
   // this is a set of sets of all constructed site ids.
   std::set<std::set<int>> constructed_patterns_;
   std::vector<std::vector<odb::dbSite*>> repeating_row_patterns_;
+
+  void checkGap(int gap);
 };
 
 }  // namespace ifp