Merge pull request #10673 from AcKoucher/rcx-options-refactor

rcx: refactor extraction options setting into its own function

Author: maliberty

src/rcx/include/rcx/extRCap.h

@@ -1758,6 +1758,7 @@ class extMain
                      uint32_t* cornerTable);
 
   void setExtractionOptions_v2(ExtractOptions options);
+  void setExtractionOptions(const ExtractOptions& options);
   uint32_t makeNetRCsegs_v2(odb::dbNet* net, bool skipStartWarning = false);
   uint32_t resetMapNodes_v2(odb::dbWire* wire);
 
@@ -2124,14 +2125,7 @@ class extMain
   void updatePrevControl();
   void getPrevControl();
 
-  void makeBlockRCsegs(const char* netNames,
-                       uint32_t cc_up,
-                       uint32_t ccFlag,
-                       double resBound,
-                       bool mergeViaRes,
-                       double ccThres,
-                       int contextDepth,
-                       const char* extRules);
+  void makeBlockRCsegs();
 
   uint32_t getShortSrcJid(uint32_t jid);
   void make1stRSeg(odb::dbNet* net,
@@ -2723,6 +2717,8 @@ class extMain
   int _ccMaxY;
   double _mergeResBound = 0.0;
   bool _mergeViaRes = false;
+  const char* rules_file_path_{nullptr};
+  const char* target_nets_names_{nullptr};
   bool _mergeParallelCC = false;
   bool _reportNetNoWire = false;
   int _netNoWireCnt = 0;

src/rcx/src/ext.cpp

@@ -230,14 +230,8 @@ void Ext::extract(ExtractOptions options)
   if (_ext->_v2) {
     _ext->makeBlockRCsegs_v2(options.net, options.ext_model_file);
   } else {
-    _ext->makeBlockRCsegs(options.net,
-                          options.cc_up,
-                          options.cc_model,
-                          options.max_res,
-                          !options.no_merge_via_res,
-                          options.coupling_threshold,
-                          options.context_depth,
-                          options.ext_model_file);
+    _ext->setExtractionOptions(options);
+    _ext->makeBlockRCsegs();
   }
 }
 

src/rcx/src/extmain.cpp

@@ -8,6 +8,7 @@
 #include "rcx/array1.h"
 #include "rcx/extRCap.h"
 #include "rcx/extSpef.h"
+#include "rcx/ext_options.h"
 #include "utl/Logger.h"
 
 using odb::dbBlock;
@@ -31,6 +32,21 @@ void extMain::init(odb::dbDatabase* db, utl::Logger* logger)
   logger_ = logger;
 }
 
+void extMain::setExtractionOptions(const ExtractOptions& options)
+{
+  _couplingFlag = options.cc_model;
+  _coupleThreshold = options.coupling_threshold;
+  _ccUp = options.cc_up;
+  _ccContextDepth = options.context_depth;
+  _mergeViaRes = !options.no_merge_via_res;
+  _mergeResBound = options.max_res;
+  _lef_res = options.lef_res;
+  _lefRC = options.lef_rc;
+  _dbgOption = options._dbg;
+  rules_file_path_ = options.ext_model_file;
+  target_nets_names_ = options.net;
+}
+
 void extMain::addDummyCorners(dbBlock* block, uint32_t cnt, utl::Logger* logger)
 {
   extMain* tmiExt = (extMain*) block->getExtmi();

src/rcx/src/netRC.cpp

@@ -1800,38 +1800,25 @@ bool extMain::modelExists(const char* extRules)
   return true;
 }
 
-void extMain::makeBlockRCsegs(const char* netNames,
-                              uint32_t cc_up,
-                              uint32_t ccFlag,
-                              double resBound,
-                              bool mergeViaRes,
-                              double ccThres,
-                              int contextDepth,
-                              const char* extRules)
+void extMain::makeBlockRCsegs()
 {
-  if (!modelExists(extRules)) {
+  if (!modelExists(rules_file_path_)) {
     return;
   }
 
   uint32_t debugNetId = 0;
 
   _diagFlow = true;
-  _couplingFlag = ccFlag;
-  _coupleThreshold = ccThres;
   _usingMetalPlanes = true;
-  _ccUp = cc_up;
-  _couplingFlag = ccFlag;
-  _ccContextDepth = contextDepth;
-  _mergeViaRes = mergeViaRes;
-  _mergeResBound = resBound;
 
   if ((_processCornerTable != nullptr)
-      || ((_processCornerTable == nullptr) && (extRules != nullptr))) {
-    const char* rulesfile
-        = extRules ? extRules : _prevControl->_ruleFileName.c_str();
+      || ((_processCornerTable == nullptr) && (rules_file_path_ != nullptr))) {
+    const char* rules_file_path = rules_file_path_
+                                      ? rules_file_path_
+                                      : _prevControl->_ruleFileName.c_str();
 
     // Reading model file
-    if (!setCorners(rulesfile)) {
+    if (!setCorners(rules_file_path)) {
       logger_->info(RCX, 128, "skipping Extraction ...");
       return;
     }
@@ -1843,7 +1830,7 @@ void extMain::makeBlockRCsegs(const char* netNames,
   _foreign = false;  // extract after read_spef
 
   std::vector<dbNet*> inets;
-  _allNet = !findSomeNet(_block, netNames, inets, logger_);
+  _allNet = !findSomeNet(_block, target_nets_names_, inets, logger_);
   for (auto net : inets) {
     net->setMark(true);
   }