Merge fixes for release branch #3630

Merge fixes for release branch

Author: tex3d

lib/DxilPIXPasses/DxilShaderAccessTracking.cpp

@@ -2567,6 +2567,17 @@ static void ValidateDxilOperationCallInProfile(CallInst *CI,
       ValCtx.EmitInstrFormatError(CI, ValidationRule::SmOpcodeInInvalidFunction,
                                   {"64-bit atomic operations", "Shader Model 6.6+"});
   } break;
+  case DXIL::OpCode::CreateHandle:
+    if (ValCtx.isLibProfile) {
+      ValCtx.EmitInstrFormatError(CI, ValidationRule::SmOpcodeInInvalidFunction,
+                                  {"CreateHandle", "non-library targets"});
+    }
+    // CreateHandle should not be used in SM 6.6 and above:
+    if (DXIL::CompareVersions(ValCtx.m_DxilMajor, ValCtx.m_DxilMinor, 1, 5) > 0) {
+      ValCtx.EmitInstrFormatError(CI, ValidationRule::SmOpcodeInInvalidFunction,
+                                  {"CreateHandle", "Shader model 6.5 and below"});
+    }
+    break;
   default:
     // TODO: make sure every opcode is checked.
     // Skip opcodes don't need special check.

lib/HLSL/DxilValidation.cpp

@@ -1,5 +1,8 @@
 // RUN: %dxc -E main -T ps_6_0 %s
 
+Buffer<float4> g_buf;
+
+[shader("pixel")]
 float4 main() : SV_Target {
-  return float4(1, 0, 0, 1);
+  return g_buf.Load(0);
 }

tools/clang/test/CodeGenHLSL/basic.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -ECSMain -Tcs_6_0 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;U0:2:10i0;.. | %FileCheck %s
+// RUN: %dxc -ECSMain -Tcs_6_0 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;U0:2:10i0;.0;0;0. | %FileCheck %s
 
 // Check we added the UAV:
 // CHECK:  %PIX_CountUAV_Handle = call %dx.types.Handle @dx.op.createHandle(i32 57, i8 1, i32 1, i32 0, i1 false)

tools/clang/test/HLSLFileCheck/pix/AccessTracking.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -Emain -Tcs_6_5 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=M0:0:1i0;S0:1:1i0;U0:2:10i0;.. | %FileCheck %s
+// RUN: %dxc -Emain -Tcs_6_5 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=M0:0:1i0;S0:1:1i0;U0:2:10i0;.0;0;0. | %FileCheck %s
 
 // Check we added the UAV:
 // CHECK:  %PIX_CountUAV_Handle = call %dx.types.Handle @dx.op.createHandle(i32 57, i8 1, i32 1, i32 0, i1 false)

tools/clang/test/HLSLFileCheck/pix/AccessTrackingForSamplerFeedback.hlsl

@@ -0,0 +1,26 @@
+// RUN: %dxc -EMain -Tcs_6_6 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=.256;512;1024. | %FileCheck %s
+
+static RWByteAddressBuffer DynamicBuffer = ResourceDescriptorHeap[1];
+[numthreads(1, 1, 1)]
+void Main()
+{
+    uint val = DynamicBuffer.Load(0u);
+    DynamicBuffer.Store(0u, val);
+}
+
+// check it's 6.6:
+// CHECK: call %dx.types.Handle @dx.op.createHandleFromBinding
+
+// Check we wrote to the PIX UAV:
+// CHECK: call void @dx.op.bufferStore.i32
+
+// Offset for buffer Load should be 256 + 8 (skip out-of-bounds record) + 8 (it's the 1th resource) + 4 (offset to the "read" field) = 276
+// The large integer is encoded flags for the ResourceAccessStyle (an enumerated type in lib\DxilPIXPasses\DxilShaderAccessTracking.cpp) for this access
+// CHECK:i32 276, i32 undef, i32 1375731712
+// CHECK:rawBufferLoad
+
+// Offset for buffer Store should be 256 + 8 (skip out-of-bounds record) + 8 (it's the 1th resource) + 0 (offset to the "write" field) = 272
+// The large integer is encoded flags for the ResourceAccessStyle (an enumerated type in lib\DxilPIXPasses\DxilShaderAccessTracking.cpp) for this access
+// CHECK:i32 272, i32 undef, i32 1392508928
+// CHECK:rawBufferStore
+

tools/clang/test/HLSLFileCheck/pix/DynamicResourceAccessTracking.hlsl

