Resolved the codegen tests for or intrinsic

Author: metkarpoonam

clang/lib/Sema/SemaHLSL.cpp

@@ -2291,36 +2291,19 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
 
     break;
   }
-  case Builtin::BI__builtin_hlsl_and: {
-    if (SemaRef.checkArgCount(TheCall, 2))
-      return true;
-    if (CheckVectorElementCallArgs(&SemaRef, TheCall))
-      return true;
-    if (CheckScalarOrVector(&SemaRef, TheCall, getASTContext().BoolTy, 0))
-      return true;
-
-    ExprResult A = TheCall->getArg(0);
-    QualType ArgTyA = A.get()->getType();
-    // return type is the same as the input type
-    TheCall->setType(ArgTyA);
-    break;
-  }
+  case Builtin::BI__builtin_hlsl_and:
   case Builtin::BI__builtin_hlsl_or: {
     if (SemaRef.checkArgCount(TheCall, 2))
       return true;
     if (CheckVectorElementCallArgs(&SemaRef, TheCall))
       return true;
-
-    // Ensure input expr type is a scalar/vector of type Boolty
     if (CheckScalarOrVector(&SemaRef, TheCall, getASTContext().BoolTy, 0))
       return true;
 
     ExprResult A = TheCall->getArg(0);
     QualType ArgTyA = A.get()->getType();
-
     // return type is the same as the input type
     TheCall->setType(ArgTyA);
-
     break;
   }
   case Builtin::BI__builtin_hlsl_all:

clang/test/CodeGenHLSL/builtins/or.hlsl

@@ -2,12 +2,12 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s
 
-//CHECK-LABEL: define noundef i1 @_Z12test_or_boolbb(
+//CHECK-LABEL: define noundef i1 @_Z15test_and_scalarbb(
 //CHECK-SAME: i1 noundef [[X:%.*]], i1 noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = or i1 [[x]], [[y]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = or i1 [[X]], [[Y]]
 //CHECK-NEXT:    ret i1 [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool test_and_scalar(bool x, bool y)
 {
     return or(x, y);
@@ -16,9 +16,9 @@ bool test_and_scalar(bool x, bool y)
 //CHECK-LABEL: define noundef <2 x i1> @_Z13test_or_bool2Dv2_bS_(
 //CHECK-SAME: <2 x i1> noundef [[X:%.*]], <2 x i1> noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <2 xi1> [[x]], [[y]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <2 x i1> [[X]], [[Y]]
 //CHECK-NEXT:    ret <2 x i1> [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool2 test_or_bool2(bool2 x, bool2 y)
 {
     return or(x, y);
@@ -27,9 +27,9 @@ bool2 test_or_bool2(bool2 x, bool2 y)
 //CHECK-LABEL: define noundef <3 x i1> @_Z13test_or_bool3Dv3_bS_(
 //CHECK-SAME: <3 x i1> noundef [[X:%.*]], <3 x i1> noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <3 xi1> [[x]], [[y]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <3 x i1> [[X]], [[Y]]
 //CHECK-NEXT:    ret <3 x i1> [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool3 test_or_bool3(bool3 x, bool3 y)
 {
     return or(x, y);
@@ -38,9 +38,9 @@ bool3 test_or_bool3(bool3 x, bool3 y)
 //CHECK-LABEL: define noundef <4 x i1> @_Z13test_or_bool4Dv4_bS_(
 //CHECK-SAME: <4 x i1> noundef [[X:%.*]], <4 x i1> noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <4 xi1> [[x]], [[y]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = or <4 x i1> [[X]], [[Y]]
 //CHECK-NEXT:    ret <4 x i1> [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool4 test_or_bool4(bool4 x, bool4 y)
 {
     return or(x, y);
@@ -49,10 +49,10 @@ bool4 test_or_bool4(bool4 x, bool4 y)
 //CHECK-LABEL: define noundef i1 @_Z11test_or_intii(
 //CHECK-SAME: i32 noundef [[X:%.*]], i32 noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK_NEXT:    [[0:%.*]] = or i32 [[y]], [[x]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = icmp ne i32 [[0]], 0
+//CHECK-NEXT:    [[A:%.*]] = or i32 [[Y]], [[X]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = icmp ne i32 [[A]], 0
 //CHECK-NEXT:    ret i1 [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool test_or_int(int x, int y)
 {
     return or(x, y);
@@ -61,10 +61,10 @@ bool test_or_int(int x, int y)
 //CHECK-LABEL: define noundef <4 x i1> @_Z12test_or_int4Dv4_iS_(
 //CHECK-SAME: <4 x i32> noundef [[X:%.*]], <4 x i32> noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0]] {
 //CHECK-NEXT:  [[ENTRY:.*:]]
-//CHECK_NEXT:    [[0:%.*]] = or <4 x i32> [[y]], [[x]]
-//CHECK-NEXT:    [[HLSL_OR:%.*]] = icmp ne <4 x i32> [[0]], zeroinitializer
+//CHECK-NEXT:    [[A:%.*]] = or <4 x i32> [[Y]], [[X]]
+//CHECK-NEXT:    [[HLSL_OR:%.*]] = icmp ne <4 x i32> [[A]], zeroinitializer
 //CHECK-NEXT:    ret <4 x i1> [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool4 test_or_int4(int4 x, int4 y)
 {
     return or(x, y);
@@ -77,8 +77,9 @@ bool4 test_or_int4(int4 x, int4 y)
 //CHECK-NEXT:    [[TOBOOL1:%.*]] = fcmp reassoc nnan ninf nsz arcp afn une <4 x float> [[Y]], zeroinitializer
 //CHECK-NEXT:    [[HLSL_OR:%.*]] = or <4 x i1> [[TOBOOL]], [[TOBOOL1]]
 //CHECK-NEXT:    ret <4 x i1> [[HLSL_OR]]
-//CHECK_NEXT:  }
+//CHECK-NEXT:  }
 bool4 test_or_float4(float4 x, float4 y)
 {
     return or(x, y);
 }
+