Merge remote-tracking branch 'origin/master' into odb-new-unfolded-structuree

Signed-off-by: osamahammad21 <osama@precisioninno.com>

Author: osamahammad21

etc/DependencyInstaller.sh

@@ -865,19 +865,35 @@ _install_bazel() {
             chmod +x bazelisk
             _execute "Installing bazelisk..." mv bazelisk "${bazel_prefix}/bin/bazelisk"
         )
+        if _command_exists "apt-get"; then
+            _execute "Installing bazel required libraries..." \
+                apt-get -y install --no-install-recommends \
+                libc6-dev libxml2 libtinfo6 zlib1g libstdc++6
+        elif _command_exists "yum"; then
+            _execute "Installing bazel required libraries..." \
+                yum install -y \
+                glibc-devel libxml2 ncurses-libs zlib libstdc++
+        fi
         if [[ "${NO_GUI}" != "yes" ]]; then
             # Install xcb libraries needed for GUI support with Bazel builds
             if _command_exists "apt-get"; then
                 _execute "Installing xcb libraries for GUI support..." \
                     apt-get -y install --no-install-recommends \
                     libxcb1-dev libxcb-util-dev libxcb-icccm4-dev libxcb-image0-dev \
                     libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render-util0-dev \
-                    libxcb-xinerama0-dev libxcb-xkb-dev
+                    libxcb-xinerama0-dev libxcb-xkb-dev \
+                    libx11-xcb1 libx11-6 libsm6 libice6 \
+                    libxcb-cursor0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 \
+                    libdbus-1-3 libfontconfig1 libxkbcommon0 libxkbcommon-x11-0
             elif _command_exists "yum"; then
                 _execute "Installing xcb libraries for GUI support..." \
                     yum install -y \
                     libxcb-devel xcb-util-devel xcb-util-image-devel \
-                    xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel
+                    xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel \
+                    libX11-xcb libX11 libSM libICE \
+                    xcb-util-cursor libxcb \
+                    dbus-libs fontconfig \
+                    libxkbcommon libxkbcommon-x11
             fi
         fi
     fi

src/dbSta/src/CMakeLists.txt

@@ -17,12 +17,6 @@ target_include_directories(dbSta_lib
   PUBLIC
     ../include
     ${PROJECT_SOURCE_DIR}/include
-  PRIVATE
-    # Needed for search/Levelize.hh and the unprefixed transitive
-    # OpenSTA headers it includes (e.g. Graph.hh) which are not part of
-    # OpenSTA's public include.
-    ${OPENSTA_HOME}
-    ${OPENSTA_HOME}/include/sta
 )
 
 

src/dbSta/src/IpChecker.cc

