From f80a5c07f56a685f1ab59f1292b694b0020d6ca9 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Mon, 12 Aug 2019 15:50:18 -0700 Subject: [PATCH] Add dxilver 1.5 to batch tests requiring it. --- .../batch/compiler_options/pack_clip_cull/optimized2.hlsl | 2 +- .../batch/compiler_options/pack_clip_cull/optimized3.hlsl | 2 +- .../batch/compiler_options/pack_clip_cull/prefix_stable2.hlsl | 2 +- .../batch/compiler_options/pack_clip_cull/prefix_stable3.hlsl | 2 +- .../batch/declarations/resources/constant_buffers/array1.hlsl | 2 +- tools/clang/test/CodeGenHLSL/batch/misc/sig-bool-as-uint.hlsl | 2 +- .../raytracing/subobjects_raytracingPipelineConfig1.hlsl | 2 +- .../test/CodeGenHLSL/batch/validation/rawbufferstore_uav.hlsl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized2.hlsl b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized2.hlsl index 46e202c2e..1df699ab2 100644 --- a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized2.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized2.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T vs_6_0 -pack_optimized %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T vs_6_0 -pack_optimized %s | FileCheck %s // CHECK: ; Output signature: // CHECK: ; Name Index Mask Register SysValue Format Used diff --git a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized3.hlsl b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized3.hlsl index b5192f5eb..e829e430e 100644 --- a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized3.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/optimized3.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T vs_6_0 -pack_optimized %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T vs_6_0 -pack_optimized %s | FileCheck %s // CHECK: ; Output signature: // CHECK: ; Name Index Mask Register SysValue Format Used diff --git a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable2.hlsl b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable2.hlsl index a645acf10..ca8a6ee44 100644 --- a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable2.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable2.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T vs_6_0 -pack_prefix_stable %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T vs_6_0 -pack_prefix_stable %s | FileCheck %s // CHECK: ; Output signature: // CHECK: ; Name Index Mask Register SysValue Format Used diff --git a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable3.hlsl b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable3.hlsl index 55eae213e..2cbcdcf95 100644 --- a/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable3.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/compiler_options/pack_clip_cull/prefix_stable3.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T vs_6_0 -pack_prefix_stable %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T vs_6_0 -pack_prefix_stable %s | FileCheck %s // CHECK: ; Output signature: // CHECK: ; Name Index Mask Register SysValue Format Used diff --git a/tools/clang/test/CodeGenHLSL/batch/declarations/resources/constant_buffers/array1.hlsl b/tools/clang/test/CodeGenHLSL/batch/declarations/resources/constant_buffers/array1.hlsl index a9a572fb5..d0faa2932 100644 --- a/tools/clang/test/CodeGenHLSL/batch/declarations/resources/constant_buffers/array1.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/declarations/resources/constant_buffers/array1.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T ps_6_0 %s | FileCheck %s // CHECK: cbuffer $Globals diff --git a/tools/clang/test/CodeGenHLSL/batch/misc/sig-bool-as-uint.hlsl b/tools/clang/test/CodeGenHLSL/batch/misc/sig-bool-as-uint.hlsl index b99775662..6009bdca3 100644 --- a/tools/clang/test/CodeGenHLSL/batch/misc/sig-bool-as-uint.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/misc/sig-bool-as-uint.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -E main -T ps_6_0 %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -E main -T ps_6_0 %s | FileCheck %s // make sure bool maps to uint in signature // CHECK: ; BOOL 0 x 0 NONE uint diff --git a/tools/clang/test/CodeGenHLSL/batch/shader_stages/raytracing/subobjects_raytracingPipelineConfig1.hlsl b/tools/clang/test/CodeGenHLSL/batch/shader_stages/raytracing/subobjects_raytracingPipelineConfig1.hlsl index 27f7aa1c1..b763f8b5c 100644 --- a/tools/clang/test/CodeGenHLSL/batch/shader_stages/raytracing/subobjects_raytracingPipelineConfig1.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/shader_stages/raytracing/subobjects_raytracingPipelineConfig1.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -T lib_6_3 %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -T lib_6_3 %s | FileCheck %s // CHECK: ; GlobalRootSignature grs = { <48 bytes> }; // CHECK: ; StateObjectConfig soc = { STATE_OBJECT_FLAG_ALLOW_LOCAL_DEPENDENCIES_ON_EXTERNAL_DEFINITIONS | STATE_OBJECT_FLAG_ALLOW_STATE_OBJECT_ADDITIONS }; diff --git a/tools/clang/test/CodeGenHLSL/batch/validation/rawbufferstore_uav.hlsl b/tools/clang/test/CodeGenHLSL/batch/validation/rawbufferstore_uav.hlsl index 3e1403322..8498ed179 100644 --- a/tools/clang/test/CodeGenHLSL/batch/validation/rawbufferstore_uav.hlsl +++ b/tools/clang/test/CodeGenHLSL/batch/validation/rawbufferstore_uav.hlsl @@ -1,4 +1,4 @@ -// RUN: %dxc -T vs_6_2 -E main %s | FileCheck %s +// RUN: %dxilver 1.5 | %dxc -T vs_6_2 -E main %s | FileCheck %s // CHECK: store should be on uav resource