Merge pull request #8311 from The-OpenROAD-Project-staging/odb-selective-defout

Odb selective defout

Author: maliberty

src/OpenRoad.cc

@@ -355,27 +355,27 @@ void OpenRoad::readDef(const char* filename,
   def_reader.readChip(search_libs, filename, chip);
 }
 
-static odb::defout::Version stringToDefVersion(const std::string& version)
+static odb::DefOut::Version stringToDefVersion(const std::string& version)
 {
   if (version == "5.8") {
-    return odb::defout::Version::DEF_5_8;
+    return odb::DefOut::Version::DEF_5_8;
   }
   if (version == "5.7") {
-    return odb::defout::Version::DEF_5_7;
+    return odb::DefOut::Version::DEF_5_7;
   }
   if (version == "5.6") {
-    return odb::defout::Version::DEF_5_6;
+    return odb::DefOut::Version::DEF_5_6;
   }
   if (version == "5.5") {
-    return odb::defout::Version::DEF_5_5;
+    return odb::DefOut::Version::DEF_5_5;
   }
   if (version == "5.4") {
-    return odb::defout::Version::DEF_5_4;
+    return odb::DefOut::Version::DEF_5_4;
   }
   if (version == "5.3") {
-    return odb::defout::Version::DEF_5_3;
+    return odb::DefOut::Version::DEF_5_3;
   }
-  return odb::defout::Version::DEF_5_8;
+  return odb::DefOut::Version::DEF_5_8;
 }
 
 void OpenRoad::writeDef(const char* filename, const char* version)
@@ -395,7 +395,7 @@ void OpenRoad::writeDef(const char* filename, const std::string& version)
       if (hierarchy_set) {
         sta->getDbNetwork()->disableHierarchy();
       }
-      odb::defout def_writer(logger_);
+      odb::DefOut def_writer(logger_);
       def_writer.setVersion(stringToDefVersion(version));
       def_writer.writeBlock(block, filename);
       if (hierarchy_set) {

src/odb/include/odb/defout.h

@@ -3,20 +3,22 @@
 
 #pragma once
 
+#include <memory>
+
 #include "odb.h"
+
 namespace utl {
 class Logger;
 }
+
 namespace odb {
 
-class defout_impl;
+class dbInst;
 class dbNet;
 class dbBlock;
 
-class defout
+class DefOut
 {
-  defout_impl* _writer;
-
  public:
   enum Version
   {
@@ -28,16 +30,19 @@ class defout
     DEF_5_8
   };
 
-  defout(utl::Logger* logger);
-  ~defout();
+  DefOut(utl::Logger* logger);
+  ~DefOut();
 
-  void setUseLayerAlias(bool value);
-  void setUseNetInstIds(bool value);
-  void setUseMasterIds(bool value);
   void selectNet(dbNet* net);
+  void selectInst(dbInst* inst);
+
   void setVersion(Version v);  // default is 5.8
 
   bool writeBlock(dbBlock* block, const char* def_file);
+
+ private:
+  class Impl;
+  std::unique_ptr<Impl> _writer;
 };
 
 }  // namespace odb

src/odb/src/defout/defout.cpp

@@ -11,43 +11,29 @@
 
 namespace odb {
 
-defout::defout(utl::Logger* logger)
+DefOut::DefOut(utl::Logger* logger)
 {
-  _writer = new defout_impl(logger);
-  assert(_writer);
+  _writer = std::make_unique<Impl>(logger);
 }
 
-defout::~defout()
-{
-  delete _writer;
-}
-
-void defout::setUseLayerAlias(bool value)
-{
-  _writer->setUseLayerAlias(value);
-}
+DefOut::~DefOut() = default;
 
-void defout::setUseNetInstIds(bool value)
+void DefOut::selectNet(dbNet* net)
 {
-  _writer->setUseNetInstIds(value);
-}
-
-void defout::setUseMasterIds(bool value)
-{
-  _writer->setUseMasterIds(value);
+  _writer->selectNet(net);
 }
 
-void defout::selectNet(dbNet* net)
+void DefOut::selectInst(dbInst* inst)
 {
-  _writer->selectNet(net);
+  _writer->selectInst(inst);
 }
 
-void defout::setVersion(Version v)
+void DefOut::setVersion(Version v)
 {
   _writer->setVersion(v);
 }
 
-bool defout::writeBlock(dbBlock* block, const char* def_file)
+bool DefOut::writeBlock(dbBlock* block, const char* def_file)
 {
   return _writer->writeBlock(block, def_file);
 }