code cleanup

code cleanup

Author: scottp101

IGC/Compiler/CodeGenContext.cpp

@@ -845,8 +845,6 @@ namespace IGC
     /// there is no user-forced setting
     uint32_t CodeGenContext::getNumGRFPerThread(bool returnDefault)
     {
-        constexpr uint32_t DEFAULT_TOTAL_GRF_NUM = 128;
-
         if (m_NumGRFPerThread)
             return m_NumGRFPerThread;
 
@@ -857,29 +855,18 @@ namespace IGC
         }
         if (getModuleMetaData()->csInfo.forceTotalGRFNum != 0)
         {
-            if ((this->type == ShaderType::RAYTRACING_SHADER ||
-                this->type == ShaderType::BINDLESS_SHADER) &&
-                platform.isCoreChildOf(IGFX_XE2_LPG_CORE) &&
-                getModuleMetaData()->csInfo.forceTotalGRFNum > DEFAULT_TOTAL_GRF_NUM)
-            {
-                m_NumGRFPerThread = DEFAULT_TOTAL_GRF_NUM;
-                return m_NumGRFPerThread;
-            }
-            else
-            {
-                m_NumGRFPerThread = getModuleMetaData()->csInfo.forceTotalGRFNum;
-                return m_NumGRFPerThread;
-            }
+            m_NumGRFPerThread = getModuleMetaData()->csInfo.forceTotalGRFNum;
+            return m_NumGRFPerThread;
         }
 
-
         // read value from CompOptions first
-        DWORD GRFNum4RQToUse = getModuleMetaData()->compOpt.ForceLargeGRFNum4RQ ? 0x100 : 0;
+        DWORD GRFNum4RQToUse = getModuleMetaData()->compOpt.ForceLargeGRFNum4RQ ? 256 : 0;
 
         // override if reg key value is set
-        GRFNum4RQToUse = IGC_IS_FLAG_ENABLED( TotalGRFNum4RQ ) ? IGC_GET_FLAG_VALUE( TotalGRFNum4RQ ) : GRFNum4RQToUse;
+        GRFNum4RQToUse = IGC_IS_FLAG_ENABLED( TotalGRFNum4RQ ) ?
+            IGC_GET_FLAG_VALUE( TotalGRFNum4RQ ) : GRFNum4RQToUse;
 
-        if (hasSyncRTCalls() && (this->type != ShaderType::RAYTRACING_SHADER) && GRFNum4RQToUse != 0)
+        if (hasSyncRTCalls() && GRFNum4RQToUse != 0)
         {
             m_NumGRFPerThread = GRFNum4RQToUse;
             return m_NumGRFPerThread;

IGC/Compiler/CodeGenPublic.h

@@ -897,6 +897,8 @@ namespace IGC
 
         PushConstantMode m_pushConstantMode = PushConstantMode::DEFAULT;
 
+        static constexpr uint32_t DEFAULT_TOTAL_GRF_NUM = 128;
+
         SInstrTypes m_instrTypes = {};
         SInstrTypes m_instrTypesAfterOpts = {};
         // The module contains global variables with private address space.
@@ -988,7 +990,6 @@ namespace IGC
         uint64_t m_SIMDInfo = 0;
         uint32_t HdcEnableIndexSize = 0;
         std::vector<RoutingIndex> HdcEnableIndexValues;
-        uint32_t m_NumGRFPerThread = 0;
 
         // Flag per function/kernel informing about if it has
         // expensive loops and needs trigger retry compilation
@@ -1020,6 +1021,7 @@ namespace IGC
         /// input: IGC MetaData Utils
         IGC::IGCMD::MetaDataUtils* m_pMdUtils = nullptr;
         IGC::ModuleMetaData* modMD = nullptr;
+        uint32_t m_NumGRFPerThread = 0;
 
         virtual void setFlagsPerCtx();