Merge pull request #8670 from calewis/leak3

CUT: wrap mio_library_ with unique_ptr

Author: maliberty

src/cut/include/cut/abc_library_factory.h

@@ -26,11 +26,12 @@ namespace cut {
 class AbcLibrary
 {
  public:
-  AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library);
+  AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library,
+             utl::Logger* logger);
   AbcLibrary(AbcLibrary&&) = default;
   ~AbcLibrary() = default;
   abc::SC_Lib* abc_library() { return abc_library_.get(); }
-  abc::Mio_Library_t* mio_library() { return mio_library_; }
+  abc::Mio_Library_t* mio_library();
   bool IsSupportedCell(const std::string& cell_name);
   bool IsConst0Cell(const std::string& cell_name);
   bool IsConst1Cell(const std::string& cell_name);
@@ -42,7 +43,8 @@ class AbcLibrary
   void InitializeConstGates();
 
   utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library_;
-  abc::Mio_Library_t* mio_library_;
+  utl::UniquePtrWithDeleter<abc::Mio_Library_t> mio_library_ = nullptr;
+  utl::Logger* logger_ = nullptr;
   std::set<std::string> supported_cells_;
   std::unordered_set<std::string> const1_gates_;
   std::unordered_set<std::string> const0_gates_;

src/cut/src/abc_library_factory.cpp

@@ -33,6 +33,7 @@
 #include "sta/TableModel.hh"
 #include "sta/TimingArc.hh"
 #include "sta/Units.hh"
+#include "utl/SuppressStdout.h"
 #include "utl/deleter.h"
 
 namespace abc {
@@ -43,10 +44,24 @@ void Abc_Stop();
 
 namespace cut {
 
-AbcLibrary::AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library)
-    : abc_library_(std::move(abc_library))
+AbcLibrary::AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib> abc_library,
+                       utl::Logger* logger)
+    : abc_library_(std::move(abc_library)), logger_(logger)
 {
-  mio_library_ = abc::Abc_SclDeriveGenlibSimple(abc_library_.get());
+  mio_library_ = utl::UniquePtrWithDeleter<abc::Mio_Library_t>(
+      abc::Abc_SclDeriveGenlibSimple(abc_library_.get()),
+      [](abc::Mio_Library_t* lib) { abc::Mio_LibraryDelete(lib); });
+}
+
+abc::Mio_Library_t* AbcLibrary::mio_library()
+{
+  if (mio_library_ == nullptr) {
+    utl::SuppressStdout nostdout(logger_);
+    mio_library_ = utl::UniquePtrWithDeleter<abc::Mio_Library_t>(
+        abc::Abc_SclDeriveGenlibSimple(abc_library_.get()),
+        [](abc::Mio_Library_t* lib) { abc::Mio_LibraryDelete(lib); });
+  }
+  return mio_library_.release();
 }
 
 static bool IsCombinational(sta::LibertyCell* cell)
@@ -382,8 +397,10 @@ AbcLibrary AbcLibraryFactory::Build()
   abc::Abc_SclHashCells(abc_library);
   abc::Abc_SclLinkCells(abc_library);
 
-  return AbcLibrary(utl::UniquePtrWithDeleter<abc::SC_Lib>(
-      abc_library, [](abc::SC_Lib* lib) { abc::Abc_SclLibFree(lib); }));
+  return AbcLibrary(
+      utl::UniquePtrWithDeleter<abc::SC_Lib>(
+          abc_library, [](abc::SC_Lib* lib) { abc::Abc_SclLibFree(lib); }),
+      logger_);
 }
 
 std::vector<sta::LibertyCell*> AbcLibraryFactory::GetLibertyCellsFromCorner(