reorganized sema spirv checks, added target env to validation step of spirv backend tests

Author: kmpeng

clang/lib/Sema/SemaSPIRV.cpp

@@ -106,44 +106,34 @@ bool SemaSPIRV::CheckSPIRVBuiltinFunctionCall(unsigned BuiltinID,
       return true;
 
     // check if the all arguments have floating representation
-    ExprResult A = TheCall->getArg(0);
-    QualType ArgTyA = A.get()->getType();
-    if (!ArgTyA->hasFloatingRepresentation()) {
-      SemaRef.Diag(A.get()->getBeginLoc(),
-                   diag::err_typecheck_convert_incompatible)
-          << ArgTyA << SemaRef.Context.FloatTy << 1 << 0 << 0;
-      return true;
+    for (unsigned i = 0; i < TheCall->getNumArgs(); ++i) {
+      ExprResult Arg = TheCall->getArg(i);
+      QualType ArgTy = Arg.get()->getType();
+      if (!ArgTy->hasFloatingRepresentation()) {
+        SemaRef.Diag(Arg.get()->getBeginLoc(),
+                     diag::err_builtin_invalid_arg_type)
+            << i + 1 << /* scalar or vector */ 5 << /* no int */ 0 << /* fp */ 1
+            << ArgTy;
+        return true;
+      }
     }
 
+    // check if all arguments are of the same type
+    ExprResult A = TheCall->getArg(0);
     ExprResult B = TheCall->getArg(1);
-    QualType ArgTyB = B.get()->getType();
-    if (!ArgTyB->hasFloatingRepresentation()) {
-      SemaRef.Diag(A.get()->getBeginLoc(),
-                   diag::err_typecheck_convert_incompatible)
-          << ArgTyB << SemaRef.Context.FloatTy << 1 << 0 << 0;
-      return true;
-    }
-
     ExprResult C = TheCall->getArg(2);
-    QualType ArgTyC = C.get()->getType();
-    if (!ArgTyC->hasFloatingRepresentation()) {
-      SemaRef.Diag(A.get()->getBeginLoc(),
-                   diag::err_typecheck_convert_incompatible)
-          << ArgTyC << SemaRef.Context.FloatTy << 1 << 0 << 0;
-      return true;
-    }
-
-    // check if all arguments are of the same type
-    if (!(SemaRef.getASTContext().hasSameUnqualifiedType(ArgTyA, ArgTyB) &&
-          SemaRef.getASTContext().hasSameUnqualifiedType(ArgTyA, ArgTyC))) {
+    if (!(SemaRef.getASTContext().hasSameUnqualifiedType(A.get()->getType(),
+                                                         B.get()->getType()) &&
+          SemaRef.getASTContext().hasSameUnqualifiedType(A.get()->getType(),
+                                                         C.get()->getType()))) {
       SemaRef.Diag(TheCall->getBeginLoc(),
                    diag::err_vec_builtin_incompatible_vector)
           << TheCall->getDirectCallee() << /*useAllTerminology*/ true
           << SourceRange(A.get()->getBeginLoc(), C.get()->getEndLoc());
       return true;
     }
 
-    QualType RetTy = ArgTyA;
+    QualType RetTy = A.get()->getType();
     TheCall->setType(RetTy);
     break;
   }

clang/test/SemaSPIRV/BuiltIns/smoothstep-errors.c

@@ -20,7 +20,17 @@ float2 test_too_many_arg(float2 p0) {
 
 int test_int_scalar_inputs(int p0) {
   return __builtin_spirv_smoothstep(p0, p0, p0);
-  //  expected-error@-1 {{passing 'int' to parameter of incompatible type 'float'}}
+  //  expected-error@-1 {{1st argument must be a scalar or vector of floating-point types (was 'int')}}
+}
+
+float test_int_scalar_inputs2(float p0, int p1) {
+  return __builtin_spirv_smoothstep(p0, p1, p1);
+  //  expected-error@-1 {{2nd argument must be a scalar or vector of floating-point types (was 'int')}}
+}
+
+float test_int_scalar_inputs3(float p0, int p1) {
+  return __builtin_spirv_smoothstep(p0, p0, p1);
+  //  expected-error@-1 {{3rd argument must be a scalar or vector of floating-point types (was 'int')}}
 }
 
 float test_mismatched_arg(float p0, float2 p1) {

llvm/test/CodeGen/SPIRV/hlsl-intrinsics/smoothstep.ll

@@ -1,5 +1,5 @@
 ; RUN: llc -O0 -verify-machineinstrs -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val %}
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val --target-env vulkan1.2 %}
 
 ; Make sure SPIRV operation function calls for smoothstep are lowered correctly.
 

llvm/test/CodeGen/SPIRV/opencl/smoothstep.ll

@@ -1,7 +1,7 @@
 ; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s
 ; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %}
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val --target-env vulkan1.2 %}
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val --target-env vulkan1.2 %}
 
 ; CHECK-DAG: %[[#op_ext_cl:]] = OpExtInstImport "OpenCL.std"