Merge pull request #7416 from The-OpenROAD-Project-staging/dpl-swig

dpl: cleanup the swig handing of dbMasterSeq

Author: maliberty

src/dpl/CMakeLists.txt

@@ -9,6 +9,9 @@ swig_lib(NAME         dpl
          NAMESPACE    dpl
          I_FILE       src/Opendp.i
          SCRIPTS      src/Opendp.tcl
+         SWIG_INCLUDES ${ODB_HOME}/src/swig/common
+                       ${ODB_HOME}/src/swig/tcl
+                       ${ODB_HOME}/include
 )
 
 add_library(dpl_lib

src/dpl/include/dpl/Opendp.h

@@ -115,7 +115,7 @@ class Opendp
   int padRight(dbInst* inst) const;
 
   void checkPlacement(bool verbose, const std::string& report_file_name = "");
-  void fillerPlacement(dbMasterSeq* filler_masters,
+  void fillerPlacement(const dbMasterSeq& filler_masters,
                        const char* prefix,
                        bool verbose);
   void removeFillers();
@@ -277,7 +277,7 @@ class Opendp
   DbuPt initialLocation(const Node* cell, bool padded) const;
   int disp(const Node* cell) const;
   // Place fillers
-  MasterByImplant splitByImplant(dbMasterSeq* filler_masters);
+  MasterByImplant splitByImplant(const dbMasterSeq& filler_masters);
   void setGridCells();
   dbMasterSeq& gapFillers(dbTechLayer* implant,
                           GridX gap,

src/dpl/src/FillerPlacement.cpp

@@ -37,17 +37,18 @@ static dbTechLayer* getImplant(dbMaster* master)
   return nullptr;
 }
 
-Opendp::MasterByImplant Opendp::splitByImplant(dbMasterSeq* filler_masters)
+Opendp::MasterByImplant Opendp::splitByImplant(
+    const dbMasterSeq& filler_masters)
 {
   MasterByImplant mapping;
-  for (auto master : *filler_masters) {
+  for (auto master : filler_masters) {
     mapping[getImplant(master)].emplace_back(master);
   }
 
   return mapping;
 }
 
-void Opendp::fillerPlacement(dbMasterSeq* filler_masters,
+void Opendp::fillerPlacement(const dbMasterSeq& filler_masters,
                              const char* prefix,
                              bool verbose)
 {

src/dpl/src/Opendp.i

@@ -10,55 +10,12 @@
 #include "dpl/Opendp.h"
 #include "utl/Logger.h"
 
-
-
-namespace dpl {
-
-using std::vector;
-
-// Swig vector type in does not seem to work at all.
-// (see odb/src/swig/common/polgon.i)
-// Copied from opensta/tcl/StaTcl.i
-template <class TYPE>
-vector<TYPE> *
-tclListSeq(Tcl_Obj *const source,
-	   swig_type_info *swig_type,
-	   Tcl_Interp *interp)
-{
-  int argc;
-  Tcl_Obj **argv;
-
-  if (Tcl_ListObjGetElements(interp, source, &argc, &argv) == TCL_OK
-      && argc > 0) {
-    vector<TYPE> *seq = new vector<TYPE>;
-    for (int i = 0; i < argc; i++) {
-      void *obj;
-      // Ignore returned TCL_ERROR because can't get swig_type_info.
-      SWIG_ConvertPtr(argv[i], &obj, swig_type, false);
-      seq->push_back(reinterpret_cast<TYPE>(obj));
-    }
-    return seq;
-  }
-  else
-    return nullptr;
-}
-  
-dpl::dbMasterSeq *
-tclListSeqdbMaster(Tcl_Obj *const source,
-                   Tcl_Interp *interp)
-{
-  return tclListSeq<odb::dbMaster*>(source, SWIGTYPE_p_odb__dbMaster, interp);
-}
-
-}
-
 %}
 
 %include "../../Exception.i"
 
-%typemap(in) dpl::dbMasterSeq * {
-  $1 = dpl::tclListSeqdbMaster($input, interp);
-}
+%import <std_vector.i>
+%import "dbtypes.i"
 
 %inline %{
 
@@ -114,7 +71,7 @@ set_padding_inst(odb::dbInst *inst,
 }
 
 void
-filler_placement_cmd(dpl::dbMasterSeq *filler_masters,
+filler_placement_cmd(const std::vector<odb::dbMaster*>& filler_masters,
                      const char* prefix,
                      bool verbose)
 {