Add check for GLSL extended instruction set use

Certain SPIR-V instructions are only available in the GLSL extended
instruction set, such as "Reflect".

This commit adds a check to ensure the current SPIR-V target can use
the GLSL extended instruction set before selecting an instruction that
is only available from the GLSL extended instruction set.

Author: Icohedron

llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp

@@ -903,6 +903,14 @@ bool SPIRVInstructionSelector::selectExtInst(Register ResVReg,
                                              const SPIRVType *ResType,
                                              MachineInstr &I,
                                              GL::GLSLExtInst GLInst) const {
+  if (!STI.canUseExtInstSet(
+          SPIRV::InstructionSet::InstructionSet::GLSL_std_450)) {
+    std::string DiagMsg;
+    raw_string_ostream OS(DiagMsg);
+    I.print(OS, true, false, false, false);
+    DiagMsg += " is only supported with the GLSL extended instruction set.\n";
+    report_fatal_error(DiagMsg.c_str(), false);
+  }
   return selectExtInst(ResVReg, ResType, I,
                        {{SPIRV::InstructionSet::GLSL_std_450, GLInst}});
 }
@@ -3032,15 +3040,6 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg,
   case Intrinsic::spv_normalize:
     return selectExtInst(ResVReg, ResType, I, CL::normalize, GL::Normalize);
   case Intrinsic::spv_reflect:
-    if (!STI.canUseExtInstSet(
-            SPIRV::InstructionSet::InstructionSet::GLSL_std_450)) {
-      std::string DiagMsg;
-      raw_string_ostream OS(DiagMsg);
-      I.print(OS);
-      DiagMsg = "Intrinsic selection not supported for this instruction set: " +
-                DiagMsg;
-      report_fatal_error(DiagMsg.c_str(), false);
-    }
     return selectExtInst(ResVReg, ResType, I, GL::Reflect);
   case Intrinsic::spv_rsqrt:
     return selectExtInst(ResVReg, ResType, I, CL::rsqrt, GL::InverseSqrt);

llvm/test/CodeGen/SPIRV/opencl/reflect-error.ll

@@ -3,20 +3,13 @@
 ; RUN: not %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o /dev/null 2>&1 -filetype=obj %}
 ; RUN: not %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o /dev/null 2>&1 -filetype=obj %}
 
-; CHECK: LLVM ERROR: Intrinsic selection not supported for this instruction set: %{{.*}} = G_INTRINSIC intrinsic(@llvm.spv.reflect), %{{.*}}, %{{.*}}
-
-define noundef <4 x half> @reflect_half4(<4 x half> noundef %a, <4 x half> noundef %b) {
-entry:
-  %spv.reflect = call <4 x half> @llvm.spv.reflect.f16(<4 x half> %a, <4 x half> %b)
-  ret <4 x half> %spv.reflect
-}
+; CHECK: LLVM ERROR: %{{.*}} = G_INTRINSIC intrinsic(@llvm.spv.reflect), %{{.*}}, %{{.*}} is only supported with the GLSL extended instruction set.
 
 define noundef <4 x float> @reflect_float4(<4 x float> noundef %a, <4 x float> noundef %b) {
 entry:
   %spv.reflect = call <4 x float> @llvm.spv.reflect.f32(<4 x float> %a, <4 x float> %b)
   ret <4 x float> %spv.reflect
 }
 
-declare <4 x half> @llvm.spv.reflect.f16(<4 x half>, <4 x half>)
 declare <4 x float> @llvm.spv.reflect.f32(<4 x float>, <4 x float>)