merge master

Signed-off-by: LucasYuki <[email protected]>

Author: LucasYuki

.github/workflows/github-actions-lint-tcl.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Dependencies
         run: |
           python3 -m venv venv
-          venv/bin/pip install tclint==0.6.1
+          venv/bin/pip install tclint==0.7.0
 
       - name: Lint
         run: |

src/Exception-py.i

@@ -4,19 +4,19 @@
 #ifdef BAZEL
 %{
 
-#include <boost/stacktrace.hpp>
 #include <cstdlib>
 #include <sstream>
 
+#include "boost/stacktrace/stacktrace.hpp"
 #include "utl/Logger.h"
 %}
 #else
 %{
-
-#include <boost/stacktrace.hpp>
+  
 #include <cstdlib>
 #include <sstream>
 
+#include "boost/stacktrace/stacktrace.hpp"
 #include "ord/OpenRoad.hh"
 #include "utl/Logger.h"
 %}

src/Exception.i

@@ -1,25 +1,25 @@
 // Copied from OpenSTA/tcl/Exception.i
 // Copyright (c) 2021, Parallax Software, Inc.
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 %{
-#include <boost/stacktrace.hpp>
 #include <cstdlib>
 #include <new>
 #include <sstream>
 
+#include "boost/stacktrace/stacktrace.hpp"
 #include "ord/OpenRoad.hh"
 #include "utl/Logger.h"
 %}

src/OpenRoad.cc

@@ -504,16 +504,21 @@ void OpenRoad::read3DBloxBMap(const std::string& filename)
   odb::ThreeDBlox parser(logger_, db_);
   parser.readBMap(filename);
 }
+
 void OpenRoad::write3Dbv(const std::string& filename)
 {
   odb::ThreeDBlox writer(logger_, db_, sta_);
   writer.writeDbv(filename, db_->getChip());
 }
+
 void OpenRoad::write3Dbx(const std::string& filename)
 {
   odb::ThreeDBlox writer(logger_, db_, sta_);
   writer.writeDbx(filename, db_->getChip());
 }
+
+// TODO: bool hierarchy should be removed in the future.
+// It is retained for a while for backward compatibility.
 void OpenRoad::readDb(const char* filename, bool hierarchy)
 {
   try {
@@ -523,7 +528,7 @@ void OpenRoad::readDb(const char* filename, bool hierarchy)
     logger_->error(ORD, 54, "odb file {} is invalid: {}", filename, f.what());
   }
   // treat this as a hierarchical network.
-  if (hierarchy) {
+  if (hierarchy || db_->hasHierarchy()) {
     logger_->warn(
         ORD,
         12,

src/OpenRoad.tcl

@@ -233,6 +233,9 @@ sta::define_cmd_args "write_db" {filename}
 sta::define_cmd_args "read_db" {[-hier] filename}
 
 proc read_db { args } {
+  # TODO: -hier is not needed anymore.
+  # - It will be removed in a future release.
+  # - It is currently retained for backward compatibility.
   sta::parse_key_args "read_db" args keys {} flags {-hier}
   sta::check_argc_eq1or2 "read_db" $args
   set filename [file nativename [lindex $args 0]]

src/ant/src/AntennaChecker.cc

@@ -167,7 +167,7 @@ void AntennaChecker::Impl::initAntennaRules()
       const odb::dbTechLayerAntennaRule::pwl_pair diffPSR
           = antenna_rule->getDiffPSR();
 
-      uint wire_thickness_dbu = 0;
+      uint32_t wire_thickness_dbu = 0;
       tech_layer->getThickness(wire_thickness_dbu);
 
       const odb::dbTechLayerType layerType = tech_layer->getType();
@@ -492,7 +492,7 @@ void AntennaChecker::Impl::calculateAreas(
 
       if (it.first->getRoutingLevel() != 0) {
         // Calculate side area of wire
-        uint wire_thickness_dbu = 0;
+        uint32_t wire_thickness_dbu = 0;
         it.first->getThickness(wire_thickness_dbu);
         double wire_thickness = block_->dbuToMicrons(wire_thickness_dbu);
         info.side_area = block_->dbuToMicrons(gtl::perimeter(node_it->pol)

src/cts/include/cts/TritonCTS.h

@@ -81,12 +81,10 @@ class TritonCTS
   void setSinkBuffer(const char* buffers);
 
  private:
-  bool isClockCellCandidate(sta::LibertyCell* cell);
   std::string selectRootBuffer(std::vector<std::string>& buffers);
   std::string selectSinkBuffer(std::vector<std::string>& buffers);
   std::string selectBestMaxCapBuffer(const std::vector<std::string>& buffers,
                                      float totalCap);
-  void inferBufferList(std::vector<std::string>& buffers);
   TreeBuilder* addBuilder(CtsOptions* options,
                           Clock& net,
                           odb::dbNet* topInputNet,

src/cts/src/TreeBuilder.cpp

@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
+#include <cstdint>
 #include <limits>
 #include <string>
 #include <vector>
@@ -26,7 +27,7 @@ void TreeBuilder::mergeBlockages()
   namespace gtl = boost::polygon;
   using boost::polygon::operators::operator+=;
 
-  uint macros_max_dx = 0, macros_max_dy = 0;
+  uint32_t macros_max_dx = 0, macros_max_dy = 0;
   odb::dbBlock* block = db_->getChip()->getBlock();
   gtl::polygon_90_set_data<int> blockage_polygons;
   // Add the macros into the polygon set