Internal feature

bcheng0127 · gfxbot · commit 862787d13b3d · 2019-04-24T16:20:46.000-07:00
Change-Id: Id132f81bc43b3256df27e2caeab1c8e308397d2d
diff --git a/IGC/AdaptorCommon/AddImplicitArgs.cpp b/IGC/AdaptorCommon/AddImplicitArgs.cpp
@@ -95,7 +95,7 @@ bool AddImplicitArgs::runOnModule(Module &M)
             ImplicitArgs::addBufferOffsetArgs(*pFunc, m_pMdUtils, ctx->getModuleMetaData());
         }
 
-        ImplicitArgs implicitArgs(*pFunc, m_pMdUtils);
+        ImplicitArgs implicitArgs(*pFunc, m_pMdUtils, ctx->platform.getGRFSize());
 
         // If enabling indirect call, only R0, PayloadHeader and PrivateBase are allowed!
         if (IGC_IS_FLAG_ENABLED(EnableFunctionPointer))
@@ -522,7 +522,8 @@ void AddImplicitArgs::FixIndirectCalls(Module& M)
                     }
 
                     Function* pFunc = call->getParent()->getParent();
-                    ImplicitArgs implicitArgs(*pFunc, m_pMdUtils);
+                    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+                    ImplicitArgs implicitArgs(*pFunc, m_pMdUtils, ctx->platform.getGRFSize());
                     args.push_back(implicitArgs.getImplicitArg(*pFunc, ImplicitArg::ArgType::R0));
                     args.push_back(implicitArgs.getImplicitArg(*pFunc, ImplicitArg::ArgType::PAYLOAD_HEADER));
                     args.push_back(implicitArgs.getImplicitArg(*pFunc, ImplicitArg::ArgType::PRIVATE_BASE));
diff --git a/IGC/AdaptorCommon/ImplicitArgs.cpp b/IGC/AdaptorCommon/ImplicitArgs.cpp
@@ -228,7 +228,7 @@ bool ImplicitArg::isConstantBuf() const {
     return m_isConstantBuf;
 }
 
-ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMdUtils) 
+ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMdUtils, unsigned int GRFSize) 
 {
     if (IMPLICIT_ARGS.size() == 0)
     {
@@ -242,9 +242,9 @@ ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMd
         IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_SIZE, "localSize", ImplicitArg::INT, WIAnalysis::UNIFORM, 3, ImplicitArg::ALIGN_DWORD, true));
         IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::ENQUEUED_LOCAL_WORK_SIZE, "enqueuedLocalSize", ImplicitArg::INT, WIAnalysis::UNIFORM, 3, ImplicitArg::ALIGN_DWORD, true));
 
-        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_X, "localIdX", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));
-        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Y, "localIdY", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));
-        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Z, "localIdZ", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));
+        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_X, "localIdX", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));
+        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Y, "localIdY", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));
+        IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Z, "localIdZ", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));
 
         IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::CONSTANT_BASE, "constBase", ImplicitArg::CONSTPTR, WIAnalysis::UNIFORM, 1, ImplicitArg::ALIGN_PTR, true));
         IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::GLOBAL_BASE, "globalBase", ImplicitArg::GLOBALPTR, WIAnalysis::UNIFORM, 1, ImplicitArg::ALIGN_PTR, true));
diff --git a/IGC/AdaptorCommon/ImplicitArgs.hpp b/IGC/AdaptorCommon/ImplicitArgs.hpp
@@ -200,7 +200,7 @@ namespace IGC
         ///         It actually constructs a mapping to a subset of IMPLICIT_ARGS
         /// @param  func the function to get impilcit args for.
         /// @param  the metadata utils object
-        ImplicitArgs(const llvm::Function& func, const IGCMD::MetaDataUtils* pMdUtils);
+        ImplicitArgs(const llvm::Function& func, const IGCMD::MetaDataUtils* pMdUtils, unsigned int GRFSize = 32);
 
         /// @brief  Returns the number of implicit arguments that are passed from the runtime
         /// @return The number of implicit arguments
