cleanup unneeded fields

cleanup unneeded fields

Author: scottp101

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4427,15 +4427,15 @@ namespace IGC
                 return true;
 
             // API check.
-            bool enableForRetey = m_program->m_DriverInfo->enableVISAPreRASchedulerForRetry() ||
+            bool enableForRetry = m_program->m_DriverInfo->enableVISAPreRASchedulerForRetry() ||
                 context->m_retryManager.AllowVISAPreRAScheduler();
             // PreRA scheduler runs always when VRT is enabled
-            enableForRetey |= m_program->m_Platform->supportsVRT() && m_program->m_DriverInfo->supportsVRT() &&
+            enableForRetry |= m_program->m_Platform->supportsVRT() && m_program->m_DriverInfo->supportsVRT() &&
                 (context->getModuleMetaData()->compOpt.EnableVRT || IGC_IS_FLAG_ENABLED(EnableVRT));
 
             if (IGC_IS_FLAG_ENABLED(EnableVISAPreSched) &&
                 m_program->m_DriverInfo->enableVISAPreRAScheduler() &&
-                enableForRetey)
+                enableForRetry)
                 return true;
 
             return false;
@@ -4817,10 +4817,6 @@ namespace IGC
         {
             SaveOption(vISA_TotalGRFNum, NumGRFSetting);
         }
-        else if (m_program->getNumGRFPerThread() > 0)
-        {
-            SaveOption(vISA_TotalGRFNum, m_program->getNumGRFPerThread());
-        }
 
         if (context->getModuleMetaData()->compOpt.WaEnableALTModeVisaWA)
         {
@@ -4898,14 +4894,18 @@ namespace IGC
                 }
             }
         } else { // Other shader types
-            if (IGC_GET_FLAG_VALUE(ForceHWThreadNumberPerEU) != 0) {
+            if (IGC_GET_FLAG_VALUE(ForceHWThreadNumberPerEU) != 0)
+            {
                 SaveOption(vISA_HWThreadNumberPerEU,
                            IGC_GET_FLAG_VALUE(ForceHWThreadNumberPerEU));
-            } else if (m_program->m_Platform->supportsAutoGRFSelection() &&
-                       context->m_DriverInfo.supportsAutoGRFSelection() &&
-                       IGC_IS_FLAG_ENABLED(ForceSupportsAutoGRFSelection)
-                || m_program->m_Platform->supportsVRT() && m_program->m_DriverInfo->supportsVRT() && IGC_IS_FLAG_ENABLED(EnableVRT)
-                ) {
+            }
+            else if ((m_program->m_Platform->supportsAutoGRFSelection() &&
+                      context->m_DriverInfo.supportsAutoGRFSelection() &&
+                      IGC_IS_FLAG_ENABLED(ForceSupportsAutoGRFSelection)) ||
+                     (m_program->m_Platform->supportsVRT() &&
+                      m_program->m_DriverInfo->supportsVRT() &&
+                      IGC_IS_FLAG_ENABLED(EnableVRT)))
+            {
                 // When user hasn't specified number of threads, we can rely on
                 // compiler heuristics
                 SaveOption(vISA_AutoGRFSelection, true);

IGC/Compiler/CISACodeGen/ShaderCodeGen.hpp

@@ -145,8 +145,6 @@ class CShader
     virtual int getAnnotatedNumThreads() { return -1; }
     virtual bool IsRegularGRFRequested() { return false; }
     virtual bool IsLargeGRFRequested() { return false; }
-    virtual unsigned getNumGRFPerThread() { return 0; }
-    virtual bool getEnableVRT() { return false; }
     virtual bool hasReadWriteImage(llvm::Function& F)
     {
         IGC_UNUSED(F);

IGC/common/MDFrameWork.h

@@ -300,15 +300,6 @@ enum class ShaderTypeMD
         // Shaders that satisfy `isPrimaryShaderIdentifier()` can also have
         // a collection of other names that they go by.
         std::vector<std::string> Aliases;
-        // Number of GRF registers available for this RT entry function.
-        // On platforms with VRT support it is possible to configure 32, 64, 96,
-        // 128, 160, 192, 224 and 256 registers per thread
-        // If this setting is greater than 0 than EnableVRT must be false.
-        uint32_t NumGRF = 0;
-        // Enables compiler heuristics to optimize GRF usage for this
-        // RT entry function.
-        // If this setting is "true", NumGRF must be set to 0.
-        bool EnableVRT = false;
     };
 
     struct ConstantAddress