Merge remote-tracking branch 'private/master' into gui-tcl-worst-path-image

Author: gudeh

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/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/TritonCTS.cpp

@@ -660,7 +660,10 @@ void TritonCTS::setBufferList(const char* buffers)
   std::vector<std::string> bufferList(begin, end);
   // If the vector is empty, then the buffers are inferred
   if (bufferList.empty()) {
-    inferBufferList(bufferList);
+    const char* lib_name
+        = options_->isCtsLibrarySet() ? options_->getCtsLibrary() : nullptr;
+    resizer_->inferClockBufferList(lib_name, bufferList);
+    options_->setBufferListInferred(true);
   } else {
     // Iterate the user-defined buffer list
     sta::Vector<sta::LibertyCell*> selected_buffers;
@@ -684,169 +687,6 @@ void TritonCTS::setBufferList(const char* buffers)
   options_->setBufferList(bufferList);
 }
 
-void TritonCTS::inferBufferList(std::vector<std::string>& buffers)
-{
-  sta::Vector<sta::LibertyCell*> selected_buffers;
-
-  // first, look for buffers with "is_clock_cell: true" cell attribute
-  sta::LibertyLibraryIterator* lib_iter = network_->libertyLibraryIterator();
-  while (lib_iter->hasNext()) {
-    sta::LibertyLibrary* lib = lib_iter->next();
-    if (options_->isCtsLibrarySet()
-        && strcmp(lib->name(), options_->getCtsLibrary()) != 0) {
-      continue;
-    }
-    for (sta::LibertyCell* buffer : *lib->buffers()) {
-      if (buffer->isClockCell() && isClockCellCandidate(buffer)) {
-        // "is_clock_cell: true"
-        selected_buffers.emplace_back(buffer);
-        debugPrint(logger_,
-                   CTS,
-                   "buffering",
-                   1,
-                   "{} has clock cell attribute",
-                   buffer->name());
-      }
-    }
-  }
-  delete lib_iter;
-
-  // second, look for buffers with an input port that has
-  // LEF USE as "CLOCK"
-  if (selected_buffers.empty()) {
-    sta::LibertyLibraryIterator* lib_iter = network_->libertyLibraryIterator();
-    while (lib_iter->hasNext()) {
-      sta::LibertyLibrary* lib = lib_iter->next();
-      if (options_->isCtsLibrarySet()
-          && strcmp(lib->name(), options_->getCtsLibrary()) != 0) {
-        continue;
-      }
-      for (sta::LibertyCell* buffer : *lib->buffers()) {
-        odb::dbMaster* master = db_->findMaster(buffer->name());
-        for (odb::dbMTerm* mterm : master->getMTerms()) {
-          if (mterm->getIoType() == odb::dbIoType::INPUT
-              && mterm->getSigType() == odb::dbSigType::CLOCK
-              && isClockCellCandidate(buffer)) {
-            // input port with LEF USE as "CLOCK"
-            selected_buffers.emplace_back(buffer);
-            debugPrint(logger_,
-                       CTS,
-                       "buffering",
-                       1,
-                       "{} has input port {} with LEF USE as CLOCK",
-                       buffer->name(),
-                       mterm->getName());
-          }
-        }
-      }
-    }
-    delete lib_iter;
-  }
-
-  // third, look for all buffers with name CLKBUF or clkbuf
-  if (selected_buffers.empty()) {
-    sta::PatternMatch patternClkBuf(".*CLKBUF.*",
-                                    /* is_regexp */ true,
-                                    /* nocase */ true,
-                                    /* Tcl_interp* */ nullptr);
-    sta::LibertyLibraryIterator* lib_iter = network_->libertyLibraryIterator();
-    while (lib_iter->hasNext()) {
-      sta::LibertyLibrary* lib = lib_iter->next();
-      if (options_->isCtsLibrarySet()
-          && strcmp(lib->name(), options_->getCtsLibrary()) != 0) {
-        continue;
-      }
-      for (sta::LibertyCell* buffer :
-           lib->findLibertyCellsMatching(&patternClkBuf)) {
-        if (buffer->isBuffer() && isClockCellCandidate(buffer)) {
-          debugPrint(logger_,
-                     CTS,
-                     "buffering",
-                     1,
-                     "{} found by 'CLKBUF' pattern match",
-                     buffer->name());
-          selected_buffers.emplace_back(buffer);
-        }
-      }
-    }
-    delete lib_iter;
-  }
-
-  // fourth, look for all buffers with name BUF or buf
-  if (selected_buffers.empty()) {
-    sta::PatternMatch patternBuf(".*BUF.*",
-                                 /* is_regexp */ true,
-                                 /* nocase */ true,
-                                 /* Tcl_interp* */ nullptr);
-    lib_iter = network_->libertyLibraryIterator();
-    while (lib_iter->hasNext()) {
-      sta::LibertyLibrary* lib = lib_iter->next();
-      if (options_->isCtsLibrarySet()
-          && strcmp(lib->name(), options_->getCtsLibrary()) != 0) {
-        continue;
-      }
-      for (sta::LibertyCell* buffer :
-           lib->findLibertyCellsMatching(&patternBuf)) {
-        if (buffer->isBuffer() && isClockCellCandidate(buffer)) {
-          debugPrint(logger_,
-                     CTS,
-                     "buffering",
-                     1,
-                     "{} found by 'BUF' pattern match",
-                     buffer->name());
-          selected_buffers.emplace_back(buffer);
-        }
-      }
-    }
-    delete lib_iter;
-  }
-
-  // abandon attributes & name patterns, just look for all buffers
-  if (selected_buffers.empty()) {
-    debugPrint(logger_,
-               CTS,
-               "buffering",
-               1,
-               "No buffers with clock atributes or name patterns found, using "
-               "all buffers");
-    lib_iter = network_->libertyLibraryIterator();
-    while (lib_iter->hasNext()) {
-      sta::LibertyLibrary* lib = lib_iter->next();
-      if (options_->isCtsLibrarySet()
-          && strcmp(lib->name(), options_->getCtsLibrary()) != 0) {
-        continue;
-      }
-      for (sta::LibertyCell* buffer : *lib->buffers()) {
-        if (isClockCellCandidate(buffer)) {
-          selected_buffers.emplace_back(buffer);
-        }
-      }
-    }
-    delete lib_iter;
-
-    if (selected_buffers.empty()) {
-      logger_->error(
-          CTS,
-          110,
-          "No clock buffer candidates could be found from any libraries.");
-    }
-  }
-
-  resizer_->setClockBuffersList(selected_buffers);
-
-  for (sta::LibertyCell* buffer : selected_buffers) {
-    buffers.emplace_back(buffer->name());
-    debugPrint(logger_,
-               CTS,
-               "buffering",
-               1,
-               "{} has been inferred as clock buffer",
-               buffer->name());
-  }
-
-  options_->setBufferListInferred(true);
-}
-
 std::string toLowerCase(std::string str)
 {
   std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) {
@@ -855,12 +695,6 @@ std::string toLowerCase(std::string str)
   return str;
 }
 
