Use CCommand error field instead of CodeGenContext

Using CodeGenContext error to define if resolving of
built-in is successful doesn't work if CodeGenContext is
already in error state. Instead we should use CCommand own
error field, to indicate if built-in replacement had errors.

Author: YuriPlyakhin

IGC/Compiler/Optimizer/OCLBIUtils.cpp

@@ -77,6 +77,12 @@ void CCommand::replaceGenISACallInst(GenISAIntrinsic::ID intrinsicName, ArrayRef
     m_pCallInst->replaceAllUsesWith(newCall);
 }
 
+void CCommand::emitError(const char *ErrorStr, const Value *Context)
+{
+    m_pCodeGenContext->EmitError(ErrorStr, Context);
+    m_bHasError = true;
+}
+
 void CImagesBI::prepareZeroOffsets()
 {
     m_args.push_back(m_pIntZero); // offsetU
@@ -123,7 +129,7 @@ void CImagesBI::prepareCoords(Dimension Dim, Value* Coord, Value* Zero)
         //  no need to extract since in 1 Dim Coord isn't a vector
         break;
     case DIM_UNKNOWN:
-        m_pCodeGenContext->EmitError("Unexpected dimension", NULL);
+        emitError("Unexpected dimension", NULL);
         break;
     }
 }
@@ -191,7 +197,7 @@ void CImagesBI::verifyCommand()
 {
     if (m_IncorrectBti)
     {
-        m_pCodeGenContext->EmitError("Inconsistent use of image!", NULL);
+        emitError("Inconsistent use of image!", NULL);
     }
 }
 
@@ -392,7 +398,7 @@ class COCL_sample : public CImagesBI
         ConstantInt* samplerIndex = nullptr;
         Value* samplerParam = ValueTracker::track(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!", m_pCallInst);
+            emitError("There are instructions that use a sampler, but no sampler found in the kernel!", m_pCallInst);
             return nullptr;
         }
 
@@ -660,7 +666,7 @@ class COCL_sample : public CImagesBI
             //  no need to extract since in 1 Dim gradient is not a vector.
             break;
         case DIM_UNKNOWN:
-            m_pCodeGenContext->EmitError("Unexpected dimension", NULL);
+            emitError("Unexpected dimension", NULL);
             break;
         }
     }
@@ -922,7 +928,7 @@ class CGetImageProperty : public CImagesBI
             prop = builder.CreateExtractElement(info, builder.getInt32(1));
             break;
         default:
-            m_pCodeGenContext->EmitError("Unsupported bindless image property requested.", NULL);
+            emitError("Unsupported bindless image property requested.", NULL);
         }
         m_pCallInst->replaceAllUsesWith(prop);
     }
@@ -1645,5 +1651,5 @@ bool CBuiltinsResolver::resolveBI(CallInst* Inst)
     m_CommandMap[calleeName]->execute(Inst, m_CodeGenContext);
     m_CommandMap[calleeName]->verifyCommand();
 
-    return !m_CodeGenContext->HasError();
+    return !m_CommandMap[calleeName]->hasError();
 }

IGC/Compiler/Optimizer/OCLBIUtils.h

@@ -74,6 +74,9 @@ namespace IGC
         void init(llvm::CallInst* Inst, IGC::CodeGenContext* CodeGenContext);
         void clearArgsList(void);
 
+        /// @brief returns true if command executed with errors
+        bool hasError() const {return m_bHasError;}
+
         enum CoordType
         {
             FloatType,
@@ -89,11 +92,17 @@ namespace IGC
             m_pCtx(nullptr),
             m_pCodeGenContext(nullptr),
             m_pFloatType(nullptr),
-            m_pIntType(nullptr)
+            m_pIntType(nullptr),
+            m_bHasError(false)
         {}
         virtual ~CCommand(void) {};
 
     protected:
+        /// @brief emits error using CodeGenContext, sets error state of CCommand to true
+        /// @param ErrorStr error string to emit
+        /// @param Context Value to get debug location to print out the relevant info.
+        void emitError(const char* ErrorStr, const llvm::Value *Context);
+
         llvm::Value* m_pFloatZero;
         llvm::Value* m_pIntZero;
         llvm::Value* m_pIntOne;
@@ -105,6 +114,7 @@ namespace IGC
         llvm::DebugLoc m_DL;
         llvm::Type* m_pFloatType;
         llvm::IntegerType* m_pIntType;
+        bool m_bHasError;
     };
 
     static inline BufferType ResourceTypeMap(ResourceTypeEnum type)

IGC/Compiler/tests/OCLBIConverter/resolve_error.ll

@@ -0,0 +1,60 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2023 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+
+; Test checks that even if there was previous error recorded in CodeGenContext,
+; built-ins like __builtin_IB_get_image_width are still erased after resolving
+; for bindless images
+
+; RUN: igc_opt -platformdg1 -igc-error-check -igc-conv-ocl-to-common -S %s 2>&1 | FileCheck %s
+
+; CHECK: define spir_kernel void @kernel(%spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %img) {
+; CHECK-NOT: __builtin_IB_get_image_width
+; CHECK-NOT: __builtin_IB_get_image_height
+; CHECK: ret void
+; CHECK: error: Double type is not supported on this platform.
+
+%spirv.Image._void_1_0_0_0_0_0_0 = type opaque
+
+define void @test_error(double %src) {
+  %1 = fadd double %src, %src
+  ret void
+}
+
+define spir_kernel void @kernel(%spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %img) {
+  %data = ptrtoint %spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %img to i64
+  %1 = trunc i64 %data to i32
+  %call.i.i.i = call spir_func i32 @__builtin_IB_get_image_width(i32 %1)
+  %call1.i.i.i = call spir_func i32 @__builtin_IB_get_image_height(i32 %1)
+  ret void
+}
+
+declare spir_func i32 @__builtin_IB_get_image_width(i32)
+declare spir_func i32 @__builtin_IB_get_image_height(i32)
+
+!igc.functions = !{!0}
+!IGCMetadata = !{!3}
+
+!0 = !{void (%spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)*)* @kernel, !1}
+!1 = !{!2}
+!2 = !{!"function_type", i32 0}
+!3 = !{!"ModuleMD", !4, !15, !18}
+!4 = !{!"FuncMD", !5, !6}
+!5 = distinct !{!"FuncMDMap[0]", void (%spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)*)* @kernel}
+!6 = !{!"FuncMDValue[0]", !7, !8, !9}
+!7 = !{!"funcArgs"}
+!8 = !{!"functionType", !"KernelFunction"}
+!9 = !{!"resAllocMD", !10}
+!10 = !{!"argAllocMDList", !11}
+!11 = !{!"argAllocMDListVec[0]", !12, !13, !14}
+!12 = !{!"type", i32 4}
+!13 = !{!"extensionType", i32 0}
+!14 = !{!"indexType", i32 0}
+!15 = !{!"compOpt", !16, !17}
+!16 = !{!"UseBindlessMode", i1 true}
+!17 = !{!"UseLegacyBindlessMode", i1 false}
+!18 = !{!"UseBindlessImage", i1 true}