@@ -660,7 +660,6 @@ void IpChecker::checkPinMinDimensions(odb::dbMaster* master)
 void IpChecker::checkPinMinArea(odb::dbMaster* master)
 {
   std::string master_name = master->getName();
-  int dbu_per_micron = db_->getTech()->getDbUnitsPerMicron();
 
   for (odb::dbMTerm* mterm : master->getMTerms()) {
     for (odb::dbMPin* mpin : mterm->getMPins()) {
@@ -670,10 +669,8 @@ void IpChecker::checkPinMinArea(odb::dbMaster* master)
           continue;
         }
 
-        // getArea() returns microns^2, convert to DBU^2
-        double min_area_um2 = layer->getArea();
-        int64_t min_area_dbu2 = static_cast<int64_t>(
-            min_area_um2 * dbu_per_micron * dbu_per_micron);
+        // getArea() returns DBU^2
+        const int64_t min_area_dbu2 = layer->getArea();
 
         odb::Rect rect = box->getBox();
         int64_t shape_area

src/dbSta/src/dbSta.cc

@@ -37,14 +37,14 @@
 #include "odb/dbBlockCallBackObj.h"
 #include "odb/dbObject.h"
 #include "odb/dbTypes.h"
-#include "search/Levelize.hh"
 #include "sta/ArcDelayCalc.hh"
 #include "sta/Clock.hh"
 #include "sta/Delay.hh"
 #include "sta/EquivCells.hh"
 #include "sta/Graph.hh"
 #include "sta/GraphCmp.hh"
 #include "sta/GraphDelayCalc.hh"
+#include "sta/LevelizeObserver.hh"
 #include "sta/Liberty.hh"
 #include "sta/MinMax.hh"
 #include "sta/Mode.hh"
@@ -297,24 +297,23 @@ void dbSta::makeSdcNetwork()
   sdc_network_ = new dbSdcNetwork(network_);
 }
 
-// Levelize::setObserver takes ownership and deletes the prior observer,
-// so this composite must replicate the StaLevelizeObserver behavior that
-// Sta::makeObservers installs (forwarding to Search and GraphDelayCalc)
-// in addition to invalidating dbSta's cache.
-class DbStaLevelizeObserver : public LevelizeObserver
+// Extend the default StaLevelizeObserver (Search + GraphDelayCalc forwarding)
+// to also invalidate dbSta's driver-vertex cache.
+class DbStaLevelizeObserver : public StaLevelizeObserver
 {
  public:
-  explicit DbStaLevelizeObserver(dbSta* sta) : sta_(sta) {}
+  DbStaLevelizeObserver(dbSta* sta, Search* search, GraphDelayCalc* gdc)
+      : StaLevelizeObserver(search, gdc), sta_(sta)
+  {
+  }
   void levelsChangedBefore() override
   {
-    sta_->search()->levelsChangedBefore();
-    sta_->graphDelayCalc()->levelsChangedBefore();
+    StaLevelizeObserver::levelsChangedBefore();
     sta_->invalidateLevelizedDrvrVertices();
   }
   void levelChangedBefore(Vertex* vertex) override
   {
-    sta_->search()->levelChangedBefore(vertex);
-    sta_->graphDelayCalc()->levelChangedBefore(vertex);
+    StaLevelizeObserver::levelChangedBefore(vertex);
     sta_->invalidateLevelizedDrvrVertices();
   }
 
@@ -325,7 +324,8 @@ class DbStaLevelizeObserver : public LevelizeObserver
 void dbSta::makeObservers()
 {
   Sta::makeObservers();
-  levelize_->setObserver(new DbStaLevelizeObserver(this));
+  setLevelizeObserver(
+      new DbStaLevelizeObserver(this, search_, graph_delay_calc_));
 }
 
 void dbSta::invalidateLevelizedDrvrVertices()

src/drt/src/io/io.cpp

@@ -2167,8 +2167,7 @@ void io::Parser::addRoutingLayer(odb::dbTechLayer* layer)
   setRoutingLayerProperties(layer, tmpLayer);
   // read minArea rule
   if (layer->hasArea()) {
-    frCoord minArea = frCoord(round(layer->getArea() * getTech()->getDBUPerUU()
-                                    * getTech()->getDBUPerUU()));
+    frCoord minArea = frCoord(layer->getArea());
     std::unique_ptr<frConstraint> uCon
         = std::make_unique<frAreaConstraint>(minArea);
     auto rptr = static_cast<frAreaConstraint*>(uCon.get());
@@ -2226,7 +2225,7 @@ void io::Parser::addRoutingLayer(odb::dbTechLayer* layer)
           "minEnclosedArea constraint with width is not supported, skipped.");
       continue;
     }
-    frUInt4 _minEnclosedArea;
+    int64_t _minEnclosedArea;
     rule->getEnclosure(_minEnclosedArea);
     frCoord minEnclosedArea = _minEnclosedArea;
     auto minEnclosedAreaConstraint

src/drt/src/ta/FlexTA_assign.cpp

@@ -83,13 +83,12 @@ void FlexTAWorker::modMinSpacingCostPlanar(const odb::Rect& box,
               lNum,
               idx1,
               idx2);
-
-  odb::Rect box2(-halfwidth2, -halfwidth2, halfwidth2, halfwidth2);
   frCoord dx, dy;
   auto& trackLocs = getTrackLocs(lNum);
   auto& workerRegionQuery = getWorkerRegionQuery();
   for (int i = idx1; i <= idx2; i++) {
     auto trackLoc = trackLocs[i];
+    odb::Rect box2(-halfwidth2, -halfwidth2, halfwidth2, halfwidth2);
     odb::dbTransform xform(odb::Point(boxLeft, trackLoc));
     xform.apply(box2);
     box2boxDistSquare(box1, box2, dx, dy);

src/drt/test/fixture.cpp

@@ -286,6 +286,17 @@ void Fixture::makeSpacingConstraint(frLayerNum layer_num)
   tech->addUConstraint(std::move(con));
 }
 
+void Fixture::makeSimpleSpacingConstraint(frLayerNum layer_num,
+                                          const frCoord spacing_value)
+{
+  auto con = std::make_unique<frSpacingConstraint>(spacing_value);
+
+  frTechObject* tech = design->getTech();
+  frLayer* layer = tech->getLayer(layer_num);
+  layer->setMinSpacing(con.get());
+  tech->addUConstraint(std::move(con));
+}
+
 void Fixture::makeMinStepConstraint(frLayerNum layer_num)
 {
   auto con = std::make_unique<frMinStepConstraint>();

src/drt/test/fixture.h

@@ -76,6 +76,8 @@ class Fixture : public ::testing::Test
 
   void makeSpacingConstraint(frLayerNum layer_num);
 
+  void makeSimpleSpacingConstraint(frLayerNum layer_num, frCoord spacing_value);
+
   void makeMetalWidthViaMap(frLayerNum layer_num,
                             odb::dbMetalWidthViaMap* rule);
 

src/drt/test/taTest.cpp

@@ -84,6 +84,21 @@ struct TAFixture : public Fixture
     initRegionQuery();
     design->getRegionQuery()->initGuide();
   }
+
+  void runHorizontalInitTA()
+  {
+    FlexTAWorker worker(design.get(),
+                        logger.get(),
+                        router_cfg.get(),
+                        /*save_updates=*/false);
+    worker.setRouteBox(design->getTopBlock()->getDieBox());
+    worker.setExtBox(design->getTopBlock()->getDieBox());
+    worker.setDir(odb::dbTechLayerDir::HORIZONTAL);
+    worker.setTAIter(0);
+    worker.main_mt();
+    worker.end();
+    EXPECT_EQ(worker.getNumAssigned(), 2);
+  }
 };
 
 // A single guide on a horizontal routing layer should be assigned to one of
