Merge remote-tracking branch 'origin/master' into drt-warning-rules

Author: osamahammad21

src/dbSta/BUILD

@@ -134,7 +134,6 @@ cc_library(
 cc_library(
     name = "ui",
     srcs = [
-        "include/db_sta/IpChecker.hh",
         "src/MakeDbSta.cc",
         ":swig",
         ":tcl",

src/dft/BUILD

@@ -40,7 +40,6 @@ cc_library(
 cc_library(
     name = "ui",
     srcs = [
-        "include/dft/Dft.hh",
         "src/MakeDft.cpp",
         ":swig",
         ":tcl",
@@ -53,6 +52,7 @@ cc_library(
         "src",
     ],
     deps = [
+        ":dft",
         "//:ord",
         "//src/dbSta",
         "//src/dft/src/architect",

src/dst/BUILD

@@ -53,7 +53,6 @@ cc_library(
 cc_library(
     name = "ui",
     srcs = [
-        "include/dst/Distributed.h",
         "src/MakeDistributed.cc",
         ":swig",
         ":tcl",
@@ -65,6 +64,7 @@ cc_library(
         "include",
     ],
     deps = [
+        ":dst",
         "//:ord",
         "//src/utl",
         "@boost.asio",

src/exa/BUILD

@@ -11,11 +11,25 @@ package(
     features = ["layering_check"],
 )
 
+cc_library(
+    name = "exa_private_hdrs",
+    hdrs = [
+        "src/observer.h",
+    ],
+    includes = [
+        "src",
+    ],
+    visibility = ["//visibility:private"],
+    deps = [
+        "//src/odb/src/db",
+        "//src/utl",
+    ],
+)
+
 cc_library(
     name = "exa",
     srcs = [
         "src/example.cpp",
-        "src/observer.h",
     ],
     hdrs = [
         "include/exa/example.h",
@@ -24,6 +38,7 @@ cc_library(
         "include",
     ],
     deps = [
+        ":exa_private_hdrs",
         "//src/odb/src/db",
         "//src/utl",
     ],
@@ -35,7 +50,6 @@ cc_library(
         "src/MakeExample.cpp",
         "src/graphics.cpp",
         "src/graphics.h",
-        "src/observer.h",
         ":swig",
         ":tcl",
     ],
@@ -48,6 +62,7 @@ cc_library(
     ],
     deps = [
         ":exa",
+        ":exa_private_hdrs",
         "//:ord",
         "//src/gui",
         "//src/odb/src/db",

src/odb/src/lefin/CellEdgeSpacingTableParser.cpp

@@ -53,17 +53,23 @@ void CellEdgeSpacingTableParser::setString(
 // [OPTIONAL] [SOFT] [EXACT] <spacing> ;
 bool CellEdgeSpacingTableParser::parseEntry(const std::string& s)
 {
+  // Edge-type group names may be any non-blank token, including ones that are
+  // numeric or a single character (e.g. "1"). The shared _string rule requires
+  // an alphabetic first character, so use a dedicated rule here that accepts
+  // any non-blank, non-semicolon token per the LEF/DEF 5.8 reference.
+  qi::rule<std::string::const_iterator, std::string(), space_type> edge_type
+      = lexeme[+(char_ - blank - '\n' - ';')];
   qi::rule<std::string::const_iterator, space_type> ENTRY
       = lit("EDGETYPE")[boost::bind(&CellEdgeSpacingTableParser::createEntry,
                                     this)]
-        >> _string[boost::bind(&CellEdgeSpacingTableParser::setString,
-                               this,
-                               _1,
-                               &dbCellEdgeSpacing::setFirstEdgeType)]
-        >> _string[boost::bind(&CellEdgeSpacingTableParser::setString,
-                               this,
-                               _1,
-                               &dbCellEdgeSpacing::setSecondEdgeType)]
+        >> edge_type[boost::bind(&CellEdgeSpacingTableParser::setString,
+                                 this,
+                                 _1,
+                                 &dbCellEdgeSpacing::setFirstEdgeType)]
+        >> edge_type[boost::bind(&CellEdgeSpacingTableParser::setString,
+                                 this,
+                                 _1,
+                                 &dbCellEdgeSpacing::setSecondEdgeType)]
         >> -lit(
             "EXCEPTABUTTED")[boost::bind(&CellEdgeSpacingTableParser::setBool,
                                          this,

src/odb/src/swig/common/containers.i

@@ -86,4 +86,9 @@ WRAP_DB_CONTAINER(odb::dbChipRegionInst)
 WRAP_DB_CONTAINER(odb::dbChipBump)
 WRAP_DB_CONTAINER(odb::dbChipBumpInst)
 WRAP_DB_CONTAINER(odb::dbChipConn)
-WRAP_DB_CONTAINER(odb::dbChipNet)
+WRAP_DB_CONTAINER(odb::dbChipNet)
+WRAP_DB_CONTAINER(odb::dbUnfoldedChipInst)
+WRAP_DB_CONTAINER(odb::dbUnfoldedChipRegionInst)
+WRAP_DB_CONTAINER(odb::dbUnfoldedChipBumpInst)
+WRAP_DB_CONTAINER(odb::dbUnfoldedChipConn)
+WRAP_DB_CONTAINER(odb::dbUnfoldedChipNet)

src/odb/test/BUILD

@@ -301,6 +301,7 @@ filegroup(
         "data/gscl45nm_ext_macros.lef",
         "data/gscl45nm_polygon.lef",
         "data/lef58_antennagateplusdiff.lef",
+        "data/lef58_celledgespacing_numeric.lef",
         "data/lef58class_gscl45nm.lef",
         "data/mask.lef",
         "data/ndr.def",

src/odb/test/cpp/TestLef58Properties.cpp

@@ -645,4 +645,36 @@ TEST_F(Fixture, TestLef58AntennaGatePlusDiff)
   EXPECT_EQ(pwl.ratios[1], 4.0);
 }
 
+// Regression test for issue #10668: a CELLEDGESPACINGTABLE EDGETYPE group name
+// that is numeric or a single character (e.g. "1") must parse correctly and
+// must not trigger ODB-0299 (parse mismatch).
+TEST_F(Fixture, TestLef58CellEdgeSpacingNumericEdgeType)
+{
+  const char* libname = "lef58_celledgespacing_numeric.lef";
+  loadTechAndLib(
+      "tech", libname, prefix + "data/lef58_celledgespacing_numeric.lef");
+
+  dbTech* tech = db_->getTech();
+  auto cell_edge_spacing_tbl = tech->getCellEdgeSpacingTable();
+  // All three entries must be parsed (numeric, mixed numeric/alpha, and alpha).
+  EXPECT_EQ(cell_edge_spacing_tbl.size(), 3);
+
+  auto it = cell_edge_spacing_tbl.begin();
+  auto edge_spc = *it;
+  EXPECT_EQ(edge_spc->getFirstEdgeType(), "1");
+  EXPECT_EQ(edge_spc->getSecondEdgeType(), "1");
+  EXPECT_EQ(edge_spc->getSpacing(), 0.4 * 1000);
+
+  edge_spc = *(++it);
+  EXPECT_EQ(edge_spc->getFirstEdgeType(), "1");
+  EXPECT_EQ(edge_spc->getSecondEdgeType(), "G2");
+  EXPECT_EQ(edge_spc->getSpacing(), 0.2 * 1000);
+
+  // Alpha/multi-char group names (the pre-existing form) must still work.
+  edge_spc = *(++it);
+  EXPECT_EQ(edge_spc->getFirstEdgeType(), "G1");
+  EXPECT_EQ(edge_spc->getSecondEdgeType(), "G1");
+  EXPECT_EQ(edge_spc->getSpacing(), 0.1 * 1000);
+}
+
 }  // namespace odb

src/odb/test/data/lef58_celledgespacing_numeric.lef

@@ -0,0 +1,21 @@
+VERSION 5.8 ;
+NAMESCASESENSITIVE ON ;
+
+PROPERTYDEFINITIONS
+    LIBRARY LEF58_CELLEDGESPACINGTABLE STRING
+      "CELLEDGESPACINGTABLE
+        EDGETYPE 1 1 0.400
+        EDGETYPE 1 G2 0.200
+        EDGETYPE G1 G1 0.100 ;" ;
+END PROPERTYDEFINITIONS
+
+UNITS
+    DATABASE MICRONS 1000 ;
+END UNITS
+
+LAYER metal1
+    TYPE ROUTING ;
+    WIDTH 0.1 ;
+END metal1
+
+END LIBRARY

src/odb/test/read_3dbx.tcl

@@ -7,5 +7,10 @@ if { [$db getChip] == "NULL" } {
   puts "FAIL: Read 3dbx Failed"
   exit 1
 }
+check "Unfolded Chip Insts Count " { llength [$db getUnfoldedChipInsts] } 2
+check "Unfolded Chip Conns Count " { llength [$db getUnfoldedChipConns] } 2
+check "Unfolded Chip Regions Count " { llength [$db getUnfoldedChipRegionInsts] } 4
+check "Unfolded Chip Bumps Count " { llength [$db getUnfoldedChipBumpInsts] } 4
+check "Unfolded Chip Bumps Count " { llength [$db getUnfoldedChipNets] } 0
 
 puts "pass"