Fix build errors

Author: anupamachandra

tools/clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -8034,6 +8034,8 @@ def err_hlsl_linalg_matrix_dim_must_not_be_zero: Error<
   "matrix dimension must not be zero">;
 def err_hlsl_linalg_matrix_layout_invalid : Error<
   "matrix layout %0 is not valid, must be in the range %1 - %2">;
+def err_hlsl_linalg_function_requires_shader_model_6_9_or_above : Error<
+  "intrinsic function %0 requires shader model 6.9 or greater">;
 
 def err_hlsl_linalg_mul_muladd_output_vector_size_not_equal_to_matrix_M : Error<
   "output vector length must be equal to Matrix M dimension in a linalg Mul/MulAdd operation">;

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -12267,14 +12267,44 @@ void Sema::CheckHLSLFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
     CheckBarrierCall(*this, FDecl, TheCall, SM);
     break;
   case hlsl::IntrinsicOp::IOP___builtin_MatVecMul:
+    if (!SM->IsSM69Plus()) {
+      Diags.Report(
+          TheCall->getExprLoc(),
+          diag::err_hlsl_linalg_function_requires_shader_model_6_9_or_above)
+          << FDecl->getNameAsString();
+      return;
+    }
     CheckMulCall(*this, FDecl, TheCall, SM);
     break;
   case hlsl::IntrinsicOp::IOP___builtin_MatVecMulAdd:
+    if (!SM->IsSM69Plus()) {
+      Diags.Report(
+          TheCall->getExprLoc(),
+          diag::err_hlsl_linalg_function_requires_shader_model_6_9_or_above)
+          << FDecl->getNameAsString();
+      return;
+    }
     CheckMulAddCall(*this, FDecl, TheCall, SM);
     break;
   case hlsl::IntrinsicOp::IOP___builtin_OuterProductAccumulate:
+    if (!SM->IsSM69Plus()) {
+      Diags.Report(
+          TheCall->getExprLoc(),
+          diag::err_hlsl_linalg_function_requires_shader_model_6_9_or_above)
+          << FDecl->getNameAsString();
+      return;
+    }
     CheckOuterProductAccumulateCall(*this, FDecl, TheCall);
     break;
+  case hlsl::IntrinsicOp::IOP___builtin_VectorAccumulate:
+    if (!SM->IsSM69Plus()) {
+      Diags.Report(
+          TheCall->getExprLoc(),
+          diag::err_hlsl_linalg_function_requires_shader_model_6_9_or_above)
+          << FDecl->getNameAsString();
+      return;
+    }
+    break;
 #ifdef ENABLE_SPIRV_CODEGEN
   case hlsl::IntrinsicOp::IOP_Vkreinterpret_pointer_cast:
     CheckVKBufferPointerCast(*this, FDecl, TheCall, false);

tools/clang/test/SemaHLSL/hlsl/linalg/unavailable-pre-sm69.hlsl

@@ -23,7 +23,7 @@ void cs_main()
     const bool matrix_is_transposed = false; 
     const uint matrix_stride = 64;
 
-    //expected-error@+1{{intrinsic __builtin_MatVecMul potentially used by 'cs_main' requires shader model 6.9 or greater}}
+    //expected-error@+1{{intrinsic function __builtin_MatVecMul requires shader model 6.9 or greater}}
     __builtin_MatVecMul(output_vector, is_output_unsigned, input_vector, 
       is_input_unsigned, input_interpretation, matrix_buffer, matrix_offset,
       matrix_interpretation, matrix_dimM, matrix_dimK, matrix_layout,
@@ -32,7 +32,7 @@ void cs_main()
     const uint bias_offset = 0;
     const uint bias_interpretation = 9; /*F32*/
 
-    //expected-error@+1{{intrinsic __builtin_MatVecMulAdd potentially used by 'cs_main' requires shader model 6.9 or greater}}
+    //expected-error@+1{{intrinsic function __builtin_MatVecMulAdd requires shader model 6.9 or greater}}
     __builtin_MatVecMulAdd(output_vector, is_output_unsigned, input_vector,
       is_input_unsigned, input_interpretation, matrix_buffer, matrix_offset,
       matrix_interpretation, matrix_dimM, matrix_dimK, matrix_layout,
@@ -46,14 +46,14 @@ void cs_main()
     const uint opa_matrix_layout = 3; /*OuterProductOptimal*/
     const uint opa_matrix_stride = 64;
 
-    //expected-error@+1{{intrinsic __builtin_OuterProductAccumulate potentially used by 'cs_main' requires shader model 6.9 or greater}}
+    //expected-error@+1{{intrinsic function __builtin_OuterProductAccumulate requires shader model 6.9 or greater}}
     __builtin_OuterProductAccumulate(input_vector1, input_vector2,
       rw_matrix_buffer, opa_matrix_offset, opa_matrix_interpretation,
       opa_matrix_layout, opa_matrix_stride);
 
     const uint va_matrix_offset = 0;
 
-     //expected-error@+1{{intrinsic __builtin_VectorAccumulate potentially used by 'cs_main' requires shader model 6.9 or greater}}
+     //expected-error@+1{{intrinsic function __builtin_VectorAccumulate requires shader model 6.9 or greater}}
      __builtin_VectorAccumulate(input_vector1, rw_matrix_buffer,
        va_matrix_offset);
 }