@@ -139,4 +154,30 @@ TEST_F(TAFixture, single_horizontal_iroute_assigned)
   EXPECT_EQ(bp.y(), expected_tracks[2]);
 }
 
+TEST_F(TAFixture, two_parallel_no_coupling)
+{
+  setDieArea(0, 0, 21000, 2000);
+  createGCellPattern(1000, 1000);
+  addTrackPattern(/*layer_num=*/2,
+                  /*is_horizontal_pattern=*/false,
+                  /*start_coord=*/100,
+                  /*num_tracks=*/19,
+                  /*spacing=*/100);
+  makeSimpleSpacingConstraint(2, 100);
+
+  frGuide* g1
+      = makeGuide(makeNet("n1"), /*layer_num=*/2, {500, 500}, {5500, 500});
+  frGuide* g2
+      = makeGuide(makeNet("n2"), /*layer_num=*/2, {500, 500}, {5500, 500});
+  initTAQueries();
+
+  runHorizontalInitTA();
+  const auto* path_seg1
+      = static_cast<frPathSeg*>(g1->getRoutes().front().get());
+  const auto* path_seg2
+      = static_cast<frPathSeg*>(g2->getRoutes().front().get());
+  EXPECT_EQ(path_seg1->getPoints().first.y(), 500);
+  EXPECT_EQ(path_seg2->getPoints().first.y(), 700);
+}
+
 }  // namespace drt

src/grt/src/cugr/src/Layers.cpp

@@ -26,9 +26,8 @@ MetalLayer::MetalLayer(odb::dbTechLayer* tech_layer,
 
   // Design rules not parsed thoroughly
   // Min area
-  const int database_unit = tech_layer->getTech()->getDbUnitsPerMicron();
-  const int min_area = tech_layer->getArea() * database_unit * database_unit;
-  min_length_ = std::max(min_area / width_ - width_, 0);
+  const int64_t min_area = tech_layer->getArea();
+  min_length_ = std::max(static_cast<int>(min_area / width_) - width_, 0);
 
   // Parallel run spacing
   std::vector<std::vector<uint32_t>> spacing_table;