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

Signed-off-by: Eder Monteiro <[email protected]>

Author: eder-matheus

.clang-tidy

@@ -8,7 +8,7 @@ Checks: >
   -clang-analyzer-cplusplus.NewDeleteLeaks,
   -clang-analyzer-optin.performance.Padding,
   readability-*,
-  -readability-identifier-naming
+  -readability-identifier-naming,
   -readability-braces-around-statements,
   -readability-convert-member-functions-to-static,
   -readability-function-cognitive-complexity,

BUILD.bazel

@@ -49,7 +49,6 @@ config_setting(
 
 OPENROAD_LIBRARY_DEPS = [
     ":openroad_version",
-    ":ord",
     "//src/ant",
     "//src/ant:ui",
     "//src/cgt",
@@ -106,6 +105,7 @@ OPENROAD_LIBRARY_DEPS = [
     "//src/utl",
     "//src/utl:ui",
     "@edu_berkeley_abc//:abc-lib",
+    ":ord",
 ] + select(
     {
         ":platform_cli": ["//src/gui"],
@@ -187,11 +187,11 @@ cc_library(
         "include",
     ],
     visibility = ["//visibility:public"],
-    deps = OPENROAD_LIBRARY_DEPS + [
+    deps = [
         "//src/sta:opensta_lib",
         "@boost.stacktrace",
         "@tk_tcl//:tcl",
-    ],
+    ] + OPENROAD_LIBRARY_DEPS,
 )
 
 cc_library(

etc/DependencyInstaller.sh

@@ -12,7 +12,7 @@ _versionCompare() {
 }
 
 _equivalenceDeps() {
-    yosysVersion=v0.57
+    yosysVersion=v0.58
 
     # yosys
     yosysPrefix=${PREFIX:-"/usr/local"}

src/OpenRoad.cc

@@ -485,13 +485,13 @@ void OpenRoad::writeCdl(const char* out_filename,
 
 void OpenRoad::read3Dbv(const std::string& filename)
 {
-  odb::ThreeDBlox parser(logger_, db_);
+  odb::ThreeDBlox parser(logger_, db_, sta_);
   parser.readDbv(filename);
 }
 
 void OpenRoad::read3Dbx(const std::string& filename)
 {
-  odb::ThreeDBlox parser(logger_, db_);
+  odb::ThreeDBlox parser(logger_, db_, sta_);
   parser.readDbx(filename);
 }
 

src/cts/src/TritonCTS.cpp

@@ -7,6 +7,7 @@
 #include <cassert>
 #include <cctype>
 #include <cmath>
+#include <cstdio>
 #include <cstring>
 #include <ctime>
 #include <fstream>

src/cts/test/BUILD

@@ -53,6 +53,16 @@ MANUAL_TESTS = [
     "cts_readme_msgs_check",
 ]
 
+# TODO: Enable once difference between bazel and ctest is resolved.
+MANUAL_FOR_BAZEL_TESTS = [
+    "array",
+    "array_ins_delay",
+    "array_no_blockages",
+    "array_repair_clock_nets",
+    "gated_clock4",
+    "simple_test_hier",
+]
+
 ALL_TESTS = COMPULSORY_TESTS + MANUAL_TESTS
 
 filegroup(
@@ -175,7 +185,8 @@ filegroup(
     regression_test(
         name = test_name,
         data = [":" + test_name + "_resources"],
-        tags = [] if test_name in COMPULSORY_TESTS else ["manual"],
+        tags = ["manual"] if test_name in MANUAL_TESTS or
+                             test_name in MANUAL_FOR_BAZEL_TESTS else [],
         visibility = ["//visibility:public"],
     )
     for test_name in ALL_TESTS

src/dbSta/BUILD

@@ -143,10 +143,9 @@ cc_library(
 
 tcl_encode(
     name = "tcl",
-    srcs = [
+    srcs = ["//src/sta:tcl_scripts"] + [
         "src/dbReadVerilog.tcl",
         "src/dbSta.tcl",
-        "//src/sta:tcl_scripts",
     ],
     char_array_name = "dbSta_tcl_inits",
     namespace = "sta",

src/dpl/include/dpl/Opendp.h

@@ -29,13 +29,10 @@ namespace dpl {
 
 using utl::Logger;
 
-using odb::dbBlock;
 using odb::dbDatabase;
-using odb::dbInst;
 using odb::dbMaster;
 using odb::dbMasterType;
 using odb::dbTechLayer;
-using odb::Point;
 
 class Node;
 class Group;
@@ -93,8 +90,8 @@ class Opendp
   Opendp(const Opendp&) = delete;
   Opendp& operator=(const Opendp&) = delete;
 
-  void legalCellPos(dbInst* db_inst);  // call from rsz
-  void initMacrosAndGrid();            // call from rsz
+  void legalCellPos(odb::dbInst* db_inst);  // call from rsz
+  void initMacrosAndGrid();                 // call from rsz
 
   // legalize/report
   // max_displacment is in sites. use zero for defaults.
@@ -105,15 +102,15 @@ class Opendp
 
   void setPaddingGlobal(int left, int right);
   void setPadding(dbMaster* master, int left, int right);
-  void setPadding(dbInst* inst, int left, int right);
+  void setPadding(odb::dbInst* inst, int left, int right);
   void setDebug(std::unique_ptr<dpl::DplObserver>& observer);
 
   // Global padding.
   int padGlobalLeft() const;
   int padGlobalRight() const;
   // Find instance/master/global padding value for an instance.
-  int padLeft(dbInst* inst) const;
-  int padRight(dbInst* inst) const;
+  int padLeft(odb::dbInst* inst) const;
+  int padRight(odb::dbInst* inst) const;
 
   void checkPlacement(bool verbose, const std::string& report_file_name = "");
   void fillerPlacement(const dbMasterSeq& filler_masters,
@@ -127,10 +124,11 @@ class Opendp
   void insertDecapCells(double target, IRDropByPoint& psm_ir_drops);
 
   // Get the instance adjacent to the left or right of a given instance
-  dbInst* getAdjacentInstance(dbInst* inst, bool left) const;
+  odb::dbInst* getAdjacentInstance(odb::dbInst* inst, bool left) const;
 
   // Find a cluster of instances that are touching each other
-  std::vector<dbInst*> getAdjacentInstancesCluster(dbInst* inst) const;
+  std::vector<odb::dbInst*> getAdjacentInstancesCluster(
+      odb::dbInst* inst) const;
   Padding* getPadding() { return padding_.get(); }
   void improvePlacement(int seed,
                         int max_displacement_x,
@@ -160,14 +158,14 @@ class Opendp
   friend class Graphics;
   void findDisplacementStats();
   DbuPt pointOffMacro(const Node& cell);
-  void convertDbToCell(dbInst* db_inst, Node& cell);
+  void convertDbToCell(odb::dbInst* db_inst, Node& cell);
   // Return error count.
   void saveViolations(const std::vector<Node*>& failures,
                       odb::dbMarkerCategory* category,
                       const std::string& violation_type = "") const;
   void importDb();
   void importClear();
-  odb::Rect getBbox(dbInst* inst);
+  odb::Rect getBbox(odb::dbInst* inst);
   void createNetwork();
   void createArchitecture();
   void setUpPlacementGroups();
@@ -312,7 +310,7 @@ class Opendp
 
   Logger* logger_ = nullptr;
   dbDatabase* db_ = nullptr;
-  dbBlock* block_ = nullptr;
+  odb::dbBlock* block_ = nullptr;
   odb::Rect core_;
 
   std::unique_ptr<Architecture> arch_;  // Information about rows, etc.

src/dpl/include/dpl/OptMirror.h

@@ -16,7 +16,6 @@ class Logger;
 
 namespace dpl {
 
-using odb::dbInst;
 using odb::dbNet;
 
 using utl::Logger;
@@ -53,15 +52,15 @@ class OptimizeMirroring
   void run();
 
  private:
-  int mirrorCandidates(std::vector<dbInst*>& mirror_candidates);
+  int mirrorCandidates(std::vector<odb::dbInst*>& mirror_candidates);
   void findNetBoxes();
-  std::vector<dbInst*> findMirrorCandidates(NetBoxes& net_boxes);
+  std::vector<odb::dbInst*> findMirrorCandidates(NetBoxes& net_boxes);
 
-  void updateNetBoxes(dbInst* inst);
-  void saveNetBoxes(dbInst* inst);
-  void restoreNetBoxes(dbInst* inst);
+  void updateNetBoxes(odb::dbInst* inst);
+  void saveNetBoxes(odb::dbInst* inst);
+  void restoreNetBoxes(odb::dbInst* inst);
 
-  int64_t hpwl(dbInst* inst);  // Sum of ITerm hpwl's.
+  int64_t hpwl(odb::dbInst* inst);  // Sum of ITerm hpwl's.
 
   Logger* logger_ = nullptr;
   odb::dbDatabase* db_ = nullptr;

src/dpl/src/DecapPlacement.cpp

@@ -205,13 +205,13 @@ void Opendp::insertDecapInPos(dbMaster* master,
 {
   // insert decap inst
   std::string inst_name = "DECAP_" + to_string(decap_count_);
-  dbInst* inst = dbInst::create(block_,
-                                master,
-                                inst_name.c_str(),
-                                /* physical_only */ true);
+  odb::dbInst* inst = odb::dbInst::create(block_,
+                                          master,
+                                          inst_name.c_str(),
+                                          /* physical_only */ true);
   const GridX grid_x = grid_->gridX(pos_x - core_.xMin());
   const GridY grid_y = grid_->gridSnapDownY(pos_y - core_.yMin());
-  const dbOrientType orient
+  const odb::dbOrientType orient
       = grid_->getSiteOrientation(grid_x, grid_y, master->getSite()).value();
   inst->setOrient(orient);
   inst->setLocation(pos_x.v, pos_y.v);