[ser] Improve 'reordercoherent' tests

Author: simoll

tools/clang/test/CodeGenDXIL/hlsl/attributes/reordercoherent_for_arg.hlsl

@@ -0,0 +1,19 @@
+// RUN: %dxc -E main -T lib_6_9 %s | FileCheck %s
+// REQUIRES: dxil-1-9
+
+// CHECK: %[[uH:[^ ]+]] = load %dx.types.Handle, %dx.types.Handle* @"\01?u@@3V?$RWBuffer@M@@A", align 4
+// CHECK: %[[uLIBH:[^ ]+]] = call %dx.types.Handle @dx.op.createHandleForLib.dx.types.Handle(i32 160, %dx.types.Handle %[[uH]]) ; CreateHandleForLib(Resource)
+// CHECK: %[[uANNOT:[^ ]+]] = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %[[uLIBH]], %dx.types.ResourceProperties { i32 69642, i32 265 }) ; AnnotateHandle(res,props) resource: RWTypedBuffer<F32>
+// CHECK: %{{[^ ]+}} = call %dx.types.ResRet.f32 @dx.op.bufferLoad.f32(i32 68, %dx.types.Handle %[[uANNOT]], i32 0, i32 undef) ; BufferLoad(srv,index,wot)
+
+RWBuffer<float> OutBuf : register(u1);
+reordercoherent RWBuffer<float> u : register(u2);
+
+float read(RWBuffer<float> buf) {
+  return buf[0];
+}
+
+[shader("raygeneration")]
+void main() {
+  OutBuf[0] = read(u);
+}

…ers/reordercoherent/reordercoherent.hlsl …hlsl/attributes/reordercoherent_uav.hlsltools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent.hlsl renamed to tools/clang/test/CodeGenDXIL/hlsl/attributes/reordercoherent_uav.hlsl tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent.hlsl renamed to tools/clang/test/CodeGenDXIL/hlsl/attributes/reordercoherent_uav.hlsl

@@ -1,4 +1,5 @@
 // RUN: %dxc -E main -T lib_6_9 %s | FileCheck %s
+// REQUIRES: dxil-1-9
 
 // CHECK: !"uav1", {{.+}}, ![[TAGMD:[0-9]+]]}
 // CHECK: ![[TAGMD]] = !{i32 0, i32 9, i32 4, i1 true

…rs/reordercoherent/reordercoherent3.hlsl …ttributes/reordercoherent_uav_array.hlsltools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent3.hlsl renamed to tools/clang/test/CodeGenDXIL/hlsl/attributes/reordercoherent_uav_array.hlsl tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent3.hlsl renamed to tools/clang/test/CodeGenDXIL/hlsl/attributes/reordercoherent_uav_array.hlsl

@@ -1,4 +1,5 @@
 // RUN: %dxc -E main -T lib_6_9 %s | FileCheck %s
+// REQUIRES: dxil-1-9
 
 // Make sure uav array can have reordercoherent.
 // CHECK: !{{.*}} = !{i32 1, [12 x %"class.RWTexture2D<float>"]* bitcast ([12 x %dx.types.Handle]* @"\01?tex@@3PAV?$RWTexture2D@M@@A" to [12 x %"class.RWTexture2D<float>"]*), !"tex", i32 0, i32 2, i32 12, i32 2, i1 false, i1 false, i1 false, ![[TAGMD:.*]]}
@@ -10,6 +11,6 @@ reordercoherent RWTexture2D<float> tex[12] : register(u2);
 
 [shader("raygeneration")]
 void main() {
-  float2 c = 1.* DispatchRaysIndex().xy;
+  int2 c = DispatchRaysIndex().xy;
   OutBuf[0] = tex[0][c];
 }

tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent2.hlsl

@@ -1,4 +1,5 @@
 // RUN: %dxc -T lib_6_9 -ast-dump %s | FileCheck %s
+// REQUIRES: dxil-1-9
 
 // CHECK: |-VarDecl {{.*}} used uav1 'reordercoherent RWTexture1D<float4>':'RWTexture1D<vector<float, 4> >'
 // CHECK-NEXT: | |-HLSLReorderCoherentAttr

tools/clang/test/HLSLFileCheck/hlsl/types/modifiers/reordercoherent/reordercoherent_for_arg.hlsl

@@ -3,7 +3,9 @@
 RWByteAddressBuffer NonCBuf;
 globallycoherent RWByteAddressBuffer GCBuf;
 reordercoherent RWByteAddressBuffer RCBuf;
-reordercoherent globallycoherent RWByteAddressBuffer RCGCBuf; // expected-warning{{Attribute 'reordercoherent' implied by 'globallycoherent' in 'RCGCBuf'. 'reordercoherent' ignored.}}
+// expected-warning@+2{{attribute 'globallycoherent' implies 'reordercoherent'}}
+// expected-warning@+1{{Attribute 'reordercoherent' implied by 'globallycoherent' in 'RCGCBuf'. 'reordercoherent' ignored.}}
+reordercoherent globallycoherent RWByteAddressBuffer RCGCBuf;
 
 globallycoherent RWByteAddressBuffer getPromoteRC() {
   return RCBuf; // expected-warning{{implicit conversion from 'reordercoherent RWByteAddressBuffer' to 'globallycoherent RWByteAddressBuffer' promotes reordercoherent to globallycoherent annotation}}