Changes in code.

Author: ksliwins

IGC/Compiler/CodeGenContext.cpp

@@ -709,10 +709,6 @@ uint32_t CodeGenContext::getNumGRFPerThread(bool returnDefault) {
     m_NumGRFPerThread = IGC_GET_FLAG_VALUE(TotalGRFNum);
     return m_NumGRFPerThread;
   }
-  if (getModuleMetaData()->csInfo.forceTotalGRFNum != 0) {
-    m_NumGRFPerThread = getModuleMetaData()->csInfo.forceTotalGRFNum;
-    return m_NumGRFPerThread;
-  }
 
   if (hasSyncRTCalls()) {
     // read value from CompOptions first
@@ -729,6 +725,16 @@ uint32_t CodeGenContext::getNumGRFPerThread(bool returnDefault) {
     m_NumGRFPerThread = IGC_GET_FLAG_VALUE(TotalGRFNum4CS);
     return m_NumGRFPerThread;
   }
+  // AIL check after reg check
+  if (this->type == ShaderType::COMPUTE_SHADER && getModuleMetaData()->csInfo.forceTotalGRFNum != 0) {
+    m_NumGRFPerThread = getModuleMetaData()->csInfo.forceTotalGRFNum;
+    return m_NumGRFPerThread;
+  }
+  if (getModuleMetaData()->compOpt.forceTotalGRFNum != 0) {
+    m_NumGRFPerThread = getModuleMetaData()->compOpt.forceTotalGRFNum;
+    return m_NumGRFPerThread;
+  }
+
   return (returnDefault ? DEFAULT_TOTAL_GRF_NUM : 0);
 }
 

IGC/common/MDFrameWork.h

@@ -439,6 +439,7 @@ enum class ShaderTypeMD
         bool BufferOffsetArgOptional                    = true;
         bool replaceGlobalOffsetsByZero                 = false;
         unsigned forcePixelShaderSIMDMode               = 0;
+        unsigned int forceTotalGRFNum                   = 0; // 0 means not forced
         bool pixelShaderDoNotAbortOnSpill               = false;
         bool UniformWGS                                 = false;
         bool disableVertexComponentPacking              = false;