Changes in code.

Author: jfuentes

visa/G4_Kernel.cpp

@@ -627,19 +627,6 @@ bool G4_Kernel::canUpdateKernelToLargerGRF() {
   return true;
 }
 
-//
-// Updates kernel's related structures to smaller GRF
-//
-bool G4_Kernel::updateKernelToSmallerGRF() {
-  if (numRegTotal == grfMode.getMinGRF())
-    return false;
-
-  // Scale number of GRFs, Acc, SWSB tokens.
-  setKernelParameters(grfMode.moveToSmallerGRF());
-  fg.builder->rebuildPhyRegPool(getNumRegTotal());
-  return true;
-}
-
 //
 // Updates kernel's related structures to large GRF
 //

visa/G4_Kernel.hpp

@@ -223,23 +223,12 @@ class GRFMode {
   // Get the next smaller GRF available
   unsigned getSmallerGRF() const {
     for (auto i = static_cast<int>(currentMode) - 1; i >= 0 ; --i) {
-      if (configs[i].VRTEnable && configs[i].numGRF >= lowerBoundGRF)
+      if (configs[i].VRTEnable)
         return configs[i].numGRF;
     }
     return configs[currentMode].numGRF;
   }
 
-  // Move GRF mode to the smaller GRF available and return the number
-  unsigned moveToSmallerGRF() {
-    for (auto i = static_cast<int>(currentMode) - 1; i >= 0; --i) {
-      if (configs[i].VRTEnable && configs[i].numGRF >= lowerBoundGRF) {
-        currentMode = i;
-        break;
-      }
-    }
-    return configs[currentMode].numGRF;
-  }
-
   // Move GRF mode to the larger GRF available and return the number
   unsigned moveToLargerGRF() {
     for (auto i = currentMode + 1; i < configs.size(); ++i) {

visa/Optimizer.cpp

@@ -228,29 +228,6 @@ void Optimizer::regAlloc() {
   } else if (status != VISA_SUCCESS) {
     RAFail = true;
   }
-
-  if (status == VISA_SUCCESS && kernel.useAutoGRFSelection() &&
-      kernel.getNumRegTotal() != kernel.grfMode.getMinGRF()) {
-    // There might be cases where RA is able to allocate less register
-    // than the GRF selected in Pre-RA scheduler which is based on
-    // register pressure.
-    // If that's the case, update the GRF number based on the largest
-    // register assignment by RA.
-    int largestGRF = 0;
-    for (auto dcl : kernel.Declares) {
-      if (dcl->getRegVar()->isGreg()) {
-        int GRFStart = dcl->getRegVar()->getPhyReg()->asGreg()->getRegNum();
-        int numRows = dcl->getNumRows();
-        int GRFEnd = GRFStart + numRows;
-        if (GRFEnd > largestGRF) {
-          largestGRF = GRFEnd;
-        }
-      }
-    }
-    int smallerGRF = kernel.grfMode.getSmallerGRF();
-    if (largestGRF <= smallerGRF)
-      kernel.updateKernelToSmallerGRF();
-  }
 }
 
 // HW debugging needs to zero certain ARF registers such as a0, acc, etc.