Migrate CodeGenTest-based tests to quick-test (#1975)

tools/clang/test/CodeGenHLSL/RaceCond2.hlsl

@@ -1,16 +0,0 @@
-// RUN: %dxc -E main  -T cs_6_0 %s
-
-
-RWBuffer< int > g_Intensities : register(u1);
-
-groupshared int sharedData;
-
-int a;
-int b[2];
-[ numthreads( 64, 2, 2 ) ]
-void main( uint GI : SV_GroupIndex)
-{
-sharedData = b[0];
-InterlockedAdd(sharedData, g_Intensities[GI]);
-g_Intensities[GI] = sharedData;
-}

tools/clang/test/CodeGenHLSL/cast1.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float main(int a : A) : SV_Target
-{
-  return a;
-}

tools/clang/test/CodeGenHLSL/cast2.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float main(uint a : A) : SV_Target
-{
-  return a;
-}

tools/clang/test/CodeGenHLSL/cbuffer2.50.hlsl

@@ -1,8 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float4 g1;
-
-float4 main() : SV_TARGET
-{
-  return g1.wyyy;
-}

tools/clang/test/CodeGenHLSL/cbuffer2.51.hlsl

@@ -1,8 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float4 g1;
-
-float4 main() : SV_TARGET
-{
-  return g1.wyyy;
-}

tools/clang/test/CodeGenHLSL/constoperand1.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T vs_6_0 %s
-
-float4 main() : SV_POSITION
-{
-  return float4(3,0,0.5,0.12345);
-}

tools/clang/test/CodeGenHLSL/empty.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-void main()
-{
-  return;
-}

tools/clang/test/CodeGenHLSL/literals_exact_precision_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -enable-16bit-types -E test -T vs_6_2 %s
+// RUN: %dxc -enable-16bit-types -E test -T vs_6_2 %s | FileCheck %s
+
+// CHECK: @test
 
 // To test with the classic compiler, run
 // fxc.exe /T ps_5_1 literals.hlsl

tools/clang/test/CodeGenHLSL/more-operators_Mod.hlsl

@@ -1,189 +0,0 @@
-// RUN: %dxc -E plain -T ps_6_0 %s
-
-// This file includes operator tests that target specific cases that are not
-// otherwise covered by the other generated files.
-
-// without also putting them in a static assertion
-
-#define OVERLOAD_IMPLEMENTED
-
-// __decltype is the GCC way of saying 'decltype', but doesn't require C++11
-#ifdef VERIFY_FXC
-#endif
-
-// To test with the classic compiler, run
-// fxc.exe /T vs_5_1 more-operators.hlsl
-// with vs_2_0 (the default) min16float usage produces a complaint that it's not supported
-
-struct f3_s    { float3 f3; };
-struct mixed_s { float3 f3; uint s; };
-struct many_s  { float4 f4; double4 d4; };
-struct u3_s    { uint u3; };
-
-SamplerState  g_SamplerState;
-f3_s          g_f3_s;
-mixed_s       g_mixed_s;
-many_s        g_many_s;
-u3_s          g_u3_s;
-
-// Until initialization lists are complete, this is the easiest way to initialize these.
-int1x1 g_i11;
-int1x2 g_i12;
-int2x1 g_i21;
-int2x2 g_i22;
-
-float  int_to_float(int i)    { return i; }
-int1x1 float_to_i11(float f)  { return f; }
-float  i11_to_float(int1x1 v) { return v; }
-
-void into_out_i(out int i) { i = g_i11; }
-void into_out_i3(out int3 i3) { i3 = int3(1, 2, 3); } // expected-note {{candidate function not viable}} expected-note {{candidate function not viable}} fxc-pass {{}}
-void into_out_f(out float i) { i = g_i11; }
-void into_out_f3_s(out f3_s i) { }
-void into_out_ss(out SamplerState ss) { ss = g_SamplerState; }
-
-float4 plain(float4 param4 /* : FOO */): SV_Target /*: FOO */{
-    bool bools = 0;
-    int ints = 0;
-    const int intc = 1;
-    int1 i1 = 0;
-    int2 i2 = { 0, 0 };
-    int3 i3 = { 1, 2, 3 };
-    int4 i4 = { 1, 2, 3, 4 };
-    int1x1 i11 = g_i11;
-    int1x2 i12 = g_i12;
-    int2x1 i21 = g_i21;
-    int2x2 i22 = g_i22;
-    int ari1[1] = { 0 };
-    int ari2[2] = { 0, 1 };
-    float floats = 0;
-    SamplerState SamplerStates = g_SamplerState;
-    f3_s f3_ss = g_f3_s;
-    mixed_s mixed_ss = g_mixed_s;
-
-
-    // Tests for complex objects.
-
-    // Tests with vectors of one.
-    ints = i1; // assign to scalar
-    i2 = i1;   // assign to wider type
-    i1 = ints; // assign from scalar
-    i12 = i1;  // assign to matrix type (one row)
-    i21 = i1;  // assign to matrix type (one col)
-    i22 = i1;  // assign to matrix type (square)
-    floats = i1; // assign to scalar of different but compatible type
-    floats = i11; // assign to scalar of different but compatible type
-    i11 = floats; // assign from scalar of different but compatible type
-
-    // Tests with 1x1 matrices.
-    ints = i11;         // assign to scalar
-    i22 = i11;          // assign to wider type
-
-    // Tests with arrays of one and one-dimensional arrays.
-    ari1 = (int[1])ints; // explicit conversion works
-    ari1 = ari1; // assign to same-sized array
-    ari1 = (int[1])ari2; // explicit conversion to smaller size
-    floats = (float)ari1; // assign to scalar of compatible type
-
-    // Tests that introduce const into expression.
-    ints = intc;
-    i2 = intc;
-
-    // Tests that perform a conversion by virtue of making a function call.
-    // Same rules, mostly ensuring that the same codepath is taken.
-    floats = int_to_float(ints);
-    ints = int_to_float(floats);
-
-    // Tests that perform a conversion by virtue of returning a type.
-    // Same rules, mostly ensuring that the same codepath is taken.
-    floats = int_to_float(ints);
-    ints = int_to_float(floats);
-    i11 = float_to_i11(floats);
-    floats = i11_to_float(i11);
-
-    // Tests that perform equality checks on object types. (not supported in prior compiler)
-
-    // Tests that perform the conversion into an out parameter.
-    into_out_i(ints);
-    into_out_f(floats);
-    into_out_f3_s(f3_ss);
-    into_out_ss(SamplerStates);
-    into_out_i3((int3)i4);
-
-    // Tests that perform casts that yield lvalues.
-    ((int3)i4).x = 1;
-
-    // Tests that work with unary operators.
-    bool bool_l = 1;
-    int int_l = 1;
-    uint uint_l = 1;
-    half half_l = 1;
-    float float_l = 1;
-    double double_l = 1;
-    min16float min16float_l = 1;
-    min10float min10float_l = 1;
-    min16int min16int_l = 1;
-    min12int min12int_l = 1;
-    min16uint min16uint_l = 1;
-    SamplerState SamplerState_l = g_SamplerState;
-    bool1 bool1_l = 0;
-    bool2 bool2_l = 0;
-    float3 float3_l = 0;
-    double4 double4_l = 0;
-    min10float1x2 min10float1x2_l = 0;
-    uint2x3 uint2x3_l = 0;
-    min16uint4x4 min16uint4x4_l = 0;
-    int3x2 int3x2_l = 0;
-    f3_s f3_s_l = g_f3_s;
-    mixed_s mixed_s_l = g_mixed_s;
-
-    // An artifact of the code generation is that some results were classified
-    // as int or bool2 when int1 and int2 were more accurate (but the overload was missing
-    // in the test).
-    //
-    // Some 'int or unsigned int type require' messages are 'scalar, vector, or matrix expected'
-    // when both might apply.
-    //
-    // pre/post inc/dec on unsupported types was silently ignored and resulted in
-    // 'scalar, vector, or matrix expected'.
-
-#ifdef OVERLOAD_IMPLEMENTED
-    (!bool_l); //
-    (!int_l); //
-    (!uint_l); //
-    (!half_l); //
-    (!float_l); //
-    (!double_l); //
-    (!min16float_l); //
-    (!min10float_l); //
-    (!min16int_l); //
-    (!min12int_l); //
-    (!min16uint_l); //
-    (!bool1_l); //
-#endif
-
-    // Tests with multidimensional arrays.
-    int arr23[2][3] = { 1, 2, 3, 4, 5, 6 };
-
-    float farr23[2][3];
-    // arithmetic
-    // order comparison
-    // equality comparison
-    // bitwise
-    // logical
-    farr23 = farr23;
-
-    float farr3[3];
-    farr3 = farr23[0];
-    farr3 = farr23[1];
-
-    // Tests with structures with all primitives.
-    many_s many_l = g_many_s;
-    u3_s u3_l = g_u3_s;
-
-
-
-    // Tests with comma operator.
-
-    // Note that this would work in C/C++.
-};

tools/clang/test/CodeGenHLSL/neg1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(float4 a : A) : SV_TARGET
 {
   return -a.yxxx;

tools/clang/test/CodeGenHLSL/neg2.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float4 main(int4 a : A) : SV_TARGET
-{
-  return -a.yxxx;
-}

tools/clang/test/CodeGenHLSL/object-operators_Mod.hlsl

@@ -1,39 +0,0 @@
-// RUN: %dxc -E main -T vs_6_0 %s
-
-// TODO: support struct with resource.
-
-// without also putting them in a static assertion
-
-// __decltype is the GCC way of saying 'decltype', but doesn't require C++11
-#ifdef VERIFY_FXC
-#endif
-
-// To test with the classic compiler, run
-// fxc.exe /T vs_5_1 scalar-operators.hlsl
-// with vs_2_0 (the default) min16float usage produces a complaint that it's not supported
-
-struct f3_s    { float3 f3; };
-struct mixed_s { float3 f3; SamplerState s; };
-SamplerState g_SamplerState;
-f3_s    g_f3_s;
-mixed_s g_mixed_s;
-
-float4 main(float4 param4  : FOO )  : FOO {
-    bool        bools       = 0;
-    int         ints        = 0;
-    float       floats      = 0;
-    SamplerState SamplerStates = g_SamplerState;
-    f3_s f3_ss = g_f3_s;
-    mixed_s mixed_ss = g_mixed_s;
-
-  // when dealing with built-in types, (SamplerState in these examples) are now 'operator
-  // cannot be used with built-in type 'SamplerState'' or
-
-  // some 'int or unsigned int type required' become 'scalar, vector, or matrix expected'
-
-  // some 'cannot implicitly convert from 'SamplerState' to 'bool'' become 'type mismatch'
-
-  // This confuses the semantic checks on template types, which are assumed to be only for built-in template-like constructs.
-  // This confuses the semantic checks on template types, which are assumed to be only for built-in template-like constructs.
-  return 1.2;
-};

tools/clang/test/CodeGenHLSL/passthrough1.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T vs_6_0 %s
-
-float4 main(float4 a : A) : SV_POSITION
-{
-  return a;
-}

tools/clang/test/CodeGenHLSL/passthrough2.hlsl

@@ -1,6 +0,0 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
-float4 main(float4 a : A) : SV_TARGET
-{
-  return a.xxxy;
-}

tools/clang/test/CodeGenHLSL/quick-test/RaceCond2.hlsl

@@ -0,0 +1,16 @@
+// RUN: %dxc -E main  -T cs_6_0 %s | FileCheck %s
+
+// CHECK: @main
+RWBuffer< int > g_Intensities : register(u1);
+
+groupshared int sharedData;
+
+int a;
+int b[2];
+[ numthreads( 64, 2, 2 ) ]
+void main( uint GI : SV_GroupIndex)
+{
+  sharedData = b[0];
+  InterlockedAdd(sharedData, g_Intensities[GI]);
+  g_Intensities[GI] = sharedData;
+}

tools/clang/test/CodeGenHLSL/StructCast.hlsl → tools/clang/test/CodeGenHLSL/quick-test/StructCast.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // CHECK: SV_RenderTargetArrayIndex or SV_ViewportArrayIndex from any shader feeding rasterizer
 

tools/clang/test/CodeGenHLSL/alloca_at_entry_blk.hlsl → tools/clang/test/CodeGenHLSL/quick-test/alloca_at_entry_blk.hlsl

@@ -1,6 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
-
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 int i;
 float4 v;
 float4 main() : SV_Target

tools/clang/test/CodeGenHLSL/arrayArg.hlsl → tools/clang/test/CodeGenHLSL/quick-test/arrayArg.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T cs_6_0 %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float fn_float_arr(float arr[2]) {
   arr[0] = 123;
   return arr[0];

tools/clang/test/CodeGenHLSL/arrayArg2.hlsl → tools/clang/test/CodeGenHLSL/quick-test/arrayArg2.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T cs_6_0 %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float fn_float_arr(float arr[6]) {
   arr[0] = 123.2;
   return arr[0];

tools/clang/test/CodeGenHLSL/arrayArg3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/arrayArg3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T cs_6_0 %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float2 fn_float_arr(float2 arr[2][3]) {
   arr[0][1] = 123.2;
   return arr[0][1];

tools/clang/test/CodeGenHLSL/arrayOfStruct.hlsl → tools/clang/test/CodeGenHLSL/quick-test/arrayOfStruct.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct s_f3_f3 {
  float3 f0;
  float3 f1;

tools/clang/test/CodeGenHLSL/attributes_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/attributes_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T ps_5_1 attributes.hlsl

tools/clang/test/CodeGenHLSL/boolComb.hlsl → tools/clang/test/CodeGenHLSL/quick-test/boolComb.hlsl

@@ -18,9 +18,7 @@ float4 main(float4 a : A) : SV_TARGET {
 // CHECK: or i1
 // CHECK: or i1
 // convert any to int.
-// CHECK: zext i1
-// |=
-// CHECK: or i32
+// CHECK: or i1
   b |= any(a);
 
 // and i1 for all.
@@ -28,8 +26,7 @@ float4 main(float4 a : A) : SV_TARGET {
 // CHECK: and i1
 // CHECK: and i1
 // convert all to int.
-// CHECK: zext i1
-// CHECK: and i32
+// CHECK: and i1
   b &= all(a);
 // cmp for a>2.
 // CHECK: fcmp fast ogt float
@@ -45,12 +42,6 @@ float4 main(float4 a : A) : SV_TARGET {
 // CHECK: or i1
 // CHECK: or i1
 // convert any to int.
-// CHECK: zext i1
-//  %xor = xor i32 b, any
-//  %tobool15 = icmp ne i32 %xor, 0
-// will be translated into
-//  icmp ne i32 b, any
-// CHECK: icmp ne i32
   b ^= any(a>2);
   return b;
 }

tools/clang/test/CodeGenHLSL/call1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/call1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float r;

tools/clang/test/CodeGenHLSL/call3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/call3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float r;

tools/clang/test/CodeGenHLSL/quick-test/cast1.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float main(int a : A) : SV_Target
+{
+  return a;
+}

tools/clang/test/CodeGenHLSL/quick-test/cast2.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float main(uint a : A) : SV_Target
+{
+  return a;
+}

tools/clang/test/CodeGenHLSL/cast3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cast3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 int cast(float a)
 {
   return a;

tools/clang/test/CodeGenHLSL/cast4.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cast4.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 uint cast(float a)
 {
   return a;

tools/clang/test/CodeGenHLSL/cbuf_init_static.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cbuf_init_static.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 a;
 
 static float4 m = {a};

tools/clang/test/CodeGenHLSL/cbuffer1.50.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cbuffer1.50.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 cbuffer Foo1 : register(b5)
 {
   float4 g1;

tools/clang/test/CodeGenHLSL/cbuffer1.51.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cbuffer1.51.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 cbuffer Foo1 : register(b5)
 {
   float4 g1;

tools/clang/test/CodeGenHLSL/quick-test/cbuffer2.50.hlsl

@@ -0,0 +1,9 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 g1;
+
+float4 main() : SV_TARGET
+{
+  return g1.wyyy;
+}

tools/clang/test/CodeGenHLSL/quick-test/cbuffer2.51.hlsl

@@ -0,0 +1,9 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 g1;
+
+float4 main() : SV_TARGET
+{
+  return g1.wyyy;
+}

tools/clang/test/CodeGenHLSL/cbuffer3.50.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cbuffer3.50.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 cbuffer Foo
 {
   float4 g1[16];

tools/clang/test/CodeGenHLSL/cbuffer3.51.hlsl → tools/clang/test/CodeGenHLSL/quick-test/cbuffer3.51.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct Foo
 {
   float4 g1[16];

tools/clang/test/CodeGenHLSL/const-exprB_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/const-exprB_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E cs_main -T cs_6_0 %s
+// RUN: %dxc -E cs_main -T cs_6_0 %s | FileCheck %s
+
+// CHECK: @cs_main
 
 float overload1(float f) { return 1; }                        /* expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} fxc-pass {{}} */
 double overload1(double f) { return 2; }                       /* expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} fxc-pass {{}} */

tools/clang/test/CodeGenHLSL/const-expr_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/const-expr_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E cs_main -T cs_6_0 %s
+// RUN: %dxc -E cs_main -T cs_6_0 %s | FileCheck %s
+
+// CHECK: @cs_main
 
 float overload1(float f) { return 1; }                        /* expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} fxc-pass {{}} */
 double overload1(double f) { return 2; }                       /* expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} expected-note {{candidate function}} fxc-pass {{}} */

tools/clang/test/CodeGenHLSL/quick-test/constoperand1.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 main() : SV_POSITION
+{
+  return float4(3,0,0.5,0.12345);
+}

tools/clang/test/CodeGenHLSL/dot1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/dot1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float3 main(float4 a : A, float4 b : B) : SV_Target
 {
   float3 r = 0;

tools/clang/test/CodeGenHLSL/quick-test/empty.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+void main()
+{
+  return;
+}

tools/clang/test/CodeGenHLSL/functions_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/functions_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T cs_6_0 %s
+// RUN: %dxc -E main -T cs_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // __decltype is the GCC way of saying 'decltype', but doesn't require C++11
 #ifdef VERIFY_FXC

tools/clang/test/CodeGenHLSL/i32colIdx.hlsl → tools/clang/test/CodeGenHLSL/quick-test/i32colIdx.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct Input
 {
     float2 v : TEXCOORD0;

tools/clang/test/CodeGenHLSL/icb1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/icb1.hlsl

@@ -1,6 +1,7 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // TODO: change float4 a[4] to float4x4 a
+// CHECK: @main
 float main(float4 a[4] : A, int4 b : B) : SV_Target
 {
   return a[b.x][b.y];

tools/clang/test/CodeGenHLSL/if3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/if3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int b : B) : SV_Target
 {
   float x;

tools/clang/test/CodeGenHLSL/if4.hlsl → tools/clang/test/CodeGenHLSL/quick-test/if4.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float x;

tools/clang/test/CodeGenHLSL/if5.hlsl → tools/clang/test/CodeGenHLSL/quick-test/if5.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float x;

tools/clang/test/CodeGenHLSL/implicit-casts_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/implicit-casts_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T ps_5_1 implicit-casts.hlsl

tools/clang/test/CodeGenHLSL/indexableinput1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexableinput1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a[4] : A, float2 b : B, float2 c[4] : C, int d : D/*, uint SI : SV_SampleIndex*/) : SV_TARGET
 {
   return a[2].y + c[d].x + b.x;

tools/clang/test/CodeGenHLSL/indexableinput2.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexableinput2.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a[3] : A, float2 b : B, float2 c[6] : C, int d : D, uint SI : SV_SampleIndex) : SV_TARGET
 {
   return a[2].y + a[SI].x + c[d].x + b.x;

tools/clang/test/CodeGenHLSL/indexableinput3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexableinput3.hlsl

@@ -1,6 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
-// CHECK: main
+// CHECK: @main
 struct C {
     float4 c;
 };

tools/clang/test/CodeGenHLSL/indexableinput4.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexableinput4.hlsl

@@ -1,7 +1,8 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
 // test indexed structures in input which has array members.
 
+// CHECK: @main
 struct C {
     float4 c;
 };

tools/clang/test/CodeGenHLSL/indexableoutput1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexableoutput1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct VSOut
 {
   float4 f[7] : F;

tools/clang/test/CodeGenHLSL/indexabletemp1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexabletemp1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float g1[4], g2[8];
 
 float main(float4 a : A, int b : B, int c : C) : SV_TARGET

tools/clang/test/CodeGenHLSL/indexabletemp2.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexabletemp2.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float g1[4], g2[8];
 int g3[4], g4[8];
 

tools/clang/test/CodeGenHLSL/indexabletemp3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexabletemp3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float g1[4], g2[8];
 
 float main(float4 a : A, int b : B, int c : C) : SV_TARGET

tools/clang/test/CodeGenHLSL/indexing-operator_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/indexing-operator_Mod.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T vs_5_1 indexing-operator.hlsl

tools/clang/test/CodeGenHLSL/input2.hlsl → tools/clang/test/CodeGenHLSL/quick-test/input2.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(
             float4 a : A
            ,int4 b : B

tools/clang/test/CodeGenHLSL/input3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/input3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(
             float4 a : A
             // SGV

tools/clang/test/CodeGenHLSL/literals_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/literals_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E test -T vs_6_0 %s
+// RUN: %dxc -E test -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @test
 
 // To test with the classic compiler, run
 // fxc.exe /T ps_5_1 literals.hlsl

tools/clang/test/CodeGenHLSL/liveness1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/liveness1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float4 a : A, int3 b : B) : SV_Target
 {
   float x = a.x * a.w + a.y * a.z;

tools/clang/test/CodeGenHLSL/loop4.hlsl → tools/clang/test/CodeGenHLSL/quick-test/loop4.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float s = 0;

tools/clang/test/CodeGenHLSL/loop5.hlsl → tools/clang/test/CodeGenHLSL/quick-test/loop5.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float2 a : A, int3 b : B) : SV_Target
 {
   float s = 0;

tools/clang/test/CodeGenHLSL/matInit.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matInit.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(int4 b:B) : SV_TARGET
 {
   float2x2 a = float2x2(0.1f, 0.2f, 0.3f, 0.4f);

tools/clang/test/CodeGenHLSL/matMulMat.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matMulMat.hlsl

@@ -1,5 +1,6 @@
 // RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 cbuffer cbPerObject : register( b0 )
 {
   float4x4		g_mWorldViewProjection;

tools/clang/test/CodeGenHLSL/mat_param3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/mat_param3.hlsl

@@ -1,6 +1,6 @@
 // RUN: %dxc -E main -T ps_6_0 -O0 %s | FileCheck %s
 
-// CHECK: main
+// CHECK: @main
 
 // TODO: check test_inout after disable inline.
 

tools/clang/test/CodeGenHLSL/matrix-assignments_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matrix-assignments_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T vs_2_0 matrix-assignments.hlsl

tools/clang/test/CodeGenHLSL/matrix-syntax_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matrix-syntax_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T vs_5_1 matrix-syntax.hlsl

tools/clang/test/CodeGenHLSL/matrixIn.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matrixIn.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float main(float4x4 a : A, int4 b : B) : SV_Target
 {
   return a[b.x][b.y];

tools/clang/test/CodeGenHLSL/matrixOut.hlsl → tools/clang/test/CodeGenHLSL/quick-test/matrixOut.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(out float4x4 a : A, int4 b : B) : SV_Position
 {
   a = b.x;

tools/clang/test/CodeGenHLSL/minprec_cast.hlsl → tools/clang/test/CodeGenHLSL/quick-test/minprec_cast.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct PSInput
 {
     float4 position : SV_POSITION;

tools/clang/test/CodeGenHLSL/quick-test/neg2.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 main(int4 a : A) : SV_TARGET
+{
+  return -a.yxxx;
+}

tools/clang/test/CodeGenHLSL/negabs1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/negabs1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float4 main(float4 a : A) : SV_TARGET
 {
   return -abs(a.yxxx);

tools/clang/test/CodeGenHLSL/packreg_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/packreg_Mod.hlsl

@@ -1,6 +1,7 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 // :FXC_VERIFY_ARGUMENTS: /E main /T ps_5_1
 
+// CHECK: @main
 float4 f_no_conflict : register(vs, c0) : register(ps, c1);
 
 cbuffer MySamplerBuffer : register(b25)

tools/clang/test/CodeGenHLSL/quick-test/passthrough1.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 main(float4 a : A) : SV_POSITION
+{
+  return a;
+}

tools/clang/test/CodeGenHLSL/quick-test/passthrough2.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 main(float4 a : A) : SV_TARGET
+{
+  return a.xxxy;
+}

tools/clang/test/CodeGenHLSL/raw_buf1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/raw_buf1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 ByteAddressBuffer buf1;
 RWByteAddressBuffer buf2;
 

tools/clang/test/CodeGenHLSL/rcp1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/rcp1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float3 main(float4 a : A) : SV_Target
 {
   float3 r = 0;

tools/clang/test/CodeGenHLSL/quick-test/redundantinput1.hlsl

@@ -0,0 +1,7 @@
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
+float4 main(float4 a : A) : SV_TARGET
+{
+  return a + abs(a);
+}

tools/clang/test/CodeGenHLSL/resource-array-param.hlsl → tools/clang/test/CodeGenHLSL/quick-test/resource-array-param.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 Texture2D Tex4[4];
 Texture2D Tex[];
 

tools/clang/test/CodeGenHLSL/rootSigEntry.hlsl → tools/clang/test/CodeGenHLSL/quick-test/rootSigEntry.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float a;
 float4 main() : SV_Target {
    return a;

tools/clang/test/CodeGenHLSL/sample2.hlsl → tools/clang/test/CodeGenHLSL/quick-test/sample2.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 cbuffer Foo
 {
   float4 g0;

tools/clang/test/CodeGenHLSL/sample3.hlsl → tools/clang/test/CodeGenHLSL/quick-test/sample3.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 SamplerState samp1 : register(s5);
 Texture2D<float4> text1 : register(t3);
 

tools/clang/test/CodeGenHLSL/sample4.hlsl → tools/clang/test/CodeGenHLSL/quick-test/sample4.hlsl

@@ -1,7 +1,8 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
 // test scalar texture
 
+// CHECK: @main
 SamplerState samp1 : register(s5);
 Texture2D<float> text1 : register(t3);
 

tools/clang/test/CodeGenHLSL/sample5.hlsl → tools/clang/test/CodeGenHLSL/quick-test/sample5.hlsl

@@ -1,7 +1,6 @@
 // RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
-
-
+// CHECK: @main
 Texture2D<float4> g_texture;
 SamplerState g_ss;
 float4 main() : SV_Target {

tools/clang/test/CodeGenHLSL/saturate1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/saturate1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 float3 main(float3 a : A) : SV_Target
 {
   return saturate(a.xzx);

tools/clang/test/CodeGenHLSL/scalar-assignments_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/scalar-assignments_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T vs_6_0 %s
+// RUN: %dxc -E main -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 // To test with the classic compiler, run
 // fxc.exe /T vs_5_1 scalar-assignments.hlsl

tools/clang/test/CodeGenHLSL/scalar-operators-assign_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/scalar-operators-assign_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E plain -T vs_6_0 %s
+// RUN: %dxc -E plain -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @plain
 
 //
 // without also putting them in a static assertion

tools/clang/test/CodeGenHLSL/scalar-operators_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/scalar-operators_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E plain -T vs_6_0 %s
+// RUN: %dxc -E plain -T vs_6_0 %s | FileCheck %s
+
+// CHECK: @plain
 
 // without also putting them in a static assertion
 

tools/clang/test/CodeGenHLSL/scalarToVec.hlsl → tools/clang/test/CodeGenHLSL/quick-test/scalarToVec.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 struct T {
 float m;
 };

tools/clang/test/CodeGenHLSL/self_copy.hlsl → tools/clang/test/CodeGenHLSL/quick-test/self_copy.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 struct N {
   float n;
 };

tools/clang/test/CodeGenHLSL/semantics_Mod.hlsl → tools/clang/test/CodeGenHLSL/quick-test/semantics_Mod.hlsl

@@ -1,4 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
+
+// CHECK: @main
 
 //////////////////////////////////////////////////////////////////////////////
 // Global variables.

tools/clang/test/CodeGenHLSL/srv_typed_load1.hlsl → tools/clang/test/CodeGenHLSL/quick-test/srv_typed_load1.hlsl

@@ -1,5 +1,6 @@
-// RUN: %dxc -E main -T ps_6_0 %s
+// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s
 
+// CHECK: @main
 Texture2D<float4> srv1 : register(t3);
 
 float4 main(float3 a : A, float2 b : B) : SV_Target