diff --git a/IGC/Compiler/CISACodeGen/CShader.cpp b/IGC/Compiler/CISACodeGen/CShader.cpp
@@ -250,7 +250,7 @@ CVariable* CShader::CreateSP(bool ptr64bits)
 void CShader::InitKernelStack(bool ptr64bits)
 {
     CreateSP(ptr64bits);
-    ImplicitArgs implicitArgs(*entry, m_pMdUtils);
+    ImplicitArgs implicitArgs(*entry, m_pMdUtils, getGRFSize());
     unsigned numPushArgs = m_ModuleMetadata->pushInfo.pushAnalysisWIInfos.size();
     unsigned numImplicitArgs = implicitArgs.size();
     unsigned numFuncArgs = IGCLLVM::GetFuncArgSize(entry) - numImplicitArgs - numPushArgs;
@@ -323,7 +323,7 @@ void CShader::CreateImplicitArgs()
     encoder.GetVISAPredefinedVar(m_R0, PREDEFINED_R0);
 
     // create variables for implicit args
-    ImplicitArgs implicitArgs(*entry, m_pMdUtils);
+    ImplicitArgs implicitArgs(*entry, m_pMdUtils, getGRFSize());
     unsigned numImplicitArgs = implicitArgs.size();
 
     // Push Args are only for entry function
@@ -1888,7 +1888,7 @@ CVariable* CShader::getOrCreateArgumentSymbol(llvm::Argument *Arg, bool useStack
     // An explicit argument is not uniform, and for an implicit argument, it
     // is predefined. Note that it is not necessarily uniform.
     Function *F = Arg->getParent();
-    ImplicitArgs implicitArgs(*F, m_pMdUtils);
+    ImplicitArgs implicitArgs(*F, m_pMdUtils, getGRFSize());
     unsigned numImplicitArgs = implicitArgs.size();
     unsigned numPushArgsEntry = m_ModuleMetadata->pushInfo.pushAnalysisWIInfos.size();
     unsigned numPushArgs = (isEntryFunc(m_pMdUtils, F) ? numPushArgsEntry : 0);
@@ -2010,7 +2010,7 @@ CVariable* CShader::getOrCreateArgSymbolForIndirectCall(llvm::CallInst* cInst, u
     {
         // Can be mapped to the parent's implicit arg
         Function* parentFunc = cInst->getParent()->getParent();
-        ImplicitArgs implicitArgs(*parentFunc, m_pMdUtils);
+        ImplicitArgs implicitArgs(*parentFunc, m_pMdUtils, getGRFSize());
         for (unsigned i = 0; i < implicitArgs.size(); i++)
         {
             ImplicitArg implictArg = implicitArgs[i];
diff --git a/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp b/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp
@@ -1440,7 +1440,7 @@ void COpenCLKernel::AllocatePayload()
             KernelArgsOrder::InputType::INDIRECT :
             KernelArgsOrder::InputType::CURBE;
 
-    KernelArgs kernelArgs(*entry, m_DL, m_pMdUtils, m_ModuleMetadata, layout);
+    KernelArgs kernelArgs(*entry, m_DL, m_pMdUtils, m_ModuleMetadata, getGRFSize(), layout);
 
     if (layout == KernelArgsOrder::InputType::INDIRECT && !loadThreadPayload)
     {
@@ -2012,7 +2012,7 @@ bool COpenCLKernel::hasReadWriteImage(llvm::Function &F)
         return false;
     }
 
-    KernelArgs kernelArgs(F, m_DL, m_pMdUtils, m_ModuleMetadata, KernelArgsOrder::InputType::INDEPENDENT);
+    KernelArgs kernelArgs(F, m_DL, m_pMdUtils, m_ModuleMetadata, getGRFSize(), KernelArgsOrder::InputType::INDEPENDENT);
     for (auto KA : kernelArgs)
     {
         // RenderScript annotation sets "read_write" qualifier 
diff --git a/IGC/Compiler/CISACodeGen/WIAnalysis.cpp b/IGC/Compiler/CISACodeGen/WIAnalysis.cpp
@@ -408,7 +408,7 @@ void WIAnalysis::updateArgsDependency(llvm::Function *pF)
     bool IsSubroutine = !isEntryFunc(m_pMdUtils, pF);
 
     ModuleMetaData *modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
-    ImplicitArgs implicitArgs(*pF, m_pMdUtils);
+    ImplicitArgs implicitArgs(*pF, m_pMdUtils, getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
     unsigned implicitArgStart = (unsigned)(IGCLLVM::GetFuncArgSize(pF)
         - implicitArgs.size()
         - (IsSubroutine ? 0 : modMD->pushInfo.pushAnalysisWIInfos.size()));
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/AggregateArguments/AggregateArguments.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/AggregateArguments/AggregateArguments.cpp
@@ -42,6 +42,7 @@ using namespace IGC::IGCMD;
 #define PASS_ANALYSIS1 false
 IGC_INITIALIZE_PASS_BEGIN(AggregateArgumentsAnalysis, PASS_FLAG1, PASS_DESCRIPTION1, PASS_CFG_ONLY1, PASS_ANALYSIS1)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(AggregateArgumentsAnalysis, PASS_FLAG1, PASS_DESCRIPTION1, PASS_CFG_ONLY1, PASS_ANALYSIS1)
 
 // Register pass to igc-opt
@@ -51,6 +52,7 @@ IGC_INITIALIZE_PASS_END(AggregateArgumentsAnalysis, PASS_FLAG1, PASS_DESCRIPTION
 #define PASS_ANALYSIS2 false
 IGC_INITIALIZE_PASS_BEGIN(ResolveAggregateArguments, PASS_FLAG2, PASS_DESCRIPTION2, PASS_CFG_ONLY2, PASS_ANALYSIS2)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(ResolveAggregateArguments, PASS_FLAG2, PASS_DESCRIPTION2, PASS_CFG_ONLY2, PASS_ANALYSIS2)
 
 char AggregateArgumentsAnalysis::ID = 0;
@@ -218,7 +220,7 @@ bool ResolveAggregateArguments::runOnFunction(Function &F)
         return false;
     }
 
-    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils());
+    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(), getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
 
     m_pFunction = &F;
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/AggregateArguments/AggregateArguments.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/AggregateArguments/AggregateArguments.hpp
@@ -89,6 +89,7 @@ namespace IGC
         {
             AU.setPreservesCFG();
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         virtual bool runOnFunction(llvm::Function &F) override;
@@ -104,4 +105,4 @@ namespace IGC
         ImplicitArgs m_implicitArgs;
     };
 
-} // namespace IGC
+} // namespace IGC
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/DeviceEnqueue.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/DeviceEnqueue.cpp
@@ -40,6 +40,7 @@ using namespace IGC;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(DeviceEnqueueFuncsAnalysis, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(DeviceEnqueueFuncsAnalysis, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 
@@ -50,6 +51,7 @@ IGC_INITIALIZE_PASS_END(DeviceEnqueueFuncsAnalysis, PASS_FLAG, PASS_DESCRIPTION,
 #define PASS_ANALYSIS2 false
 IGC_INITIALIZE_PASS_BEGIN(DeviceEnqueueFuncsResolution, PASS_FLAG2, PASS_DESCRIPTION2, PASS_CFG_ONLY2, PASS_ANALYSIS2)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(DeviceEnqueueFuncsResolution, PASS_FLAG2, PASS_DESCRIPTION2, PASS_CFG_ONLY2, PASS_ANALYSIS2)
 
 
@@ -188,7 +190,7 @@ bool DeviceEnqueueFuncsResolution::runOnFunction(Function &F)
 {
     m_Changed = false;
     
-    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils());
+    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(), getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
     
     visit(F);
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/DeviceEnqueue.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/DeviceEnqueue.hpp
@@ -54,6 +54,7 @@ class DeviceEnqueueFuncsAnalysis : public llvm::ModulePass, public llvm::InstVis
     {
         AU.setPreservesCFG();
         AU.addRequired<MetaDataUtilsWrapper>();
+        AU.addRequired<CodeGenContextWrapper>();
     }
 
 
@@ -93,6 +94,7 @@ class DeviceEnqueueFuncsResolution : public llvm::FunctionPass, public llvm::Ins
     {
         AU.setPreservesCFG();
         AU.addRequired<MetaDataUtilsWrapper>();
+        AU.addRequired<CodeGenContextWrapper>();
     }
 
     virtual bool runOnFunction(llvm::Function &F) override;
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncResolution.cpp
@@ -43,6 +43,7 @@ using namespace IGC;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(ExtensionFuncsResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(ExtensionFuncsResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 char ExtensionFuncsResolution::ID = 0;
@@ -55,7 +56,7 @@ ExtensionFuncsResolution::ExtensionFuncsResolution() : FunctionPass(ID), m_impli
 bool ExtensionFuncsResolution::runOnFunction(Function &F)
 {
     m_changed = false;
-    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils());
+    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(), getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
     visit(F);
     return m_changed;
 }
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncResolution.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/ExtenstionFuncs/ExtensionFuncResolution.hpp
@@ -59,6 +59,7 @@ namespace IGC
         {
             AU.setPreservesCFG();
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         /// @brief  Main entry point.
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncResolution.cpp
@@ -45,6 +45,7 @@ using namespace IGC::IGCMD;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(ImageFuncResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(ImageFuncResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 char ImageFuncResolution::ID = 0;
@@ -56,7 +57,7 @@ ImageFuncResolution::ImageFuncResolution() : FunctionPass(ID), m_implicitArgs()
 
 bool ImageFuncResolution::runOnFunction(Function &F) {
     const MetaDataUtils* pMdUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
-    m_implicitArgs = ImplicitArgs(F, pMdUtils);
+    m_implicitArgs = ImplicitArgs(F, pMdUtils, getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
     m_changed = false;
     visit(F);
     return m_changed;
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncResolution.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncResolution.hpp
@@ -60,6 +60,7 @@ namespace IGC
         {
             AU.setPreservesCFG();
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         /// @brief  Main entry point.
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.cpp
@@ -1000,11 +1000,11 @@ bool KernelArgs::const_iterator::operator!=(const const_iterator& iterator)
     return (m_major != iterator.m_major) || (m_minor != iterator.m_minor); 
 }
 
-KernelArgs::KernelArgs(const Function& F, const DataLayout* DL, MetaDataUtils* pMdUtils, ModuleMetaData* moduleMD, KernelArgsOrder::InputType layout)
+KernelArgs::KernelArgs(const Function& F, const DataLayout* DL, MetaDataUtils* pMdUtils, ModuleMetaData* moduleMD, unsigned int GRFSize, KernelArgsOrder::InputType layout)
     : m_KernelArgsOrder( layout ), 
       m_args( m_KernelArgsOrder )
 {
-    ImplicitArgs implicitArgs(F, pMdUtils);
+    ImplicitArgs implicitArgs(F, pMdUtils, GRFSize);
     const unsigned int numImplicitArgs = implicitArgs.size();
     const unsigned int numRuntimeValue = moduleMD ? moduleMD->pushInfo.constantReg.size() : 0;
     const unsigned int numExplicitArgs = IGCLLVM::GetFuncArgSize(F) - numImplicitArgs - numRuntimeValue;
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/KernelArgs.hpp
@@ -452,7 +452,7 @@ namespace IGC
         /// @param  DL          The DataLayout
         /// @param  pMdUtils    The Metadata Utils instance for accessing metadata information
         /// @param  layout      One of the predefined payload layout types
-        KernelArgs(const llvm::Function& F, const llvm::DataLayout* DL, IGCMD::MetaDataUtils* pMdUtils, ModuleMetaData* moduleMD, KernelArgsOrder::InputType layout = KernelArgsOrder::InputType::INDEPENDENT);
+        KernelArgs(const llvm::Function& F, const llvm::DataLayout* DL, IGCMD::MetaDataUtils* pMdUtils, ModuleMetaData* moduleMD, unsigned int GRFSize, KernelArgsOrder::InputType layout = KernelArgsOrder::InputType::INDEPENDENT);
 
         /// @brief  Returns a constant iterator to the beginning of the kernel arguments
         /// @return A constant iterator to the beginning of the kernel arguments
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp
@@ -408,7 +408,7 @@ bool PrivateMemoryResolution::safeToUseScratchSpace(llvm::Module &M) const
      // TODO: fixed those types (they should be in global address space)
      if (Ctx.type == ShaderType::OPENCL_SHADER) {
        if (!F.arg_empty()) {
-         KernelArgs kernelArgs(F, DL, m_pMdUtils, &modMD);
+         KernelArgs kernelArgs(F, DL, m_pMdUtils, &modMD, Ctx.platform.getGRFSize());
          for (auto arg : kernelArgs) {
            const KernelArg::ArgType argTy = arg.getArgType();
            if (argTy == KernelArg::ArgType::PTR_DEVICE_QUEUE)
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantResolution.cpp
@@ -49,6 +49,7 @@ using namespace IGC::IGCMD;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(ProgramScopeConstantResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(ProgramScopeConstantResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 char ProgramScopeConstantResolution::ID = 0;
@@ -177,7 +178,7 @@ bool ProgramScopeConstantResolution::runOnModule(Module &M)
                 continue;
             }
 
-            ImplicitArgs implicitArgs(*userFunc, mdUtils);
+            ImplicitArgs implicitArgs(*userFunc, mdUtils, getAnalysis<CodeGenContextWrapper>().getCodeGenContext()->platform.getGRFSize());
 
             // Find the implicit argument representing this constant.
             unsigned int ImplicitArgsBaseIndex = IGCLLVM::GetFuncArgSize(userFunc) - implicitArgs.size();
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantResolution.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantResolution.hpp
@@ -55,6 +55,7 @@ namespace IGC
         virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
         {
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         /// @brief  Main entry point.
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/ResourceAllocator/ResourceAllocator.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/ResourceAllocator/ResourceAllocator.cpp
@@ -82,14 +82,15 @@ bool ResourceAllocator::runOnFunction(llvm::Function &F)
     // * Allocate a UAV/SRV/Sampler number to each argument, to be compatible with DX.
     // This is then written to the metadata.
 
+    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+    assert(ctx);
     KernelArgs kernelArgs(
         F, 
         &(F.getParent()->getDataLayout()), 
         getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(), 
-        getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData());
+        getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData(),
+        ctx->platform.getGRFSize());
     ExtensionArgAnalysis& EAA = getAnalysis<ExtensionArgAnalysis>(F);
-    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
-    assert(ctx);
 
     ModuleMetaData* modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
     if (modMD->FuncMD.find(&F) == modMD->FuncMD.end())
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStatefull/StatelessToStatefull.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStatefull/StatelessToStatefull.cpp
@@ -191,8 +191,9 @@ bool StatelessToStatefull::runOnFunction(llvm::Function &F)
     m_hasOptionalBufferOffsetArg =
         (m_hasBufferOffsetArg && IGC_IS_FLAG_ENABLED(EnableOptionalBufferOffset));
 
-    m_pImplicitArgs = new ImplicitArgs(F, pMdUtils);
-    m_pKernelArgs = new KernelArgs(F, &(F.getParent()->getDataLayout()), pMdUtils, modMD);
+    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+    m_pImplicitArgs = new ImplicitArgs(F, pMdUtils, ctx->platform.getGRFSize());
+    m_pKernelArgs = new KernelArgs(F, &(F.getParent()->getDataLayout()), pMdUtils, modMD, ctx->platform.getGRFSize());
 
     visit(F);
 
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStatefull/StatelessToStatefull.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStatefull/StatelessToStatefull.hpp
@@ -54,6 +54,7 @@ namespace IGC
             AU.setPreservesCFG();
             AU.addRequired<MetaDataUtilsWrapper>();
             AU.addRequired<llvm::AssumptionCacheTracker>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         virtual llvm::StringRef getPassName() const override
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.cpp b/IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.cpp
@@ -43,6 +43,7 @@ using namespace IGC;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(WIFuncResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(WIFuncResolution, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 char WIFuncResolution::ID = 0;
@@ -78,8 +79,8 @@ bool WIFuncResolution::runOnFunction(Function &F)
 {
     m_changed = false;
     auto *MDUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
-    m_implicitArgs = ImplicitArgs(F, MDUtils);
-
+    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+    m_implicitArgs = ImplicitArgs(F, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(), ctx->platform.getGRFSize());
     visit(F);
 
     /// If the work group size is known at compile time, emit it as a
diff --git a/IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.hpp b/IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncResolution.hpp
@@ -61,6 +61,7 @@ namespace IGC
         void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
         {
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         /// @brief  Main entry point.

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ bool ImplicitArg::isConstantBuf() const {`
`228`	`228`	`return m_isConstantBuf;`
`229`	`229`	`}`
`230`	`230`
`231`		`-ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMdUtils)`
	`231`	`+ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMdUtils, unsigned int GRFSize)`
`232`	`232`	`{`
`233`	`233`	`if (IMPLICIT_ARGS.size() == 0)`
`234`	`234`	`{`
`@@ -242,9 +242,9 @@ ImplicitArgs::ImplicitArgs(const llvm::Function& func , const MetaDataUtils* pMd`
`242`	`242`	`IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_SIZE, "localSize", ImplicitArg::INT, WIAnalysis::UNIFORM, 3, ImplicitArg::ALIGN_DWORD, true));`
`243`	`243`	`IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::ENQUEUED_LOCAL_WORK_SIZE, "enqueuedLocalSize", ImplicitArg::INT, WIAnalysis::UNIFORM, 3, ImplicitArg::ALIGN_DWORD, true));`
`244`	`244`
`245`		`- IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_X, "localIdX", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));`
`246`		`- IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Y, "localIdY", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));`
`247`		`- IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Z, "localIdZ", ImplicitArg::SHORT, WIAnalysis::RANDOM, 16, ImplicitArg::ALIGN_GRF, false));`
	`245`	`+ IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_X, "localIdX", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));`
	`246`	`+ IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Y, "localIdY", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));`
	`247`	`+ IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::LOCAL_ID_Z, "localIdZ", ImplicitArg::SHORT, WIAnalysis::RANDOM, GRFSize/2, ImplicitArg::ALIGN_GRF, false));`
`248`	`248`
`249`	`249`	`IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::CONSTANT_BASE, "constBase", ImplicitArg::CONSTPTR, WIAnalysis::UNIFORM, 1, ImplicitArg::ALIGN_PTR, true));`
`250`	`250`	`IMPLICIT_ARGS.push_back(ImplicitArg(ImplicitArg::GLOBAL_BASE, "globalBase", ImplicitArg::GLOBALPTR, WIAnalysis::UNIFORM, 1, ImplicitArg::ALIGN_PTR, true));`
Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,7 @@ void COpenCLKernel::AllocatePayload()`
`1440`	`1440`	`KernelArgsOrder::InputType::INDIRECT :`
`1441`	`1441`	`KernelArgsOrder::InputType::CURBE;`
`1442`	`1442`
`1443`		`- KernelArgs kernelArgs(*entry, m_DL, m_pMdUtils, m_ModuleMetadata, layout);`
	`1443`	`+ KernelArgs kernelArgs(*entry, m_DL, m_pMdUtils, m_ModuleMetadata, getGRFSize(), layout);`
`1444`	`1444`
`1445`	`1445`	`if (layout == KernelArgsOrder::InputType::INDIRECT && !loadThreadPayload)`
`1446`	`1446`	`{`
`@@ -2012,7 +2012,7 @@ bool COpenCLKernel::hasReadWriteImage(llvm::Function &F)`
`2012`	`2012`	`return false;`
`2013`	`2013`	`}`
`2014`	`2014`
`2015`		`- KernelArgs kernelArgs(F, m_DL, m_pMdUtils, m_ModuleMetadata, KernelArgsOrder::InputType::INDEPENDENT);`
	`2015`	`+ KernelArgs kernelArgs(F, m_DL, m_pMdUtils, m_ModuleMetadata, getGRFSize(), KernelArgsOrder::InputType::INDEPENDENT);`
`2016`	`2016`	`for (auto KA : kernelArgs)`
`2017`	`2017`	`{`
`2018`	`2018`	`// RenderScript annotation sets "read_write" qualifier`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ namespace IGC`
`89`	`89`	`{`
`90`	`90`	`AU.setPreservesCFG();`
`91`	`91`	`AU.addRequired<MetaDataUtilsWrapper>();`
	`92`	`+ AU.addRequired<CodeGenContextWrapper>();`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`virtual bool runOnFunction(llvm::Function &F) override;`
`@@ -104,4 +105,4 @@ namespace IGC`
`104`	`105`	`ImplicitArgs m_implicitArgs;`
`105`	`106`	`};`
`106`	`107`
`107`		`-} // namespace IGC`
	`108`	`+} // namespace IGC`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class DeviceEnqueueFuncsAnalysis : public llvm::ModulePass, public llvm::InstVis`
`54`	`54`	`{`
`55`	`55`	`AU.setPreservesCFG();`
`56`	`56`	`AU.addRequired<MetaDataUtilsWrapper>();`
	`57`	`+ AU.addRequired<CodeGenContextWrapper>();`
`57`	`58`	`}`
`58`	`59`
`59`	`60`
`@@ -93,6 +94,7 @@ class DeviceEnqueueFuncsResolution : public llvm::FunctionPass, public llvm::Ins`
`93`	`94`	`{`
`94`	`95`	`AU.setPreservesCFG();`
`95`	`96`	`AU.addRequired<MetaDataUtilsWrapper>();`
	`97`	`+ AU.addRequired<CodeGenContextWrapper>();`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`virtual bool runOnFunction(llvm::Function &F) override;`