Merge pull request #8275 from The-OpenROAD-Project-staging/cgt-fix

Cgt fix

Author: maliberty

BUILD.bazel

@@ -143,6 +143,7 @@ cc_binary(
         ":openroad_lib",
         ":openroad_version",
         "//:ord",
+        "//src/cut",
         "//src/gui",
         "//src/sta:opensta_lib",
         "//src/utl",

include/ord/OpenRoad.hh

@@ -284,6 +284,5 @@ class OpenRoad
 
 int tclAppInit(Tcl_Interp* interp);
 int tclInit(Tcl_Interp* interp);
-void abcInit();
 
 }  // namespace ord

src/Main.cc

@@ -33,6 +33,7 @@
 #include <tclExtend.h>
 #endif
 
+#include "cut/abc_init.h"
 #include "gui/gui.h"
 #include "ord/Design.h"
 #include "ord/InitOpenRoad.hh"
@@ -89,7 +90,6 @@ static const char* log_filename = nullptr;
 static const char* metrics_filename = nullptr;
 static bool no_settings = false;
 static bool minimize = false;
-static bool abc_initialized = false;
 
 static const char* init_filename = ".openroad";
 
@@ -169,12 +169,6 @@ static void initPython()
 }
 #endif
 
-namespace abc {
-// Forward declare instead of including to avoid warnings from ABC
-void Abc_Start();
-void Abc_Stop();
-}  // namespace abc
-
 static volatile sig_atomic_t fatal_error_in_progress = 0;
 
 // When we enter through main() we have a single tech and design.
@@ -310,9 +304,8 @@ int main(int argc, char* argv[])
   // Tcl_Main never returns.
   Tcl_Main(1, argv, ord::tclAppInit);
 
-  if (abc_initialized) {
-    abc::Abc_Stop();
-  }
+  cut::abcStop();
+
   return 0;
 }
 
@@ -528,14 +521,6 @@ int ord::tclInit(Tcl_Interp* interp)
   return tclAppInit(cmd_argc, cmd_argv, init_filename, interp);
 }
 
-void ord::abcInit()
-{
-  if (!abc_initialized) {
-    abc::Abc_Start();
-    abc_initialized = true;
-  }
-}
-
 static void showUsage(const char* prog, const char* init_filename)
 {
   printf("Usage: %s [-help] [-version] [-no_init] [-no_splash] [-exit] ", prog);

src/cgt/src/CMakeLists.txt

@@ -37,7 +37,6 @@ target_link_libraries(cgt
     OpenSTA
     cut
     dbSta_lib
-    libabc
     utl_lib
  )
 
@@ -64,7 +63,6 @@ if (Python3_FOUND AND BUILD_PYTHON)
       dbSta
       OpenSTA
       cut
-      libabc
   )
 
 endif()

src/cgt/src/ClockGating.cpp

@@ -10,12 +10,12 @@
 #include "base/abc/abc.h"
 #include "base/io/ioAbc.h"
 #include "base/main/abcapis.h"
+#include "cut/abc_init.h"
 #include "cut/abc_library_factory.h"
 #include "cut/logic_extractor.h"
 #include "db_sta/dbNetwork.hh"
 #include "db_sta/dbSta.hh"
 #include "odb/db.h"
-#include "ord/OpenRoad.hh"
 #include "sta/Bfs.hh"
 #include "sta/ClkNetwork.hh"
 #include "sta/FuncExpr.hh"
@@ -360,7 +360,7 @@ void ClockGating::run()
   sta_->searchPreamble();
 
   // Initialize ABC
-  ord::abcInit();
+  cut::abcInit();
   abc_factory_->AddDbSta(sta_);
   abc_library_ = std::make_unique<cut::AbcLibrary>(abc_factory_->Build());
 

src/cut/BUILD

@@ -19,6 +19,7 @@ cc_library(
     ],
     hdrs = [
         "include/cut/abc_library_factory.h",
+        "include/cut/abc_init.h",
         "include/cut/blif.h",
         "include/cut/blifParser.h",
         "include/cut/logic_cut.h",

src/cut/include/cut/abc_init.h

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) 2024-2025, The OpenROAD Authors
+
+#pragma once
+
+namespace cut {
+
+void abcInit();
+void abcStop();
+
+}  // namespace cut

src/cut/src/CMakeLists.txt

@@ -27,12 +27,12 @@ target_sources(cut
 target_link_libraries(cut
   PUBLIC
     rsz_lib
+    libabc
   PRIVATE
     odb
     dbSta
     OpenSTA
     dbSta_lib
-    libabc
     utl_lib
     ${ABC_LIBRARY}
  )

src/cut/src/abc_library_factory.cpp

@@ -34,6 +34,12 @@
 #include "sta/Units.hh"
 #include "utl/deleter.h"
 
+namespace abc {
+// Forward declare instead of including to avoid warnings from ABC
+void Abc_Start();
+void Abc_Stop();
+}  // namespace abc
+
 namespace cut {
 
 AbcLibrary::AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library)
@@ -680,4 +686,21 @@ bool AbcLibrary::IsConstCell(const std::string& cell_name)
   return IsConst1Cell(cell_name) || IsConst0Cell(cell_name);
 }
 
+static bool abc_initialized = false;
+
+void abcInit()
+{
+  if (!abc_initialized) {
+    abc::Abc_Start();
+    abc_initialized = true;
+  }
+}
+
+void abcStop()
+{
+  if (abc_initialized) {
+    abc::Abc_Stop();
+  }
+}
+
 }  // namespace cut

src/gpl/src/replace.cpp

@@ -16,7 +16,6 @@
 #include "nesterovBase.h"
 #include "nesterovPlace.h"
 #include "odb/db.h"
-#include "ord/OpenRoad.hh"
 #include "placerBase.h"
 #include "routeBase.h"
 #include "rsz/Resizer.hh"