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

Author: eder-matheus

etc/DependencyInstaller.sh

@@ -933,11 +933,13 @@ case "${os}" in
             _installOrTools "ubuntu" "${ubuntuVersion}" "amd64"
         fi
         ;;
-    "Red Hat Enterprise Linux" | "Rocky Linux")
+    "Red Hat Enterprise Linux" | "Rocky Linux" | "AlmaLinux")
     if [[ "${os}" == "Red Hat Enterprise Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' redhat-release | cut -d. -f1)
     elif  [[ "${os}" == "Rocky Linux" ]]; then
         rhelVersion=$(rpm -q --queryformat '%{VERSION}' rocky-release | cut -d. -f1)
+    elif [[ "${os}" == "AlmaLinux" ]]; then
+        rhelVersion=$(rpm -q --queryformat '%{VERSION}' almalinux-release | cut -d. -f1)
     fi
         if [[ "${rhelVersion}" != "8" ]] && [[ "${rhelVersion}" != "9" ]]; then
             echo "ERROR: Unsupported ${rhelVersion} version. Versions '8' and '9' are supported."
@@ -1018,4 +1020,8 @@ esac
 if [[ ! -z ${saveDepsPrefixes} ]]; then
     mkdir -p "$(dirname $saveDepsPrefixes)"
     echo "$CMAKE_PACKAGE_ROOT_ARGS" > $saveDepsPrefixes
+    # Fix permissions if running as root to allow user access
+    if [[ $(id -u) == 0 && ! -z "${SUDO_USER+x}" ]]; then
+        chown "$SUDO_USER:$(id -gn "$SUDO_USER")" "$saveDepsPrefixes" 2>/dev/null || true
+    fi
 fi

src/rmp/src/CMakeLists.txt

@@ -66,6 +66,7 @@ target_link_libraries(rmp_abc_library
     OpenSTA
     dbSta_lib
     utl_lib
+    rsz_lib
     ${ABC_LIBRARY}
 )
 

src/rmp/src/Restructure.cpp

@@ -74,7 +74,8 @@ void Restructure::reset()
 void Restructure::resynth(sta::Corner* corner)
 {
   ZeroSlackStrategy zero_slack_strategy(corner);
-  zero_slack_strategy.OptimizeDesign(open_sta_, name_generator_, logger_);
+  zero_slack_strategy.OptimizeDesign(
+      open_sta_, name_generator_, resizer_, logger_);
 }
 
 void Restructure::run(char* liberty_file_name,

src/rmp/src/abc_library_factory.cpp

@@ -41,7 +41,7 @@ static bool IsCombinational(sta::LibertyCell* cell)
   }
   return (!cell->isClockGate() && !cell->isPad() && !cell->isMacro()
           && !cell->hasSequentials() && !cell->isLevelShifter()
-          && !cell->isIsolationCell() && !cell->isClockGate());
+          && !cell->isIsolationCell() && !cell->isMemory());
 }
 
 static int CountOutputPins(sta::LibertyCell* cell)
@@ -76,8 +76,12 @@ static bool HasNonInputOutputPorts(sta::LibertyCell* cell)
   return false;
 }
 
-static bool isCompatibleWithAbc(sta::LibertyCell* cell)
+static bool isCompatibleWithAbc(sta::LibertyCell* cell, rsz::Resizer* resizer)
 {
+  if (resizer != nullptr && resizer->dontUse(cell)) {
+    return false;
+  }
+
   if (!IsCombinational(cell)) {
     return false;
   }
@@ -213,6 +217,13 @@ std::vector<abc::SC_Pin*> AbcLibraryFactory::CreateAbcOutputPins(
       output_pin->max_out_slew = time_unit->staToUser(max_output_slew);
     }
 
+    if (cell_port->function() == nullptr) {
+      logger_->error(utl::RMP,
+                     27,
+                     "cell port function is null for cell {}:{}",
+                     cell->name(),
+                     cell_port->name());
+    }
     output_pin->func_text = strdup(cell_port->function()->to_string().c_str());
 
     // Get list of input ports
@@ -312,6 +323,12 @@ AbcLibraryFactory& AbcLibraryFactory::AddDbSta(sta::dbSta* db_sta)
   return *this;
 }
 
