Merge pull request #10902 from AcKoucher/rcx-hard-coded-model-indices

rcx: remove hard-coded min/typ/max model indices

Author: maliberty

src/rcx/include/rcx/extRCap.h

@@ -2682,9 +2682,6 @@ class extMain
   double* _tmpResTable = new double[10];
   double* _tmpSumResTable = new double[10];
   int _sumUpdated;
-  int _minModelIndex;  // TO_TEST
-  int _typModelIndex;  //
-  int _maxModelIndex;  //
 
   odb::dbDatabase* _db = nullptr;
   odb::dbTech* _tech = nullptr;

src/rcx/src/extmain.cpp

@@ -700,7 +700,7 @@ void extMain::measureRC(CoupleOptions& options)
 
       _totCCcnt++;  // TO_TEST
 
-      if (m._rc[_minModelIndex]->coupling_ < _coupleThreshold) {  // TO_TEST
+      if (m._rc[0]->coupling_ < _coupleThreshold) {
         updateTotalCap(rseg1, &m, deltaFr, m._metRCTable.getCnt(), true);
         updateTotalCap(rseg2, &m, deltaFr, m._metRCTable.getCnt(), true);
 

src/rcx/src/extmain_v2.cpp

@@ -987,10 +987,6 @@ extRCModel* extMain::createCornerMap(const char* rulesFileName)
   // uint32_t cornerTable[10];
   uint32_t extCornerDbCnt = 0;
 
-  _minModelIndex = 0;
-  _maxModelIndex = 0;
-  _typModelIndex = 0;
-
   if (_processCornerTable != nullptr) {
     // User define process corners using <ext define_process_corner>
     for (uint32_t ii = 0; ii < _processCornerTable->getCnt(); ii++) {

src/rcx/src/netRC.cpp

@@ -1081,31 +1081,7 @@ int extMain::setMinTypMax(bool min,
   _modelMap.resetCnt(0);
   _metRCTable.resetCnt(0);
   _currentModel = nullptr;
-  if (extDbCnt > 1) {  // extract first <extDbCnt>
-    _block->setCornerCount(extDbCnt);
-    _extDbCnt = extDbCnt;
-
-    _modelMap.add(_minModelIndex);
-
-    _modelMap.add(_typModelIndex);
-
-    if (extDbCnt > 2) {
-      _modelMap.add(_maxModelIndex);
-    }
-  } else if (min || max || typ) {
-    if (min) {
-      _modelMap.add(_minModelIndex);
-    }
-    if (typ) {
-      _modelMap.add(_typModelIndex);
-    }
-    if (max) {
-      _modelMap.add(_maxModelIndex);
-    }
-    _extDbCnt = _modelMap.getCnt();
-
-    _block->setCornerCount(_extDbCnt);
-  } else if ((setMin >= 0) || (setMax >= 0) || (setTyp >= 0)) {
+  if ((setMin >= 0) || (setMax >= 0) || (setTyp >= 0)) {
     if (setMin >= 0) {
       _modelMap.add(setMin);
     }
@@ -1512,9 +1488,6 @@ bool extMain::setCorners(const char* rulesFileName)
     uint32_t cornerTable[10];
     uint32_t extDbCnt = 0;
 
-    _minModelIndex = 0;
-    _maxModelIndex = 0;
-    _typModelIndex = 0;
     if (_processCornerTable != nullptr) {
       for (uint32_t ii = 0; ii < _processCornerTable->getCnt(); ii++) {
         extCorner* s = _processCornerTable->get(ii);