Merge pull request #8923 from gadfort/rcx-cleanup2

rcx: remove unused members

Author: maliberty

src/rcx/include/rcx/extMeasureRC.h

@@ -52,21 +52,6 @@ struct CouplingState
       one_count_table++;
     }
   }
-
-  // Print statistics
-  void printStats(FILE* fp, uint dir) const
-  {
-    if (fp) {
-      fprintf(fp,
-              "\nDir=%d  wireCnt=%d  NotOrderedCnt=%d  oneEmptyTable=%d  "
-              "oneCntTable=%d\n",
-              dir,
-              wire_count,
-              not_ordered_count,
-              empty_table_count,
-              one_count_table);
-    }
-  }
 };
 struct CouplingConfig
 {

src/rcx/include/rcx/extRCap.h

@@ -763,7 +763,6 @@ class extRCModel
                  const char* name,
                  const char* suffix,
                  const char* permissions);
-  FILE* openSolverFile();
   void mkNet_prefix(extMeasure* m, const char* wiresNameSuffix);
   void mkFileNames(extMeasure* m, char* wiresNameSuffix);
   void writeWires2(FILE* fp, extMeasure* measure, uint wireCnt);
@@ -1374,7 +1373,6 @@ class extMeasure
                        double s2 = 0.0);
   void setEffParams(double wTop, double wBot, double teff);
   void addCap();
-  void printStats(FILE* fp);
   void printMets(FILE* fp);
 
   ext2dBox* addNew2dBox(odb::dbNet* net, int* ll, int* ur, uint m, bool cntx);
@@ -2707,7 +2705,6 @@ class extMain
   uint _ccUp = 0;
   uint _couplingFlag = 0;
   bool _rotatedGs = false;
-  // uint _ccContextDepth = 0;
   int _ccMinX;
   int _ccMinY;
   int _ccMaxX;
@@ -2798,95 +2795,14 @@ class extMain
 
   int _noVariationIndex;
 
-  bool _ignoreWarning_1st;
-  bool _keepExtModel;
-
   friend class extMeasure;
 
-  FILE* _blkInfoVDD = nullptr;
-  FILE* _viaInfoVDD = nullptr;
-  FILE* _blkInfoGND = nullptr;
-  FILE* _viaInfoGND = nullptr;
-
-  FILE* _stdCirVDD = nullptr;
-  FILE* _globCirVDD = nullptr;
-  FILE* _globGeomVDD = nullptr;
-  FILE* _stdCirGND = nullptr;
-  FILE* _globCirGND = nullptr;
-
-  FILE* _stdCirHeadVDD = nullptr;
-  FILE* _globCirHeadVDD = nullptr;
-  FILE* _globGeomGND = nullptr;
-  FILE* _stdCirHeadGND = nullptr;
-  FILE* _globCirHeadGND = nullptr;
-  FILE* _blkInfo = nullptr;
-  FILE* _viaInfo = nullptr;
-  FILE* _globCir = nullptr;
-  FILE* _globGeom = nullptr;
-  FILE* _stdCir = nullptr;
-  FILE* _globCirHead = nullptr;
-  FILE* _stdCirHead = nullptr;
-  FILE* _viaStackGlobCir = nullptr;
-  FILE* _viaStackGlobVDD = nullptr;
-  FILE* _viaStackGlobGND = nullptr;
-
-  odb::Ath__array1D<int>* _junct2viaMap = nullptr;
-  bool _dbgPowerFlow;
-  dbCreateNetUtil* _netUtil = nullptr;
-
-  std::vector<odb::dbBox*> _viaUp_VDDtable;
-  std::vector<odb::dbBox*> _viaUp_GNDtable;
-  std::vector<odb::dbBox*> _viaM1_GNDtable;
-  std::vector<odb::dbBox*> _viaM1_VDDtable;
-  std::vector<odb::dbBox*>* _viaM1Table = nullptr;
-  std::vector<odb::dbBox*>* _viaUpTable = nullptr;
-
-  uint _stackedViaResCnt;
-  uint _totViaResCnt;
-  odb::Ath__array1D<int>* _via2JunctionMap = nullptr;
-  std::map<odb::dbBox*, odb::dbNet*> _via_map;
-  std::map<uint, odb::dbNet*> _via_id_map;
-  std::map<uint, float> _capNode_map;
-  std::vector<odb::dbInst*> _powerMacroTable;
-  std::vector<odb::dbBox*> _viaUpperTable[2];
-  odb::Ath__array1D<char*>** _supplyViaMap[2]{nullptr, nullptr};
-  odb::Ath__array1D<odb::dbBox*>** _supplyViaTable[2]{nullptr, nullptr};
-  char* _power_source_file = nullptr;
-  std::vector<char*> _powerSourceTable[2];
-  FILE* _coordsFP = nullptr;
-  FILE* _coordsGND = nullptr;
-  FILE* _coordsVDD = nullptr;
-  std::vector<uint> _vddItermIdTable;
-  std::vector<uint> _gndItermIdTable;
-  FILE* _subCktNodeFP[2][2]{{nullptr, nullptr}, {nullptr, nullptr}};
-  uint _subCktNodeCnt[2][2];
-  bool _nodeCoords;
-  int _prevX;
-  int _prevY;
-  char _node_blk_dir[1024];
-  char _node_blk_prefix[1024];
-  char _node_inst_prefix[1024];
-  odb::Ath__array1D<odb::dbITerm*>* _junct2iterm = nullptr;
-  std::map<uint, odb::dbSBox*> _sbox_id_map;
-
-  uint _powerWireCnt;
-  uint _mergedPowerWireCnt;
-  uint _overlapPowerWireCnt;
-  uint _viaOverlapPowerCnt;
-  uint _multiViaCnt;
-
-  std::vector<odb::Rect*> _multiViaTable[20];
-  std::vector<odb::dbBox*> _multiViaBoxTable[20];
-
-  // v2 uint _debug_net_id = 0;
   float _previous_percent_extracted = 0;
 
   double _minCapTable[64][64];
   double _maxCapTable[64][64];
   double _minResTable[64][64];
   double _maxResTable[64][64];