+AbcLibraryFactory& AbcLibraryFactory::AddResizer(rsz::Resizer* resizer)
+{
+  resizer_ = resizer;
+  return *this;
+}
+
 AbcLibraryFactory& AbcLibraryFactory::SetCorner(sta::Corner* corner)
 {
   corner_ = corner;
@@ -418,7 +435,7 @@ void AbcLibraryFactory::PopulateAbcSclLibFromSta(
   // Loop through all of the cells in STA and create equivalents in
   // the ABC structure.
   for (sta::LibertyCell* cell : cells) {
-    if (!isCompatibleWithAbc(cell)) {
+    if (!isCompatibleWithAbc(cell, resizer_)) {
       continue;
     }
 

src/rmp/src/abc_library_factory.h

@@ -12,6 +12,7 @@
 
 #include "db_sta/dbSta.hh"
 #include "map/scl/sclLib.h"
+#include "rsz/Resizer.hh"
 #include "sta/Sta.hh"
 #include "utl/Logger.h"
 #include "utl/deleter.h"
@@ -54,6 +55,7 @@ class AbcLibraryFactory
  public:
   explicit AbcLibraryFactory(utl::Logger* logger) : logger_(logger) {}
   AbcLibraryFactory& AddDbSta(sta::dbSta* db_sta);
+  AbcLibraryFactory& AddResizer(rsz::Resizer* resizer);
   AbcLibraryFactory& SetCorner(sta::Corner* corner);
   AbcLibrary Build();
 
@@ -78,6 +80,7 @@ class AbcLibraryFactory
   utl::Logger* logger_;
   sta::dbSta* db_sta_ = nullptr;
   sta::Corner* corner_ = nullptr;
+  rsz::Resizer* resizer_ = nullptr;
 };
 
 }  // namespace rmp

src/rmp/src/resynthesis_strategy.h

@@ -5,6 +5,7 @@
 
 #include "db_sta/dbSta.hh"
 #include "rmp/unique_name.h"
+#include "rsz/Resizer.hh"
 #include "utl/Logger.h"
 
 namespace rmp {
@@ -15,6 +16,7 @@ class ResynthesisStrategy
   virtual ~ResynthesisStrategy() = default;
   virtual void OptimizeDesign(sta::dbSta* sta,
                               rmp::UniqueName& name_generator,
+                              rsz::Resizer* resizer,
                               utl::Logger* logger)
       = 0;
 };

src/rmp/src/zero_slack_strategy.cpp

@@ -24,17 +24,26 @@
 
 namespace rmp {
 
-std::vector<sta::Vertex*> GetNegativeEndpoints(sta::dbSta* sta)
+std::vector<sta::Vertex*> GetNegativeEndpoints(sta::dbSta* sta,
+                                               rsz::Resizer* resizer)
 {
   std::vector<sta::Vertex*> result;
 
   sta::dbNetwork* network = sta->getDbNetwork();
   for (sta::Vertex* vertex : *sta->endpoints()) {
-    sta::PortDirection* direction = network->direction(vertex->pin());
+    sta::Pin* pin = vertex->pin();
+    sta::PortDirection* direction = network->direction(pin);
     if (!direction->isInput()) {
       continue;
     }
 
+    if (resizer != nullptr) {
+      if (resizer->dontTouch(pin) || resizer->dontTouch(network->net(pin))
+          || resizer->dontTouch(network->instance(pin))) {
+        continue;
+      }
+    }
+
     const sta::Slack slack = sta->vertexSlack(vertex, sta::MinMax::max());
 
     if (slack > 0.0) {
@@ -48,6 +57,7 @@ std::vector<sta::Vertex*> GetNegativeEndpoints(sta::dbSta* sta)
 
 void ZeroSlackStrategy::OptimizeDesign(sta::dbSta* sta,
                                        UniqueName& name_generator,
+                                       rsz::Resizer* resizer,
                                        utl::Logger* logger)
 {
   sta->ensureGraph();
@@ -57,16 +67,19 @@ void ZeroSlackStrategy::OptimizeDesign(sta::dbSta* sta,
 
   sta::dbNetwork* network = sta->getDbNetwork();
 
-  std::vector<sta::Vertex*> candidate_vertices = GetNegativeEndpoints(sta);
+  std::vector<sta::Vertex*> candidate_vertices
+      = GetNegativeEndpoints(sta, resizer);
 
   if (candidate_vertices.empty()) {
-    logger->info(
-        utl::RMP, 1030, "All endpoints have positive slack, nothing to do.");
+    logger->info(utl::RMP,
+                 1030,
+                 "All candidate endpoints have positive slack, nothing to do.");
     return;
   }
 
   AbcLibraryFactory factory(logger);
   factory.AddDbSta(sta);
+  factory.AddResizer(resizer);
   factory.SetCorner(corner_);
   AbcLibrary abc_library = factory.Build();
 
@@ -82,6 +95,12 @@ void ZeroSlackStrategy::OptimizeDesign(sta::dbSta* sta,
 
   LogicCut cut = logic_extractor.BuildLogicCut(abc_library);
 
+  if (cut.IsEmpty()) {
+    logger->warn(
+        utl::RMP, 1032, "Logic cut is empty after extraction, nothing to do.");
+    return;
+  }
+
   utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> mapped_abc_network
       = cut.BuildMappedAbcNetwork(abc_library, network, logger);
 

src/rmp/src/zero_slack_strategy.h

@@ -6,6 +6,7 @@
 #include "db_sta/dbSta.hh"
 #include "resynthesis_strategy.h"
 #include "rmp/unique_name.h"
+#include "rsz/Resizer.hh"
 #include "sta/Corner.hh"
 #include "utl/Logger.h"
 
@@ -17,6 +18,7 @@ class ZeroSlackStrategy : public ResynthesisStrategy
   explicit ZeroSlackStrategy(sta::Corner* corner = nullptr) : corner_(corner) {}
   void OptimizeDesign(sta::dbSta* sta,
                       UniqueName& name_generator,
+                      rsz::Resizer* resizer,
                       utl::Logger* logger) override;
 
  private:

src/rmp/test/BUILD

@@ -17,6 +17,9 @@ COMPULSORY_TESTS = [
     "gcd_restructure",
     "aes_asap7",
     "gcd_asap7",
+    "memory_nangate45",
+    "aes_dontuse_nangate45",
+    "aes_donttouch_nangate45"
 ]
 
 # Disabled in CMakeLists.txt

src/rmp/test/CMakeLists.txt

@@ -14,6 +14,9 @@ or_integration_tests(
     gcd_restructure
     aes_asap7
     gcd_asap7
+    memory_nangate45
+    aes_dontuse_nangate45
+    aes_donttouch_nangate45
 )
 
 # Skipped