@@ -0,0 +1,19 @@
+// RUN: %dxc -EMain -Tcs_6_6 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=.256;272;1024. | %FileCheck %s
+
+static RWByteAddressBuffer DynamicBuffer = ResourceDescriptorHeap[1];
+[numthreads(1, 1, 1)]
+void Main()
+{
+    uint val = DynamicBuffer.Load(0u);
+    DynamicBuffer.Store(0u, val);
+}
+
+// check it's 6.6:
+// CHECK: call %dx.types.Handle @dx.op.createHandleFromBinding
+
+// The start of resource records has been passed in as 256. The limit of resource records is 272. 272-256 = 16.
+// 8 bytes per record means we have one record for out-of-bounds (that comes first), and one record for resource index 0.
+// The above HLSL references resource descriptor 1, so is out-of-bounds. Offset for out-of-bounds should thus be 256:
+// The large integer is encoded flags for the ResourceAccessStyle (an enumerated type in lib\DxilPIXPasses\DxilShaderAccessTracking.cpp) for this access
+// CHECK:i32 256, i32 undef, i32 1375731712
+// CHECK:rawBufferLoad

tools/clang/test/HLSLFileCheck/pix/DynamicResourceOutOfBounds.hlsl

@@ -0,0 +1,26 @@
+// RUN: %dxc -EMain -Tps_6_6 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;.256;512;1024. | %FileCheck %s
+
+static sampler sampler0 = SamplerDescriptorHeap[0];
+static sampler sampler3 = SamplerDescriptorHeap[3];
+Texture2D tx : register(t2);
+
+float4 Main() : SV_Target
+{
+    float4 a = tx.Sample(sampler0, float2(0,0));
+    float4 b = tx.Sample(sampler3, float2(0,0));
+    return a + b;
+}
+
+// check it's 6.6:
+// CHECK: call %dx.types.Handle @dx.op.createHandleFromBinding
+
+// The large integers are encoded flags for the ResourceAccessStyle (an enumerated type in lib\DxilPIXPasses\DxilShaderAccessTracking.cpp) for this access
+
+// Check we wrote sampler data to the PIX UAV. We told the pass to output starting at offset 512.
+// Add 8 to skip the "out of bounds" record. Add 4 to point to the "read" field within the next entry = 524
+// CHECK: call void @dx.op.bufferStore.i32(
+// CHECK:i32 524, i32 undef, i32 16777216
+
+// twice: 512 + 8 + 8*3+4 = 548
+// CHECK: call void @dx.op.bufferStore.i32(
+// CHECK:i32 548, i32 undef, i32 16777216

tools/clang/test/HLSLFileCheck/pix/DynamicSamplerAccessTracking.hlsl

@@ -0,0 +1,24 @@
+// RUN: %dxc -EMain -Tps_6_6 %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;.256;512;520. | %FileCheck %s
+
+static sampler sampler0 = SamplerDescriptorHeap[0];
+static sampler sampler3 = SamplerDescriptorHeap[3];
+Texture2D tx : register(t2);
+
+float4 Main() : SV_Target
+{
+    float4 a = tx.Sample(sampler0, float2(0,0));
+    float4 b = tx.Sample(sampler3, float2(0,0));
+    return a + b;
+}
+
+// check it's 6.6:
+// CHECK: call %dx.types.Handle @dx.op.createHandleFromBinding
+
+// The large integers are encoded flags for the ResourceAccessStyle (an enumerated type in lib\DxilPIXPasses\DxilShaderAccessTracking.cpp) for this access
+
+// The start of sampler records has been passed in as 512. The limit of the whole buffer is 520, leaving just one eight-byte record for the out-of-bounds record.
+// There are therefore no expected in-bounds references to samplers, so any such reference should go to the out-of-bounds offset at 512:
+
+// Out of bounds sampler access should be at offset 512
+// CHECK: call void @dx.op.bufferStore.i32(
+// CHECK:i32 512, i32 undef, i32 16777216

tools/clang/test/HLSLFileCheck/pix/DynamicSamplerOutOfBounds.hlsl

@@ -1,4 +1,4 @@
-// RUN: %dxc -T vs_6_5 -E main %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;U0:2:10i0;.. | FileCheck %s
+// RUN: %dxc -T vs_6_5 -E main %s | %opt -S -hlsl-dxil-pix-shader-access-instrumentation,config=S0:1:1i1;U0:2:10i0;.0;0;0. | FileCheck %s
 
 // CHECK: call void @dx.op.rayQuery_TraceRayInline
 // CHECK: call void @dx.op.bufferStore.i32(i32 69, %dx.types.Handle