-  uint _rcLayerCnt;
-  uint _rcCornerCnt;
 
  public:
   bool _lef_res;

src/rcx/src/extRCmodel.cpp

@@ -2618,22 +2618,6 @@ void extMeasure::printMets(FILE* fp)
   }
 }
 
-void extMeasure::printStats(FILE* fp)
-{
-  fprintf(fp,
-          "<==> w= %g[%g %g]  s= %g[%g]  th= %g[%g]  h= %g[%g]  r= %g",
-          _w_m,
-          _topWidth,
-          _botWidth,
-          _s_m,
-          _seff,
-          _t,
-          _teff,
-          _h,
-          _heff,
-          _r);
-}
-
 FILE* extRCModel::openFile(const char* topDir,
                            const char* name,
                            const char* suffix,
@@ -2787,16 +2771,6 @@ FILE* extRCModel::mkPatternFile()
   return fp;
 }
 
-FILE* extRCModel::openSolverFile()
-{
-  FILE* fp = openFile(_wireDirName, _wireFileName, ".out", "r");
-  if (fp != nullptr) {
-    _parser->setInputFP(fp);
-  }
-
-  return fp;
-}
-
 bool extRCModel::openCapLogFile()
 {
   if (!_readSolver && !_runSolver) {

src/rcx/src/parse.cpp

@@ -49,8 +49,6 @@ static char* ATH__allocCharWord(int n, utl::Logger* logger)
 Ath__parser::Ath__parser(utl::Logger* logger)
 {
   _logger = logger;
-  _lineSize = 10000;
-  _maxWordCnt = 100;
   init();
 }
 
@@ -69,7 +67,6 @@ Ath__parser::~Ath__parser()
   }
   delete[] _inputFile;
   delete[] _line;
-  delete[] _tmpLine;
   delete[] _wordSeparators;
 
   for (int ii = 0; ii < _maxWordCnt; ii++) {
@@ -86,7 +83,6 @@ Ath__parser::~Ath__parser()
 void Ath__parser::init()
 {
   _line = ATH__allocCharWord(_lineSize, _logger);
-  _tmpLine = ATH__allocCharWord(_lineSize, _logger);
 
   _wordArray = new char*[_maxWordCnt];
 
@@ -98,15 +94,11 @@ void Ath__parser::init()
 
   strcpy(_wordSeparators, " \n\t");
 
-  _commentChar = '#';
-
   _lineNum = 0;
   _currentWordCnt = -1;
 
   _inFP = nullptr;
   _inputFile = ATH__allocCharWord(512, _logger);
-
-  _progressLineChunk = 1000000;
 }
 
 int Ath__parser::getLineNum()

src/rcx/src/parse.h

@@ -56,17 +56,18 @@ class Ath__parser
   char* _tmpLine;
   char* _wordSeparators;
   char** _wordArray;
-  char _commentChar;
-  int _maxWordCnt;
 
   int _lineNum;
   int _currentWordCnt;
-  int _lineSize;
   FILE* _inFP;
   char* _inputFile;
 
-  int _progressLineChunk;
   utl::Logger* _logger;
+
+  static constexpr int _progressLineChunk = 1000000;
+  static constexpr char _commentChar = '#';
+  static constexpr int _maxWordCnt = 100;
+  static constexpr int _lineSize = 10000;
 };
 
 }  // namespace rcx