Optionally allow for compilation without payload header.

Author: scottp101

IGC/Compiler/CISACodeGen/DriverInfo.hpp

@@ -294,6 +294,9 @@ namespace IGC
         // Limits simple push constants based on pushed inputs
         virtual bool EnableSimplePushRestriction() const { return false; }
 
+        // Determines whether the PAYLOAD_HEADER implicit arg must be present
+        virtual bool RequirePayloadHeader() const { return true; }
+
 
     };
 

IGC/Compiler/CISACodeGen/FoldKnownWorkGroupSizes.cpp

@@ -41,6 +41,8 @@ namespace IGC
     {
     private:
         static char ID;
+        CodeGenContext* ctx = nullptr;
+        bool RequirePayloadHeader = true;
     public:
         FoldKnownWorkGroupSizes() : FunctionPass(ID) {}
         bool runOnFunction(llvm::Function& F);
@@ -64,6 +66,8 @@ using namespace IGCMD;
 
 bool FoldKnownWorkGroupSizes::runOnFunction(Function& F)
 {
+    ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+    RequirePayloadHeader = ctx->m_DriverInfo.RequirePayloadHeader();
     visit(F);
     return m_changed;
 }
@@ -78,8 +82,6 @@ void FoldKnownWorkGroupSizes::visitCallInst(llvm::CallInst& I)
         return;
     }
     StringRef funcName = calledFunction->getName();
-    CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
-
 
     if (funcName.equals(WIFuncsAnalysis::GET_GLOBAL_OFFSET) &&
         ctx->getModuleMetaData()->compOpt.replaceGlobalOffsetsByZero)
@@ -88,8 +90,8 @@ void FoldKnownWorkGroupSizes::visitCallInst(llvm::CallInst& I)
         {
             ConstantInt* IntZero = ConstantInt::get(Type::getInt32Ty(module->getContext()), 0);
             I.replaceAllUsesWith(IntZero);
-            // TODO: erase when patch token is not required
-            //I.eraseFromParent();
+            if (!RequirePayloadHeader)
+                I.eraseFromParent();
             m_changed = true;
         }
     }

IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncsAnalysis.cpp

@@ -42,6 +42,7 @@ using namespace IGC;
 #define PASS_ANALYSIS false
 IGC_INITIALIZE_PASS_BEGIN(WIFuncsAnalysis, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 IGC_INITIALIZE_PASS_DEPENDENCY(MetaDataUtilsWrapper)
+IGC_INITIALIZE_PASS_DEPENDENCY(CodeGenContextWrapper)
 IGC_INITIALIZE_PASS_END(WIFuncsAnalysis, PASS_FLAG, PASS_DESCRIPTION, PASS_CFG_ONLY, PASS_ANALYSIS)
 
 char WIFuncsAnalysis::ID = 0;
@@ -68,6 +69,7 @@ WIFuncsAnalysis::WIFuncsAnalysis() : ModulePass(ID)
 bool WIFuncsAnalysis::runOnModule(Module& M)
 {
     m_pMDUtils = getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils();
+    m_ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
     // Run on all functions defined in this module
     for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
     {
@@ -104,11 +106,14 @@ bool WIFuncsAnalysis::runOnFunction(Function& F)
     //Analyze the implicit arguments needed by this function
     SmallVector<ImplicitArg::ArgType, ImplicitArg::NUM_IMPLICIT_ARGS> implicitArgs;
 
+    const bool RequirePayloadHeader = m_ctx->m_DriverInfo.RequirePayloadHeader();
+
     // All OpenCL kernels receive R0 and Payload Header implicitly
     if (isEntryFunc(m_pMDUtils, &F))
     {
         implicitArgs.push_back(ImplicitArg::R0);
-        implicitArgs.push_back(ImplicitArg::PAYLOAD_HEADER);
+        if (RequirePayloadHeader)
+            implicitArgs.push_back(ImplicitArg::PAYLOAD_HEADER);
     }
     else
     {
@@ -125,11 +130,15 @@ bool WIFuncsAnalysis::runOnFunction(Function& F)
         {
             implicitArgs.push_back(ImplicitArg::R0);
         }
-        if (m_hasGlobalOffset)
+        if (m_hasGlobalOffset && RequirePayloadHeader)
         {
             implicitArgs.push_back(ImplicitArg::PAYLOAD_HEADER);
         }
     }
+    if (m_hasGlobalOffset && !RequirePayloadHeader)
+    {
+        implicitArgs.push_back(ImplicitArg::PAYLOAD_HEADER);
+    }
     if (m_hasWorkDim)
     {
         implicitArgs.push_back(ImplicitArg::WORK_DIM);

IGC/Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncsAnalysis.hpp

@@ -25,6 +25,7 @@ IN THE SOFTWARE.
 #pragma once
 
 #include "Compiler/MetaDataUtilsWrapper.h"
+#include "Compiler/CodeGenContextWrapper.hpp"
 
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/Pass.h>
@@ -59,6 +60,7 @@ namespace IGC
         void getAnalysisUsage(llvm::AnalysisUsage& AU) const override
         {
             AU.addRequired<MetaDataUtilsWrapper>();
+            AU.addRequired<CodeGenContextWrapper>();
         }
 
         /// @brief  Main entry point.
@@ -121,6 +123,8 @@ namespace IGC
         bool m_hasStackCalls = false;
         /// @brief MetaData utils used to generate LLVM metadata
         IGCMD::MetaDataUtils* m_pMDUtils = nullptr;
+        /// @brief context for compilation
+        IGC::CodeGenContext* m_ctx = nullptr;
     };
 
 } // namespace IGC