-bool TritonCTS::isClockCellCandidate(sta::LibertyCell* cell)
-{
-  return (!cell->dontUse() && !resizer_->dontUse(cell) && !cell->alwaysOn()
-          && !cell->isIsolationCell() && !cell->isLevelShifter());
-}
-
 std::string TritonCTS::getRootBufferToString()
 {
   std::ostringstream buffer_names;
@@ -2557,7 +2391,7 @@ void TritonCTS::findCandidateDummyCells(
   while (lib_iter->hasNext()) {
     sta::LibertyLibrary* lib = lib_iter->next();
     for (sta::LibertyCell* inv : *lib->inverters()) {
-      if (inv->isClockCell() && isClockCellCandidate(inv)) {
+      if (inv->isClockCell() && resizer_->isClockCellCandidate(inv)) {
         inverters.emplace_back(inv);
         dummyCandidates.emplace_back(inv);
       }
@@ -2576,7 +2410,7 @@ void TritonCTS::findCandidateDummyCells(
       sta::LibertyLibrary* lib = lib_iter->next();
       for (sta::LibertyCell* inv :
            lib->findLibertyCellsMatching(&patternClkInv)) {
-        if (inv->isInverter() && isClockCellCandidate(inv)) {
+        if (inv->isInverter() && resizer_->isClockCellCandidate(inv)) {
           inverters.emplace_back(inv);
           dummyCandidates.emplace_back(inv);
         }
@@ -2595,7 +2429,7 @@ void TritonCTS::findCandidateDummyCells(
     while (lib_iter->hasNext()) {
       sta::LibertyLibrary* lib = lib_iter->next();
       for (sta::LibertyCell* inv : lib->findLibertyCellsMatching(&patternInv)) {
-        if (inv->isInverter() && isClockCellCandidate(inv)) {
+        if (inv->isInverter() && resizer_->isClockCellCandidate(inv)) {
           inverters.emplace_back(inv);
           dummyCandidates.emplace_back(inv);
         }
@@ -2610,7 +2444,7 @@ void TritonCTS::findCandidateDummyCells(
     while (lib_iter->hasNext()) {
       sta::LibertyLibrary* lib = lib_iter->next();
       for (sta::LibertyCell* inv : *lib->inverters()) {
-        if (isClockCellCandidate(inv)) {
+        if (resizer_->isClockCellCandidate(inv)) {
           inverters.emplace_back(inv);
           dummyCandidates.emplace_back(inv);
         }