Fail compilation with error message instead of crash if we can't find sampler argument or inline/global sampler.

Change-Id: Ibcef322ba60863ca0cde02720117e3395b1dc64b

Author: PawelJurek

IGC/Compiler/CodeGenContext.cpp

@@ -693,6 +693,11 @@ namespace IGC
         return;
     }
 
+    bool CodeGenContext::HasError() const
+    {
+        return !this->oclErrorMessage.empty();
+    }
+
     CompOptions& CodeGenContext::getCompilerOption()
     {
         return getModuleMetaData()->compOpt;

IGC/Compiler/CodeGenPublic.h

@@ -925,6 +925,7 @@ namespace IGC
         virtual ~CodeGenContext();
         void clear();
         void EmitError(const char* errorstr);
+        bool HasError() const;
         CompOptions& getCompilerOption();
         virtual void resetOnRetry();
         virtual uint32_t getNumThreadsPerEU() const;

IGC/Compiler/Optimizer/OCLBIUtils.cpp

@@ -39,17 +39,18 @@ using namespace llvm;
 using namespace IGC;
 using namespace IGC::IGCMD;
 
-void CCommand::execute(CallInst* Inst)
+void CCommand::execute(CallInst* Inst, CodeGenContext* CodeGenContext)
 {
-    init(Inst);
+    init(Inst, CodeGenContext);
     createIntrinsic();
 }
 
-void CCommand::init(CallInst* Inst)
+void CCommand::init(CallInst* Inst, CodeGenContext* CodeGenContext)
 {
     m_pCallInst = Inst;
     m_pFunc = m_pCallInst->getParent()->getParent();
     m_pCtx = &(m_pFunc->getContext());
+    m_pCodeGenContext = CodeGenContext;
     m_pFloatType = Type::getFloatTy(*m_pCtx);
     m_pIntType = Type::getInt32Ty(*m_pCtx);
     m_pFloatZero = Constant::getNullValue(m_pFloatType);
@@ -191,11 +192,11 @@ void CImagesBI::prepareImageBTI()
     }
 }
 
-void CImagesBI::verifiyCommand(CodeGenContext* context)
+void CImagesBI::verifyCommand()
 {
     if (m_IncorrectBti)
     {
-        context->EmitError("Inconsistent use of image!");
+        m_pCodeGenContext->EmitError("Inconsistent use of image!");
     }
 }
 
@@ -767,6 +768,11 @@ class COCL_sample : public CImagesBI
     {
         ConstantInt* samplerIndex = nullptr;
         Value* samplerParam = CImagesBI::CImagesUtils::traceImageOrSamplerArgument(m_pCallInst, 1, m_pMdUtils, m_modMD);
+        if (!samplerParam) {
+            m_pCodeGenContext->EmitError("There are instructions that use a sampler, but no sampler found in the kernel!");
+            return nullptr;
+        }
+
         // Argument samplers are looked up in the parameter map
         if (isa<Argument>(samplerParam))
         {
@@ -961,12 +967,14 @@ class COCL_sample : public CImagesBI
         }
     }
 
-    void prepareSamplerIndex()
+    bool prepareSamplerIndex()
     {
         ConstantInt* samplerIndex = getSamplerIndex();
+        if (!samplerIndex) return false;
         unsigned int addrSpace = EncodeAS4GFXResource(*samplerIndex, SAMPLER, 0);
         Value* sampler = ConstantPointerNull::get(PointerType::get(samplerIndex->getType(), addrSpace));
         m_args.push_back(sampler);
+        return true;
     }
 
     void prepareGradients(Dimension Dim, Value* gradX, Value* gradY)
@@ -1057,7 +1065,9 @@ class COCL_sample_l : public COCL_sample
         m_args.push_back(CoordZ);
         m_args.push_back(m_pFloatZero); // ai (?)
         createGetBufferPtr();
-        prepareSamplerIndex();
+        bool samplerIndexFound = prepareSamplerIndex();
+        if (!samplerIndexFound) return;
+
         prepareZeroOffsets();
         Type* types[] = { m_pCallInst->getType(), m_pFloatType, m_args[5]->getType(), m_args[6]->getType() };
         replaceGenISACallInst(GenISAIntrinsic::GenISA_sampleLptr, types);
@@ -1936,8 +1946,8 @@ bool CBuiltinsResolver::resolveBI(CallInst* Inst)
     {
         return false;
     }
-    m_CommandMap[calleeName]->execute(Inst);
-    m_CommandMap[calleeName]->verifiyCommand(m_CodeGenContext);
+    m_CommandMap[calleeName]->execute(Inst, m_CodeGenContext);
+    m_CommandMap[calleeName]->verifyCommand();
 
-    return true;
+    return !m_CodeGenContext->HasError();
 }

IGC/Compiler/Optimizer/OCLBIUtils.h

@@ -72,21 +72,22 @@ namespace IGC
         void replaceGenISACallInst(llvm::GenISAIntrinsic::ID intrinsicName, llvm::ArrayRef<llvm::Type*> Tys = llvm::None);
 
         /// @brief  reap init() and createIntrinsic().
-        /// @param  Inst        the call instruction that need to be replaced.
-        void execute(llvm::CallInst* Inst);
+        /// @param  Inst            the call instruction that need to be replaced.
+        /// @param  CodeGenContext  context to return errors
+        void execute(llvm::CallInst* Inst, IGC::CodeGenContext* CodeGenContext);
 
         /// @brief  replace the old __builtin_IB function call with the match llvm/GenISA_ISA
         ///         instructions.
         /// @param  Inst        the call instruction that need to be replaced.
         virtual void createIntrinsic() = 0;
 
         /// @brief  verify that there are no user errors
-        /// @param  context to return errors
-        virtual void verifiyCommand(IGC::CodeGenContext*) {}
+        virtual void verifyCommand() {}
 
         /// @brief  initialize the callInst,  function, context, constants and clear the arg list.
-        /// @param  Inst       the call instruction that need to be replaced.
-        void init(llvm::CallInst* Inst);
+        /// @param  Inst            the call instruction that need to be replaced.
+        /// @param  CodeGenContext  context to return errors
+        void init(llvm::CallInst* Inst, IGC::CodeGenContext* CodeGenContext);
         void clearArgsList(void);
 
         enum CoordType
@@ -102,6 +103,7 @@ namespace IGC
             m_pCallInst(nullptr),
             m_pFunc(nullptr),
             m_pCtx(nullptr),
+            m_pCodeGenContext(nullptr),
             m_pFloatType(nullptr),
             m_pIntType(nullptr)
         {}
@@ -114,6 +116,7 @@ namespace IGC
         llvm::CallInst* m_pCallInst;
         llvm::Function* m_pFunc;
         llvm::LLVMContext* m_pCtx;
+        IGC::CodeGenContext* m_pCodeGenContext;
         llvm::SmallVector<llvm::Value*, 10> m_args;
         llvm::DebugLoc m_DL;
         llvm::Type* m_pFloatType;
@@ -231,7 +234,7 @@ namespace IGC
         /// @brief  returns "true" if the "val" is integer or float with fractional part = 0.
         static bool derivedFromInt(const llvm::Value* pVal);
 
-        void verifiyCommand(IGC::CodeGenContext*);
+        void verifyCommand();
 
     protected:
         /// @brief  push the image index into the function argument list