move error

Signed-off-by: Sidorov, Dmitry <[email protected]>

Author: MrSidims

llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp

@@ -1048,19 +1048,6 @@ static bool buildBindlessImageINTELInst(const SPIRV::IncomingCall *Call,
                                         unsigned Opcode,
                                         MachineIRBuilder &MIRBuilder,
                                         SPIRVGlobalRegistry *GR) {
-  const SPIRV::DemangledBuiltin *Builtin = Call->Builtin;
-  const auto *ST =
-      static_cast<const SPIRVSubtarget *>(&MIRBuilder.getMF().getSubtarget());
-  if ((Opcode == SPIRV::OpConvertHandleToImageINTEL ||
-       Opcode == SPIRV::OpConvertHandleToSamplerINTEL ||
-       Opcode == SPIRV::OpConvertHandleToSampledImageINTEL) &&
-      !ST->canUseExtension(SPIRV::Extension::SPV_INTEL_bindless_images)) {
-    std::string DiagMsg = std::string(Builtin->Name) +
-                          ": the builtin requires the following SPIR-V "
-                          "extension: SPV_INTEL_bindless_images";
-    report_fatal_error(DiagMsg.c_str(), false);
-  }
-
   // Generate SPIRV instruction accordingly.
   if (Call->isSpirvOp())
     return buildOpFromWrapper(MIRBuilder, Opcode, Call,

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -1681,8 +1681,9 @@ void addInstrRequirements(const MachineInstr &MI,
   case SPIRV::OpConvertHandleToSamplerINTEL:
   case SPIRV::OpConvertHandleToSampledImageINTEL:
     if (!ST.canUseExtension(SPIRV::Extension::SPV_INTEL_bindless_images))
-      report_fatal_error("Intel bindless images handles require the following "
-                         "SPIR-V extension: SPV_INTEL_bindless_images",
+      report_fatal_error("OpConvertHandleTo[Image/Sampler/SampledImage]INTEL "
+                         "instructions require the following SPIR-V extension: "
+                         "SPV_INTEL_bindless_images",
                          false);
     Reqs.addExtension(SPIRV::Extension::SPV_INTEL_bindless_images);
     Reqs.addCapability(SPIRV::Capability::BindlessImagesINTEL);

llvm/test/CodeGen/SPIRV/extensions/SPV_INTEL_bindless_images/bindless_images_generic.ll

@@ -1,7 +1,8 @@
 ; RUN: not llc -O0 -mtriple=spirv64-unknown-unknown %s -o %t.spvt 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 ; RUN: llc -O0 -mtriple=spirv64-unknown-unknown --spirv-ext=+SPV_INTEL_bindless_images %s -o - | FileCheck %s
 
-; CHECK-ERROR: LLVM ERROR: __spirv_ConvertHandleToImageINTEL: the builtin requires the following SPIR-V extension: SPV_INTEL_bindless_images
+; CHECK-ERROR: LLVM ERROR: OpConvertHandleTo[Image/Sampler/SampledImage]INTEL instruction
+; CHECK-ERROR-SAME: require the following SPIR-V extension: SPV_INTEL_bindless_images
 
 ; CHECK: OpCapability BindlessImagesINTEL
 ; CHECK: OpExtension "SPV_INTEL_bindless_images"