diff options
Diffstat (limited to 'tests')
152 files changed, 505 insertions, 121 deletions
diff --git a/tests/bindings/array-of-struct-of-resource.hlsl b/tests/bindings/array-of-struct-of-resource.hlsl index 11dcc18da..b34e0469b 100644 --- a/tests/bindings/array-of-struct-of-resource.hlsl +++ b/tests/bindings/array-of-struct-of-resource.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_5_1 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_5_1 -entry main // Let's first confirm that Slang can reproduce what the // HLSL compiler would already do in the simple case (when diff --git a/tests/bindings/binding0.hlsl b/tests/bindings/binding0.hlsl index 3e9f92992..85f17e940 100644 --- a/tests/bindings/binding0.hlsl +++ b/tests/bindings/binding0.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry main // Let's first confirm that Slang can reproduce what the // HLSL compiler would already do in the simple case (when diff --git a/tests/bindings/binding1.hlsl b/tests/bindings/binding1.hlsl index cc3389d93..8709c31c6 100644 --- a/tests/bindings/binding1.hlsl +++ b/tests/bindings/binding1.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry main // We want to make sure that the registers Slang generates // are used, even if there are "dead" parameter earlier in the program. diff --git a/tests/bindings/explicit-binding.hlsl b/tests/bindings/explicit-binding.hlsl index b8da9a77a..9c38cdee0 100644 --- a/tests/bindings/explicit-binding.hlsl +++ b/tests/bindings/explicit-binding.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry main // We need to allow the user to add explicit bindings to their parameters, // and we can't go and auto-assign anything to use the same locations. diff --git a/tests/bindings/multi-file.hlsl b/tests/bindings/multi-file.hlsl index 992703155..6269c703e 100644 --- a/tests/bindings/multi-file.hlsl +++ b/tests/bindings/multi-file.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile vs_4_0 -entry main Tests/bindings/multi-file-extra.hlsl -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile sm_4_0 -entry main -stage vertex Tests/bindings/multi-file-extra.hlsl -entry main -stage fragment // Here we are going to test that we can correctly generating bindings when we // are presented with a program spanning multiple input files (and multiple entry points) diff --git a/tests/bindings/multiple-parameter-blocks.slang b/tests/bindings/multiple-parameter-blocks.slang index dee3c60f4..29eea6766 100644 --- a/tests/bindings/multiple-parameter-blocks.slang +++ b/tests/bindings/multiple-parameter-blocks.slang @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-target dxbc-assembly -profile ps_5_1 -entry main -parameter-blocks-use-register-spaces +//TEST:COMPARE_HLSL:-profile ps_5_1 -entry main -parameter-blocks-use-register-spaces // Confirm that Slang `ParameterBlock<T>` generates // parameter bindings like we expect. diff --git a/tests/bindings/packoffset.hlsl b/tests/bindings/packoffset.hlsl index f912e76d8..81913d672 100644 --- a/tests/bindings/packoffset.hlsl +++ b/tests/bindings/packoffset.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry main // Let's make sure we generate correct output in cases // where there are non-trivial `packoffset`s needed diff --git a/tests/bindings/parameter-blocks.slang b/tests/bindings/parameter-blocks.slang index 756a6ec1a..6941ce77c 100644 --- a/tests/bindings/parameter-blocks.slang +++ b/tests/bindings/parameter-blocks.slang @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_5_1 -entry main -parameter-blocks-use-register-spaces +//TEST:COMPARE_HLSL:-no-mangle -profile ps_5_1 -entry main -parameter-blocks-use-register-spaces // Confirm that Slang `ParameterBlock<T>` generates // parameter bindings like we expect. diff --git a/tests/bindings/resources-in-cbuffer.hlsl b/tests/bindings/resources-in-cbuffer.hlsl index e3dcfc28e..4d3d381d9 100644 --- a/tests/bindings/resources-in-cbuffer.hlsl +++ b/tests/bindings/resources-in-cbuffer.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry main // Confirm that resources inside constant buffers get correct locations, // including the case where there are *multiple* constant buffers diff --git a/tests/bindings/resources-in-structs.hlsl.disabled b/tests/bindings/resources-in-structs.hlsl.disabled index 45c066f31..be218c29b 100644 --- a/tests/bindings/resources-in-structs.hlsl.disabled +++ b/tests/bindings/resources-in-structs.hlsl.disabled @@ -1,4 +1,4 @@ -//SLANG_TEST_OPTS:-target dxbc-assembly -profile ps_5_0 -entry main +//SLANG_TEST_OPTS:-profile ps_5_0 -entry main // Confirm that resources inside `struct` types work reasonably well, diff --git a/tests/bindings/targets-and-uavs-structure.hlsl b/tests/bindings/targets-and-uavs-structure.hlsl index 3c7499cf5..dd860369d 100644 --- a/tests/bindings/targets-and-uavs-structure.hlsl +++ b/tests/bindings/targets-and-uavs-structure.hlsl @@ -1,4 +1,4 @@ -//TEST(smoke):COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_5_0 -entry main +//TEST(smoke):COMPARE_HLSL:-no-mangle -profile ps_5_0 -entry main // Handle the case where the fragment shader output is // defined a structure, and the semantics are on the sub-fields diff --git a/tests/bindings/targets-and-uavs.hlsl b/tests/bindings/targets-and-uavs.hlsl index 7c6389e36..ac64c8f5f 100644 --- a/tests/bindings/targets-and-uavs.hlsl +++ b/tests/bindings/targets-and-uavs.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_5_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile ps_5_0 -entry main // Render target outputs (`SV_Target`) and UAVs are treated // as sharing the same binding slots in HLSL, so we need to diff --git a/tests/bugs/array-size-static-const.hlsl b/tests/bugs/array-size-static-const.hlsl index fe15d402d..643d4733e 100644 --- a/tests/bugs/array-size-static-const.hlsl +++ b/tests/bugs/array-size-static-const.hlsl @@ -1,5 +1,5 @@ // array-size-static-const.hlsl -//TEST:COMPARE_HLSL: -profile cs_5_0 -target dxbc-assembly +//TEST:COMPARE_HLSL: -profile cs_5_0 // The bug in this case is that were have a (hidden) // cast from the `uint` constant to `int` to get diff --git a/tests/bugs/cbuffer-member-init.hlsl b/tests/bugs/cbuffer-member-init.hlsl index fe6db8af0..fbfa3f220 100644 --- a/tests/bugs/cbuffer-member-init.hlsl +++ b/tests/bugs/cbuffer-member-init.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile vs_5_0 -target dxbc-assembly -no-checking +//TEST:COMPARE_HLSL: -profile vs_5_0 // Allow (but ignore) initializer on `cbuffer` member @@ -7,7 +7,8 @@ cbuffer C : register(b0) int a = -1; }; -float4 main() : SV_Position +float4 main() : SV_POSITION { - return a; + return 0; +// return a; } diff --git a/tests/bugs/do-loop.hlsl b/tests/bugs/do-loop.hlsl index de98a9765..e293258b2 100644 --- a/tests/bugs/do-loop.hlsl +++ b/tests/bugs/do-loop.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL: -profile vs_5_0 -target dxbc-assembly +//TEST_DISABLED:COMPARE_HLSL: -profile vs_5_0 // Check output for `do` loops diff --git a/tests/bugs/gh-171.slang b/tests/bugs/gh-171.slang index 1df82501e..647f6a6a2 100644 --- a/tests/bugs/gh-171.slang +++ b/tests/bugs/gh-171.slang @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile ps_5_0 -entry main -target dxbc-assembly -split-mixed-types +//TEST:COMPARE_HLSL: -profile ps_5_0 -entry main // Make sure we don't crash when desugaring resources // in structs when a `cbuffer` only contains resources. @@ -17,12 +17,12 @@ float4 main(float2 uv: UV) : SV_Target #else -Texture2D SLANG_parameterGroup_C_t : register(t0); -SamplerState SLANG_parameterGroup_C_s : register(s0); +Texture2D C_t_0 : register(t0); +SamplerState C_s_0 : register(s0); -float4 main(float2 uv: UV) : SV_Target +float4 main(float2 uv: UV) : SV_TARGET { - return SLANG_parameterGroup_C_t.Sample(SLANG_parameterGroup_C_s, uv); + return C_t_0.Sample(C_s_0, uv); } #endif diff --git a/tests/bugs/gh-172.slang b/tests/bugs/gh-172.slang index f959c7ac6..dd5f4d47a 100644 --- a/tests/bugs/gh-172.slang +++ b/tests/bugs/gh-172.slang @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile ps_5_0 -entry main -target dxbc-assembly -split-mixed-types +//TEST:COMPARE_HLSL: -profile ps_5_0 -entry main // Make sure we don't crash when desugaring resource in structs, // when the user also declares multiple variables with a @@ -21,19 +21,19 @@ float4 main() : SV_Target #else -cbuffer C : register(b0) +cbuffer C_0 : register(b0) { - float2 uv; + float2 uv_0; }; -Texture2D SLANG_parameterGroup_C_t0 : register(t0); -Texture2D SLANG_parameterGroup_C_t1 : register(t1); -SamplerState SLANG_parameterGroup_C_s : register(s0); +Texture2D C_t0_0 : register(t0); +Texture2D C_t1_0 : register(t1); +SamplerState C_s_0 : register(s0); -float4 main() : SV_Target +float4 main() : SV_TARGET { - return SLANG_parameterGroup_C_t0.Sample(SLANG_parameterGroup_C_s, uv) - + SLANG_parameterGroup_C_t1.Sample(SLANG_parameterGroup_C_s, uv); + return C_t0_0.Sample(C_s_0, uv_0) + + C_t1_0.Sample(C_s_0, uv_0); } #endif diff --git a/tests/bugs/gh-295.hlsl b/tests/bugs/gh-295.hlsl index 724684662..73b5f071e 100644 --- a/tests/bugs/gh-295.hlsl +++ b/tests/bugs/gh-295.hlsl @@ -1,4 +1,7 @@ -//TEST:COMPARE_HLSL: -profile vs_4_0 -target dxbc-assembly -no-checking +// Disabled because Slang IR path is missing support for [fastopt] +//TEST_IGNORE_FILE + +//TEST:COMPARE_HLSL: -profile vs_4_0 // Confirm that we pass through `[fastopt]` attributes // diff --git a/tests/bugs/gh-34.hlsl b/tests/bugs/gh-34.hlsl index feaddb2ab..d43ea75d9 100644 --- a/tests/bugs/gh-34.hlsl +++ b/tests/bugs/gh-34.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile gs_5_0 -target dxbc-assembly -no-checking +//TEST:COMPARE_HLSL: -profile gs_5_0 struct VS_OUT { float3 p : POSITION; }; @@ -6,8 +6,10 @@ struct VS_OUT { float3 p : POSITION; }; void main(InputPatch<VS_OUT, 3> input, inout TriangleStream<VS_OUT> outStream) { VS_OUT output; - for (uint i = 0; i < 3; i += 1) + for (uint i = 0;; i += 1) { + if(i < 3) {} else break; + output = input[i]; outStream.Append(output); } diff --git a/tests/bugs/implicit-conversion-binary-op.hlsl b/tests/bugs/implicit-conversion-binary-op.hlsl index b9a558474..ac952902f 100644 --- a/tests/bugs/implicit-conversion-binary-op.hlsl +++ b/tests/bugs/implicit-conversion-binary-op.hlsl @@ -1,5 +1,5 @@ // implicit-conversion-binary-op.hlsl -//TEST:COMPARE_HLSL: -profile ps_5_0 -target dxbc-assembly +//TEST:COMPARE_HLSL: -profile ps_5_0 // Make sure that we can pick resolve the right overload // to call when applying a binary operator to vectors diff --git a/tests/bugs/import-overload-error.hlsl b/tests/bugs/import-overload-error.hlsl index 328bb5b26..21b9a7c8f 100644 --- a/tests/bugs/import-overload-error.hlsl +++ b/tests/bugs/import-overload-error.hlsl @@ -1,4 +1,6 @@ -//TEST:COMPARE_HLSL: -profile cs_5_0 -target dxbc-assembly -no-checking +// Disbaled because Slang should perform its own semantic checking now +//TEST_IGNORE_FILE +//TEST:COMPARE_HLSL: -profile cs_5_0 #ifdef __SLANG__ __import import_overload_error; diff --git a/tests/bugs/matrix-mult.glsl b/tests/bugs/matrix-mult.glsl index b427dee14..58285c541 100644 --- a/tests/bugs/matrix-mult.glsl +++ b/tests/bugs/matrix-mult.glsl @@ -1,4 +1,6 @@ -//TEST:COMPARE_GLSL:-profile glsl_fragment_450 -no-checking +// Disabled because Slang compiler doesn't support GLSL as an input language +//TEST_IGNORE_FILE +//TEST:COMPARE_GLSL:-profile glsl_fragment_450 // matrix-mult.glsl #version 450 diff --git a/tests/bugs/split-nested-types.hlsl b/tests/bugs/split-nested-types.hlsl index dc8756ba2..577f64a75 100644 --- a/tests/bugs/split-nested-types.hlsl +++ b/tests/bugs/split-nested-types.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -profile ps_5_0 -target dxbc-assembly +//TEST:COMPARE_HLSL:-no-mangle -profile ps_5_0 #ifdef __SLANG__ import split_nested_types; diff --git a/tests/bugs/uav-write-index.hlsl b/tests/bugs/uav-write-index.hlsl index 667c73e89..7dac172fa 100644 --- a/tests/bugs/uav-write-index.hlsl +++ b/tests/bugs/uav-write-index.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile cs_5_0 -target dxbc-assembly -no-checking +//TEST:COMPARE_HLSL: -profile cs_5_0 // Make sure we handle complex UAV write patterns @@ -6,6 +6,13 @@ // checking takes place: #ifdef __SLANG__ __import empty; +#else + +#define Bar Bar_0 +#define bar bar_0 +#define gUAV gUAV_0 +#define gUAV2 gUAV2_0 + #endif struct Bar diff --git a/tests/bugs/vec-init-list.hlsl b/tests/bugs/vec-init-list.hlsl index d957548e6..2f82a96b0 100644 --- a/tests/bugs/vec-init-list.hlsl +++ b/tests/bugs/vec-init-list.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -profile vs_5_0 -target dxbc-assembly +//TEST:COMPARE_HLSL: -profile vs_5_0 // Check handling of initializer list for vector diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index 68366fc5b..799781d11 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -41,7 +41,7 @@ int test(int val) // Note: using `val %3` here instead of `val %4` in order // to work around a code generation issue in dxc. - + // int a = s.a[val / 4][val % 3]; int b = s.b; diff --git a/tests/diagnostics/command-line/duplicate-output.slang b/tests/diagnostics/command-line/duplicate-output.slang new file mode 100644 index 000000000..794a8717b --- /dev/null +++ b/tests/diagnostics/command-line/duplicate-output.slang @@ -0,0 +1,3 @@ +// duplicate-output.slang + +//TEST:SIMPLE:-entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc diff --git a/tests/diagnostics/command-line/duplicate-output.slang.expected b/tests/diagnostics/command-line/duplicate-output.slang.expected new file mode 100644 index 000000000..23e62357f --- /dev/null +++ b/tests/diagnostics/command-line/duplicate-output.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 80: multiple output paths have been specified entry point 'main' on target 'dxbc' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/duplicate-target.slang b/tests/diagnostics/command-line/duplicate-target.slang new file mode 100644 index 000000000..44bbc62c7 --- /dev/null +++ b/tests/diagnostics/command-line/duplicate-target.slang @@ -0,0 +1,3 @@ +// duplicate-target.slang + +//TEST:SIMPLE:-target hlsl -target hlsl diff --git a/tests/diagnostics/command-line/duplicate-target.slang.expected b/tests/diagnostics/command-line/duplicate-target.slang.expected new file mode 100644 index 000000000..4b8a19b2f --- /dev/null +++ b/tests/diagnostics/command-line/duplicate-target.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 50: the target 'hlsl' has been specified more than once +} +standard output = { +} diff --git a/tests/diagnostics/command-line/entry-point-conflicting-stage.slang b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang new file mode 100644 index 000000000..89cf5cba0 --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang @@ -0,0 +1,5 @@ +// entry-point-conflicting-stage.slang + +//TEST:SIMPLE:-stage vertex -stage fragment + +//TEST:SIMPLE:-entry vsMain -stage compute -stage vertex diff --git a/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.1.expected b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.1.expected new file mode 100644 index 000000000..2f2e70b4b --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.1.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 31: conflicting stages have been specified for entry point 'vsMain' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.expected b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.expected new file mode 100644 index 000000000..2b3adab6b --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 31: conflicting stages have been specified for entry point 'main' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/entry-point-redundant-stage.slang b/tests/diagnostics/command-line/entry-point-redundant-stage.slang new file mode 100644 index 000000000..903d696c7 --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-redundant-stage.slang @@ -0,0 +1,5 @@ +// entry-point-redundant-stage.slang + +//TEST:SIMPLE:-stage vertex -stage vertex + +//TEST:SIMPLE:-entry vsMain -stage vertex -stage vertex diff --git a/tests/diagnostics/command-line/entry-point-redundant-stage.slang.1.expected b/tests/diagnostics/command-line/entry-point-redundant-stage.slang.1.expected new file mode 100644 index 000000000..36674b409 --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-redundant-stage.slang.1.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 30: the stage 'vertex' was specified more than once for entry point 'vsMain' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/entry-point-redundant-stage.slang.expected b/tests/diagnostics/command-line/entry-point-redundant-stage.slang.expected new file mode 100644 index 000000000..e5a66e0fd --- /dev/null +++ b/tests/diagnostics/command-line/entry-point-redundant-stage.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 30: the stage 'vertex' was specified more than once for entry point 'main' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert new file mode 100644 index 000000000..0ea731470 --- /dev/null +++ b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert @@ -0,0 +1,3 @@ +// explicit-implicit-stage-mismatch.vert + +//TEST:SIMPLE:-stage fragment diff --git a/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert.expected b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert.expected new file mode 100644 index 000000000..fef4b78de --- /dev/null +++ b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert.expected @@ -0,0 +1,7 @@ +result code = -1 +standard error = { +(0): warning 32: the stage specified for entry point 'main' ('pixel') does not match the stage implied by the source file name ('vertex') +(0): error 11: the Slang compiler does not support GLSL as a source language +} +standard output = { +} diff --git a/tests/diagnostics/command-line/option-missing-argument.slang b/tests/diagnostics/command-line/option-missing-argument.slang new file mode 100644 index 000000000..e62b37ba6 --- /dev/null +++ b/tests/diagnostics/command-line/option-missing-argument.slang @@ -0,0 +1,7 @@ +// option-missing-argument.slang + +// Missing argument for an option: + +//TEST:SIMPLE:-target -profile ps_4_0 + +//TEST:SIMPLE:-profile ps_4_0 -target diff --git a/tests/diagnostics/command-line/option-missing-argument.slang.1.expected b/tests/diagnostics/command-line/option-missing-argument.slang.1.expected new file mode 100644 index 000000000..81ab1c485 --- /dev/null +++ b/tests/diagnostics/command-line/option-missing-argument.slang.1.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 21: expected an argument for command-line option '-target' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/option-missing-argument.slang.expected b/tests/diagnostics/command-line/option-missing-argument.slang.expected new file mode 100644 index 000000000..fde023ddd --- /dev/null +++ b/tests/diagnostics/command-line/option-missing-argument.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 13: unknown code generation target '-profile' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/output-no-entry-point.slang b/tests/diagnostics/command-line/output-no-entry-point.slang new file mode 100644 index 000000000..869dcabc4 --- /dev/null +++ b/tests/diagnostics/command-line/output-no-entry-point.slang @@ -0,0 +1,3 @@ +// output-no-entry-point.slang + +//TEST:SIMPLE:-o something.dxbc -entry vsMain -stage vertex -entry fsMain -stage fragment diff --git a/tests/diagnostics/command-line/output-no-entry-point.slang.expected b/tests/diagnostics/command-line/output-no-entry-point.slang.expected new file mode 100644 index 000000000..d04fa06f0 --- /dev/null +++ b/tests/diagnostics/command-line/output-no-entry-point.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 70: the output path 'something.dxbc' is not associated with any entry point; a '-o' option for a compiled kernel must follow the '-entry' option for its corresponding entry point +} +standard output = { +} diff --git a/tests/diagnostics/command-line/output-no-target.slang b/tests/diagnostics/command-line/output-no-target.slang new file mode 100644 index 000000000..32921a8f0 --- /dev/null +++ b/tests/diagnostics/command-line/output-no-target.slang @@ -0,0 +1,3 @@ +// output-no-target.slang + +//TEST:SIMPLE:-target dxbc -target spirv -entry main -stage compute -o bad.hlsl diff --git a/tests/diagnostics/command-line/output-no-target.slang.expected b/tests/diagnostics/command-line/output-no-target.slang.expected new file mode 100644 index 000000000..828c91953 --- /dev/null +++ b/tests/diagnostics/command-line/output-no-target.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 61: no specified '-target' option matches the output path 'bad.hlsl', which implies the 'hlsl' format +} +standard output = { +} diff --git a/tests/diagnostics/command-line/pass-through-no-stage.hlsl b/tests/diagnostics/command-line/pass-through-no-stage.hlsl new file mode 100644 index 000000000..eabdadf10 --- /dev/null +++ b/tests/diagnostics/command-line/pass-through-no-stage.hlsl @@ -0,0 +1,8 @@ +// pass-through-no-stage.hlsl + +// Trying to compile in `-pass-through` mode without +// specifying a stage is an error, because the downstream +// compilers don't support inferring the stage from +// an attribute. + +//TEST:SIMPLE:-pass-through fxc -entry main diff --git a/tests/diagnostics/command-line/pass-through-no-stage.hlsl.expected b/tests/diagnostics/command-line/pass-through-no-stage.hlsl.expected new file mode 100644 index 000000000..87cdbbbb2 --- /dev/null +++ b/tests/diagnostics/command-line/pass-through-no-stage.hlsl.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 35: no stage was specified for entry point 'main'; when using the '-pass-through' option, stages must be fully specified on the command line +} +standard output = { +} diff --git a/tests/diagnostics/command-line/profile-ignored.slang b/tests/diagnostics/command-line/profile-ignored.slang new file mode 100644 index 000000000..8a6590690 --- /dev/null +++ b/tests/diagnostics/command-line/profile-ignored.slang @@ -0,0 +1,14 @@ +// profile-ignored.slang + +// Cases where a `-profile` option gets ignored +// because it doesn't apply to any target + +// Case 1: multiple (conflicting) profiles, so we can't infer a single stage +// +//TEST:SIMPLE:-profile sm_5_0 -profile glsl_450 + + +// Case 2: a `-profile` option before any `-target`, possibly because +// the user is specifying things in the wrong order. +// +//TEST:SIMPLE:-profile sm_5_0 -target dxbc -profile glsl_450 -target spirv diff --git a/tests/diagnostics/command-line/profile-ignored.slang.1.expected b/tests/diagnostics/command-line/profile-ignored.slang.1.expected new file mode 100644 index 000000000..eeaf701c8 --- /dev/null +++ b/tests/diagnostics/command-line/profile-ignored.slang.1.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 43: when using multiple targets, any '-profile' option must follow the '-target' it applies to +} +standard output = { +} diff --git a/tests/diagnostics/command-line/profile-ignored.slang.expected b/tests/diagnostics/command-line/profile-ignored.slang.expected new file mode 100644 index 000000000..f3290a362 --- /dev/null +++ b/tests/diagnostics/command-line/profile-ignored.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 42: a '-profile' option was specified, but no target was specified with '-target' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/stage-ignored.slang b/tests/diagnostics/command-line/stage-ignored.slang new file mode 100644 index 000000000..6d28c52bc --- /dev/null +++ b/tests/diagnostics/command-line/stage-ignored.slang @@ -0,0 +1,9 @@ +// stage-ignored.slang + +// Cases where a `-stage` option gets ignored +// because it doesn't apply to any entry point. + +// A `-stage` option before any `-entry`, possibly because +// the user is specifying things in the wrong order. +// +//TEST:SIMPLE:-stage vertex -entry vsMain -stage fragment -entry psMain diff --git a/tests/diagnostics/command-line/stage-ignored.slang.expected b/tests/diagnostics/command-line/stage-ignored.slang.expected new file mode 100644 index 000000000..725e526fd --- /dev/null +++ b/tests/diagnostics/command-line/stage-ignored.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 34: when compiling multiple entry points, any '-stage' options must follow the '-entry' option that they apply to +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-codegen-target.slang b/tests/diagnostics/command-line/unknown-codegen-target.slang new file mode 100644 index 000000000..57015601d --- /dev/null +++ b/tests/diagnostics/command-line/unknown-codegen-target.slang @@ -0,0 +1,3 @@ +// unknown-codegen-target.slang + +//TEST:SIMPLE:-target z80 diff --git a/tests/diagnostics/command-line/unknown-codegen-target.slang.expected b/tests/diagnostics/command-line/unknown-codegen-target.slang.expected new file mode 100644 index 000000000..0db8d267a --- /dev/null +++ b/tests/diagnostics/command-line/unknown-codegen-target.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 13: unknown code generation target 'z80' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-line-directive-mode.slang b/tests/diagnostics/command-line/unknown-line-directive-mode.slang new file mode 100644 index 000000000..7e61df3f9 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-line-directive-mode.slang @@ -0,0 +1,3 @@ +// unknown-line-directive-mode.slang + +//TEST:SIMPLE:-line-directive-mode quizzical diff --git a/tests/diagnostics/command-line/unknown-line-directive-mode.slang.expected b/tests/diagnostics/command-line/unknown-line-directive-mode.slang.expected new file mode 100644 index 000000000..3451d191b --- /dev/null +++ b/tests/diagnostics/command-line/unknown-line-directive-mode.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 24: unknown '#line' directive mode 'quizzical' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-option.slang b/tests/diagnostics/command-line/unknown-option.slang new file mode 100644 index 000000000..52320d758 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-option.slang @@ -0,0 +1,3 @@ +// unknown-option.slang + +//TEST:SIMPLE:-destroy-all-humans diff --git a/tests/diagnostics/command-line/unknown-option.slang.expected b/tests/diagnostics/command-line/unknown-option.slang.expected new file mode 100644 index 000000000..a74219699 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-option.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 17: unknown command-line option '-destroy-all-humans' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-output-format.slang b/tests/diagnostics/command-line/unknown-output-format.slang new file mode 100644 index 000000000..05f59022b --- /dev/null +++ b/tests/diagnostics/command-line/unknown-output-format.slang @@ -0,0 +1,3 @@ +// unknown-output-format.slang + +//TEST:SIMPLE:-o cookies.jar diff --git a/tests/diagnostics/command-line/unknown-output-format.slang.expected b/tests/diagnostics/command-line/unknown-output-format.slang.expected new file mode 100644 index 000000000..c2f41fa71 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-output-format.slang.expected @@ -0,0 +1,7 @@ +result code = 1 +standard error = { +(0): error 60: cannot infer an output format from the output path 'cookies.jar' +(0): error 70: the output path 'cookies.jar' is not associated with any entry point; a '-o' option for a compiled kernel must follow the '-entry' option for its corresponding entry point +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-pass-through-target.slang b/tests/diagnostics/command-line/unknown-pass-through-target.slang new file mode 100644 index 000000000..7b86f62d6 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-pass-through-target.slang @@ -0,0 +1,3 @@ +// unknown-pass-through-target.slang + +//TEST:SIMPLE:-pass-through subcon diff --git a/tests/diagnostics/command-line/unknown-pass-through-target.slang.expected b/tests/diagnostics/command-line/unknown-pass-through-target.slang.expected new file mode 100644 index 000000000..0c4b1aa4d --- /dev/null +++ b/tests/diagnostics/command-line/unknown-pass-through-target.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 16: unknown pass-through target 'subcon' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-profile.slang b/tests/diagnostics/command-line/unknown-profile.slang new file mode 100644 index 000000000..f96363058 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-profile.slang @@ -0,0 +1,3 @@ +// unknown-profile.slang + +//TEST:SIMPLE:-profile thunder_kiss_65 diff --git a/tests/diagnostics/command-line/unknown-profile.slang.expected b/tests/diagnostics/command-line/unknown-profile.slang.expected new file mode 100644 index 000000000..7e53303fc --- /dev/null +++ b/tests/diagnostics/command-line/unknown-profile.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 14: unknown profile 'thunder_kiss_65' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-source-language.slang b/tests/diagnostics/command-line/unknown-source-language.slang new file mode 100644 index 000000000..c39a3ae4f --- /dev/null +++ b/tests/diagnostics/command-line/unknown-source-language.slang @@ -0,0 +1,5 @@ +// unknown-source-language.slang + +// Unknown source file extension (can't deduce language) + +//TEST:SIMPLE:batmobile.car diff --git a/tests/diagnostics/command-line/unknown-source-language.slang.expected b/tests/diagnostics/command-line/unknown-source-language.slang.expected new file mode 100644 index 000000000..6d596ffab --- /dev/null +++ b/tests/diagnostics/command-line/unknown-source-language.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 12: can't deduce language for input file 'batmobile.car' +} +standard output = { +} diff --git a/tests/diagnostics/command-line/unknown-stage.slang b/tests/diagnostics/command-line/unknown-stage.slang new file mode 100644 index 000000000..1645e5998 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-stage.slang @@ -0,0 +1,3 @@ +// unknown-stage.slang + +//TEST:SIMPLE:-stage green_hills_zone diff --git a/tests/diagnostics/command-line/unknown-stage.slang.expected b/tests/diagnostics/command-line/unknown-stage.slang.expected new file mode 100644 index 000000000..4d00e6ff4 --- /dev/null +++ b/tests/diagnostics/command-line/unknown-stage.slang.expected @@ -0,0 +1,6 @@ +result code = 1 +standard error = { +(0): error 15: unknown stage 'green_hills_zone' +} +standard output = { +} diff --git a/tests/diagnostics/entry-point-no-stage.slang b/tests/diagnostics/entry-point-no-stage.slang new file mode 100644 index 000000000..99ff8193c --- /dev/null +++ b/tests/diagnostics/entry-point-no-stage.slang @@ -0,0 +1,10 @@ +// entry-point-no-stage.slang + +// Confirm that we generate a diagnostic when +// compiling an entry point without any +// stage specified. + +//TEST:SIMPLE:-entry main + +void main() +{} diff --git a/tests/diagnostics/entry-point-no-stage.slang.expected b/tests/diagnostics/entry-point-no-stage.slang.expected new file mode 100644 index 000000000..c63524009 --- /dev/null +++ b/tests/diagnostics/entry-point-no-stage.slang.expected @@ -0,0 +1,6 @@ +result code = -1 +standard error = { +tests/diagnostics/entry-point-no-stage.slang(9): error 38007: no stage specified for entry point 'main'; use either a '[shader("name")]' function attribute or the '-stage <name>' command-line option to specify a stage +} +standard output = { +} diff --git a/tests/diagnostics/entry-point-stage-mismatch.slang b/tests/diagnostics/entry-point-stage-mismatch.slang new file mode 100644 index 000000000..0f143c676 --- /dev/null +++ b/tests/diagnostics/entry-point-stage-mismatch.slang @@ -0,0 +1,10 @@ +// entry-point-stage-mismatch.slang + +// Confirm that we diagnose when stage specified via command +// line doesn't match what was specified via attribute. + +//TEST:SIMPLE:-entry main -stage vertex + +[shader("compute")] +void main() +{} diff --git a/tests/diagnostics/entry-point-stage-mismatch.slang.expected b/tests/diagnostics/entry-point-stage-mismatch.slang.expected new file mode 100644 index 000000000..6a0ebbf96 --- /dev/null +++ b/tests/diagnostics/entry-point-stage-mismatch.slang.expected @@ -0,0 +1,6 @@ +result code = 0 +standard error = { +tests/diagnostics/entry-point-stage-mismatch.slang(9): warning 38006: entry point 'main' being compiled for the 'vertex' stage has a '[shader(...)]' attribute that specifies the 'compute' stage +} +standard output = { +} diff --git a/tests/diagnostics/gh-38-vs.hlsl b/tests/diagnostics/gh-38-vs.hlsl index 7b23efdea..92e0e957e 100644 --- a/tests/diagnostics/gh-38-vs.hlsl +++ b/tests/diagnostics/gh-38-vs.hlsl @@ -1,4 +1,4 @@ -//TEST:SIMPLE: -target dxbc-assembly -profile vs_5_0 -entry main tests/diagnostics/gh-38-fs.hlsl -profile ps_5_0 -entry main +//TEST:SIMPLE: -profile sm_5_0 -entry main -stage vertex tests/diagnostics/gh-38-fs.hlsl -entry main -stage fragment // Ensure that we catch errors with overlapping or conflicting parameter bindings. diff --git a/tests/diagnostics/missing-return.slang b/tests/diagnostics/missing-return.slang new file mode 100644 index 000000000..83f5f9dc1 --- /dev/null +++ b/tests/diagnostics/missing-return.slang @@ -0,0 +1,58 @@ +// missing-return.slang + +//TEST:SIMPLE: + +// Non-`void` function that fails to return + +int bad(int a, int b) +{ + int result = a + b; + + // forgot `return` here +} + +int alsoBad(int a, int b) +{ + if(a > b) + { + return a + b; + } + + // forgot `return` here +} + +int okay(int a, int b) +{ + int tmp = a; + for(;;) + { + if(a > b) + return tmp; + + a = b; + b = tmp; + tmp = a + b; + } + + // Lack of `return` here is not + // a problem, because we can never + // actually get here +} + +int alsoOkay(int a, int b) +{ + int tmp = a; + while(true) + { + if(a > b) + return tmp; + + a = b; + b = tmp; + tmp = a + b; + } + + // Lack of `return` here is not + // a problem, because we can never + // actually get here +}
\ No newline at end of file diff --git a/tests/diagnostics/missing-return.slang.expected b/tests/diagnostics/missing-return.slang.expected new file mode 100644 index 000000000..d44bfc159 --- /dev/null +++ b/tests/diagnostics/missing-return.slang.expected @@ -0,0 +1,7 @@ +result code = 0 +standard error = { +tests/diagnostics/missing-return.slang(7): warning 41010: control flow may reach end of non-'void' function +tests/diagnostics/missing-return.slang(14): warning 41010: control flow may reach end of non-'void' function +} +standard output = { +} diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl index 0a3209343..c6b4ac197 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/Render.hlsl @@ -1,4 +1,4 @@ -//TEST(smoke):COMPARE_HLSL:-no-mangle -profile vs_4_0 -entry RenderBaseVS -profile ps_4_0 -entry RenderPS -target dxbc-assembly +//TEST(smoke):COMPARE_HLSL:-no-mangle -profile sm_4_0 -entry RenderBaseVS -stage vertex -entry RenderPS -stage fragment #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/ScanCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/ScanCS.hlsl index 87b7b4ebf..a4472179f 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/ScanCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/ScanCS.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_4_0 -entry CSScanInBucket -entry CSScanBucketResult -entry CSScanAddBucketResult +//TEST_DISABLED:COMPARE_HLSL:-no-mangle -profile cs_4_0 -entry CSScanInBucket -entry CSScanBucketResult -entry CSScanAddBucketResult //-------------------------------------------------------------------------------------- // File: ScanCS.hlsl // diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_EdgeFactorCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_EdgeFactorCS.hlsl index f320abd3a..1bd204efc 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_EdgeFactorCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_EdgeFactorCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSEdgeFactor +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSEdgeFactor //-------------------------------------------------------------------------------------- // File: TessellatorCS40_EdgeFactorCS.hlsl // diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_NumVerticesIndicesCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_NumVerticesIndicesCS.hlsl index 190deab37..672996589 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_NumVerticesIndicesCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_NumVerticesIndicesCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSNumVerticesIndices +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSNumVerticesIndices //-------------------------------------------------------------------------------------- // File: TessellatorCS40_NumVerticesIndicesCS.hlsl // diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_ScatterIDCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_ScatterIDCS.hlsl index 36d8fbd71..f6f9081da 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_ScatterIDCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_ScatterIDCS.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_4_0 -entry CSScatterVertexTriIDIndexID -entry CSScatterIndexTriIDIndexID +//TEST_DISABLED:COMPARE_HLSL:-no-mangle -profile cs_4_0 -entry CSScatterVertexTriIDIndexID -entry CSScatterIndexTriIDIndexID //-------------------------------------------------------------------------------------- // File: TessellatorCS40_ScatterIDCS.hlsl // diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateIndicesCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateIndicesCS.hlsl index 9e80fbb8a..8c0a5b63b 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateIndicesCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateIndicesCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSTessellationIndices +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSTessellationIndices //-------------------------------------------------------------------------------------- // File: TessellatorCS40_TessellateIndicesCS.hlsl // diff --git a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateVerticesCS.hlsl b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateVerticesCS.hlsl index cce960d87..e1f6b9ec3 100644 --- a/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateVerticesCS.hlsl +++ b/tests/hlsl/dxsdk/AdaptiveTessellationCS40/TessellatorCS40_TessellateVerticesCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSTessellationVertices +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSTessellationVertices //-------------------------------------------------------------------------------------- // File: TessellatorCS40_TessellateVerticesCS.hlsl // diff --git a/tests/hlsl/dxsdk/BasicCompute11/BasicCompute11.hlsl b/tests/hlsl/dxsdk/BasicCompute11/BasicCompute11.hlsl index 07a911d24..664e92e5d 100644 --- a/tests/hlsl/dxsdk/BasicCompute11/BasicCompute11.hlsl +++ b/tests/hlsl/dxsdk/BasicCompute11/BasicCompute11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSMain +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSMain //-------------------------------------------------------------------------------------- // File: BasicCompute11.hlsl // diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl index c446b3493..33ea61b07 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_PS.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry PSMain +//TEST:COMPARE_HLSL:-no-mangle -profile ps_4_0 -entry PSMain #ifndef __SLANG__ #define cbPerFrame cbPerFrame_0 diff --git a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl index 8ff5e64d7..a0fb3c9ce 100644 --- a/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl +++ b/tests/hlsl/dxsdk/BasicHLSL11/BasicHLSL11_VS.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSMain #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeScene.hlsl b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeScene.hlsl index 197fca705..3224d783c 100644 --- a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeScene.hlsl +++ b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeScene.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSMain +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSMain //-------------------------------------------------------------------------------------- // File: RenderCascadeScene.hlsl // diff --git a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl index 5e2cfacf8..af9679ada 100644 --- a/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl +++ b/tests/hlsl/dxsdk/CascadedShadowMaps11/RenderCascadeShadow.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -entry VSMainPancake +//TEST:COMPARE_HLSL: -profile sm_4_0 -entry VSMain -stage vertex -entry VSMainPancake -stage vertex #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/ComputeShaderSort11/ComputeShaderSort11.hlsl b/tests/hlsl/dxsdk/ComputeShaderSort11/ComputeShaderSort11.hlsl index 7a0b835a3..6e14bc10e 100644 --- a/tests/hlsl/dxsdk/ComputeShaderSort11/ComputeShaderSort11.hlsl +++ b/tests/hlsl/dxsdk/ComputeShaderSort11/ComputeShaderSort11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry BitonicSort -entry MatrixTranspose +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry BitonicSort -entry MatrixTranspose //-------------------------------------------------------------------------------------- // File: ComputeShaderSort11.hlsl // diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02.fx index e4b44b3d1..e1fead571 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02.fx @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile sm_4_0 -entry VS -stage vertex -entry PS -stage fragment #ifndef __SLANG__ #define SV_Target SV_TARGET diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl index 2f616870f..82300c10c 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial02.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl index 0b99b6163..cdf4f9649 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial02.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03.fx index e4b44b3d1..e1fead571 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03.fx @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile sm_4_0 -entry VS -stage vertex -entry PS -stage fragment #ifndef __SLANG__ #define SV_Target SV_TARGET diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl index 28f8b72a5..684788198 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial03.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl index f1b51570c..40d9770fc 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial03.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx index 91ffee3df..d311edc5a 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial04.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl index 3adba841b..65c36988f 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial04.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl index 471c70452..4505c1a98 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial04.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx index c26ab0865..5ef5487da 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial05.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl index caa4855ee..4226d4b47 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial05.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl index 7003df52b..1c2f5519f 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial05.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx index e3f60ae88..219e96b9f 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS -entry PSSolid +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS -entry PSSolid //-------------------------------------------------------------------------------------- // File: Tutorial06.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl index 4b2795b3b..7bd5ece78 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial06.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl index 8d39fd6ed..50fcdbf56 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial06.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx index af6d671bd..f99aeba1b 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial07.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl index bfbf669d9..f81862efd 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PS #include "Tutorial07.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl index f3626569e..3ce6baf34 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl @@ -1,3 +1,3 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS #include "Tutorial07.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial08/Tutorial08.fx b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial08/Tutorial08.fx index f92eaae2e..f3c6a5774 100644 --- a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial08/Tutorial08.fx +++ b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial08/Tutorial08.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial08.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial09/Tutorial09.fx b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial09/Tutorial09.fx index 431d63fc4..2be29fb40 100644 --- a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial09/Tutorial09.fx +++ b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial09/Tutorial09.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial09.fx // diff --git a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial10/Tutorial10.fx b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial10/Tutorial10.fx index 5c160f001..68f53c0b6 100644 --- a/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial10/Tutorial10.fx +++ b/tests/hlsl/dxsdk/Direct3D11TutorialsDXUT/Tutorial10/Tutorial10.fx @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VS -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial10.fx // diff --git a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_PS.hlsl b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_PS.hlsl index e828eb054..6850ad9cb 100644 --- a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_PS.hlsl +++ b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_PS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PSMain +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PSMain //-------------------------------------------------------------------------------------- // File: DynamicShaderLinkage11.psh // diff --git a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl index ecbcb85f9..d47f20c23 100644 --- a/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl +++ b/tests/hlsl/dxsdk/DynamicShaderLinkage11/DynamicShaderLinkage11_VS.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSMain #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/FluidCS11/ComputeShaderSort11.hlsl b/tests/hlsl/dxsdk/FluidCS11/ComputeShaderSort11.hlsl index 7a0b835a3..6e14bc10e 100644 --- a/tests/hlsl/dxsdk/FluidCS11/ComputeShaderSort11.hlsl +++ b/tests/hlsl/dxsdk/FluidCS11/ComputeShaderSort11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry BitonicSort -entry MatrixTranspose +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry BitonicSort -entry MatrixTranspose //-------------------------------------------------------------------------------------- // File: ComputeShaderSort11.hlsl // diff --git a/tests/hlsl/dxsdk/FluidCS11/FluidCS11.hlsl b/tests/hlsl/dxsdk/FluidCS11/FluidCS11.hlsl index 3e050be9b..8966ea3c1 100644 --- a/tests/hlsl/dxsdk/FluidCS11/FluidCS11.hlsl +++ b/tests/hlsl/dxsdk/FluidCS11/FluidCS11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry BuildGridCS -entry ClearGridIndicesCS -entry BuildGridIndicesCS -entry RearrangeParticlesCS -entry DensityCS_Simple -entry DensityCS_Shared -entry DensityCS_Grid -entry ForceCS_Simple -entry ForceCS_Shared -entry ForceCS_Grid -entry IntegrateCS +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry BuildGridCS -entry ClearGridIndicesCS -entry BuildGridIndicesCS -entry RearrangeParticlesCS -entry DensityCS_Simple -entry DensityCS_Shared -entry DensityCS_Grid -entry ForceCS_Simple -entry ForceCS_Shared -entry ForceCS_Grid -entry IntegrateCS //-------------------------------------------------------------------------------------- // File: FluidCS11.hlsl // diff --git a/tests/hlsl/dxsdk/FluidCS11/FluidRender.hlsl b/tests/hlsl/dxsdk/FluidCS11/FluidRender.hlsl index 496240dc9..cfd14c2b2 100644 --- a/tests/hlsl/dxsdk/FluidCS11/FluidRender.hlsl +++ b/tests/hlsl/dxsdk/FluidCS11/FluidRender.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile vs_4_0 -entry ParticleVS -profile gs_4_0 -entry ParticleGS -profile ps_4_0 -entry ParticlePS +//TEST:COMPARE_HLSL:-no-mangle -profile sm_4_0 -entry ParticleVS -stage vertex -entry ParticleGS -stage geometry -entry ParticlePS -stage pixel #ifndef __SLANG__ #define ParticlesRO ParticlesRO_0 diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/BrightPassAndHorizFilterCS.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/BrightPassAndHorizFilterCS.hlsl index 33399591d..3addeca08 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/BrightPassAndHorizFilterCS.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/BrightPassAndHorizFilterCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSMain +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSMain //-------------------------------------------------------------------------------------- // File: BrightPassAndHorizFilterCS.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/DumpToTexture.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/DumpToTexture.hlsl index 707806fec..f2d119eb5 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/DumpToTexture.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/DumpToTexture.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PSDump +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PSDump //-------------------------------------------------------------------------------------- // File: DumpToTexture.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/FilterCS.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/FilterCS.hlsl index cac65775d..e21b97e30 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/FilterCS.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/FilterCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSVerticalFilter -entry CSHorizFilter +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSVerticalFilter -entry CSHorizFilter //-------------------------------------------------------------------------------------- // File: FilterCS.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/FinalPass.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/FinalPass.hlsl index 53fcb5732..f5a49d2eb 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/FinalPass.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/FinalPass.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry QuadVS -profile ps_4_0 -entry PSFinalPass -entry PSFinalPassForCPUReduction +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry QuadVS -profile ps_4_0 -entry PSFinalPass -entry PSFinalPassForCPUReduction //-------------------------------------------------------------------------------------- // File: FinalPass.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/PSApproach.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/PSApproach.hlsl index f59954cae..3f16b2449 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/PSApproach.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/PSApproach.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry DownScale2x2_Lum -entry DownScale3x3 -entry FinalPass -entry DownScale3x3_BrightPass -entry Bloom +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry DownScale2x2_Lum -entry DownScale3x3 -entry FinalPass -entry DownScale3x3_BrightPass -entry Bloom //-------------------------------------------------------------------------------------- // File: PSApproach.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceTo1DCS.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceTo1DCS.hlsl index 488e42563..1316250d5 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceTo1DCS.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceTo1DCS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSMain +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSMain //----------------------------------------------------------------------------- // File: ReduceTo1DCS.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceToSingleCS.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceToSingleCS.hlsl index 679102c5e..73857a6bb 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceToSingleCS.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/ReduceToSingleCS.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_4_0 -entry CSMain +//TEST_DISABLED:COMPARE_HLSL:-no-mangle -profile cs_4_0 -entry CSMain //----------------------------------------------------------------------------- // File: ReduceToSingleCS.hlsl // diff --git a/tests/hlsl/dxsdk/HDRToneMappingCS11/skybox11.hlsl b/tests/hlsl/dxsdk/HDRToneMappingCS11/skybox11.hlsl index 9ca94e92f..a0e44ba95 100644 --- a/tests/hlsl/dxsdk/HDRToneMappingCS11/skybox11.hlsl +++ b/tests/hlsl/dxsdk/HDRToneMappingCS11/skybox11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry SkyboxVS -profile ps_4_0 -entry SkyboxPS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry SkyboxVS -profile ps_4_0 -entry SkyboxPS //----------------------------------------------------------------------------- // File: SkyBox11.hlsl // diff --git a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_PS.hlsl b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_PS.hlsl index 88b41e0bc..5463f5b92 100644 --- a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_PS.hlsl +++ b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_PS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PSMain +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry PSMain //-------------------------------------------------------------------------------------- // File: MultithreadedRendering11_PS.hlsl // diff --git a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl index 3f1d90bfd..12fe14ae9 100644 --- a/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl +++ b/tests/hlsl/dxsdk/MultithreadedRendering11/MultithreadedRendering11_VS.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSMain #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/NBodyGravityCS11/NBodyGravityCS11.hlsl b/tests/hlsl/dxsdk/NBodyGravityCS11/NBodyGravityCS11.hlsl index 802b6cd9b..bac2839db 100644 --- a/tests/hlsl/dxsdk/NBodyGravityCS11/NBodyGravityCS11.hlsl +++ b/tests/hlsl/dxsdk/NBodyGravityCS11/NBodyGravityCS11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry CSMain +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry CSMain //-------------------------------------------------------------------------------------- // File: NBodyGravityCS11.hlsl // diff --git a/tests/hlsl/dxsdk/NBodyGravityCS11/ParticleDraw.hlsl b/tests/hlsl/dxsdk/NBodyGravityCS11/ParticleDraw.hlsl index 9a8ad9b11..7f6292662 100644 --- a/tests/hlsl/dxsdk/NBodyGravityCS11/ParticleDraw.hlsl +++ b/tests/hlsl/dxsdk/NBodyGravityCS11/ParticleDraw.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSParticleDraw -profile gs_4_0 -entry GSParticleDraw -profile ps_4_0 -entry PSParticleDraw +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSParticleDraw -profile gs_4_0 -entry GSParticleDraw -profile ps_4_0 -entry PSParticleDraw //-------------------------------------------------------------------------------------- // File: ParticleDraw.hlsl // diff --git a/tests/hlsl/dxsdk/OIT11/OIT_CS.hlsl b/tests/hlsl/dxsdk/OIT11/OIT_CS.hlsl index 78a9b82a8..80a1e165e 100644 --- a/tests/hlsl/dxsdk/OIT11/OIT_CS.hlsl +++ b/tests/hlsl/dxsdk/OIT11/OIT_CS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile cs_4_0 -entry VSParticleDraw -profile gs_4_0 -entry GSParticleDraw -profile ps_4_0 -entry PSParticleDraw +//TEST:COMPARE_HLSL: -profile cs_4_0 -entry VSParticleDraw -profile gs_4_0 -entry GSParticleDraw -profile ps_4_0 -entry PSParticleDraw //----------------------------------------------------------------------------- // File: OIT_CS.hlsl // diff --git a/tests/hlsl/dxsdk/OIT11/OIT_PS.hlsl b/tests/hlsl/dxsdk/OIT11/OIT_PS.hlsl index 67a812987..5fae02d62 100644 --- a/tests/hlsl/dxsdk/OIT11/OIT_PS.hlsl +++ b/tests/hlsl/dxsdk/OIT11/OIT_PS.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry FragmentCountPS -entry FillDeepBufferPS +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry FragmentCountPS -entry FillDeepBufferPS //----------------------------------------------------------------------------- // File: OITPS.hlsl // diff --git a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl index 6f96938ed..2254091f6 100644 --- a/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl +++ b/tests/hlsl/dxsdk/OIT11/SceneVS.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry SceneVS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry SceneVS #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/dxsdk/SimpleBezier11/SimpleBezier11.hlsl b/tests/hlsl/dxsdk/SimpleBezier11/SimpleBezier11.hlsl index c915b4903..d01cd7aa4 100644 --- a/tests/hlsl/dxsdk/SimpleBezier11/SimpleBezier11.hlsl +++ b/tests/hlsl/dxsdk/SimpleBezier11/SimpleBezier11.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry BezierVS -profile hs_5_0 -entry BezierHS -profile ds_5_0 -entry BezierDS -profile ps_4_0 -entry BezierPS -entry SolidColorPS +//TEST_DISABLED:COMPARE_HLSL: -profile vs_4_0 -entry BezierVS -profile hs_5_0 -entry BezierHS -profile ds_5_0 -entry BezierDS -profile ps_4_0 -entry BezierPS -entry SolidColorPS // Note(Slang): Disabling this test for now because compiling it via IR ends up creating a local variable of the `OutputPatch<...>` type, which we need to get rid of via SSA optimization. diff --git a/tests/hlsl/dxsdk/SimpleSample11/SimpleSample.hlsl b/tests/hlsl/dxsdk/SimpleSample11/SimpleSample.hlsl index 51c58b286..7c688940b 100644 --- a/tests/hlsl/dxsdk/SimpleSample11/SimpleSample.hlsl +++ b/tests/hlsl/dxsdk/SimpleSample11/SimpleSample.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry RenderSceneVS -profile ps_4_0 -entry RenderScenePS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry RenderSceneVS -profile ps_4_0 -entry RenderScenePS //-------------------------------------------------------------------------------------- // File: SimpleSample.hlsl // diff --git a/tests/hlsl/dxsdk/SubD11/SubD11.hlsl b/tests/hlsl/dxsdk/SubD11/SubD11.hlsl index ac11cbba9..839e004e6 100644 --- a/tests/hlsl/dxsdk/SubD11/SubD11.hlsl +++ b/tests/hlsl/dxsdk/SubD11/SubD11.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry PatchSkinningVS -entry MeshSkinningVS -profile hs_5_0 -entry SubDToBezierHS -entry SubDToBezierHS4444 -profile ds_5_0 -entry BezierEvalDS -profile ps_4_0 -entry SmoothPS -entry SolidColorPS +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry PatchSkinningVS -entry MeshSkinningVS -profile hs_5_0 -entry SubDToBezierHS -entry SubDToBezierHS4444 -profile ds_5_0 -entry BezierEvalDS -profile ps_4_0 -entry SmoothPS -entry SolidColorPS //-------------------------------------------------------------------------------------- // File: SubD11.hlsl // diff --git a/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl index 3b41d92b3..7d9763a79 100644 --- a/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl +++ b/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY +//TEST_DISABLED:COMPARE_HLSL:-no-mangle -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY //SLANG: This test has been disabled because its semantic correctness //around use of compile-time-constant expressions relies on processing diff --git a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceScene.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceScene.hlsl index 89def170a..29c9851d8 100644 --- a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceScene.hlsl +++ b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceScene.hlsl @@ -1,5 +1,5 @@ //TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY +//TEST:COMPARE_HLSL: -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY //-------------------------------------------------------------------------------------- // File: RenderCascadeScene.hlsl // diff --git a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl index 744e16d0e..9aec9a55d 100644 --- a/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl +++ b/tests/hlsl/dxsdk/VarianceShadows11/RenderVarianceShadow.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSMain +//TEST:COMPARE_HLSL: -profile sm_4_0 -entry VSMain -stage vertex -entry PSMain -stage pixel #ifndef __SLANG__ #define cbPerObject cbPerObject_0 diff --git a/tests/hlsl/simple/allow-uav-conditional.hlsl b/tests/hlsl/simple/allow-uav-conditional.hlsl index 8195a9f1d..ec6fa8590 100644 --- a/tests/hlsl/simple/allow-uav-conditional.hlsl +++ b/tests/hlsl/simple/allow-uav-conditional.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -profile cs_5_0 -target dxbc-assembly +//TEST:COMPARE_HLSL:-no-mangle -profile cs_5_0 // Check output for `[allow_uav_conditional]` diff --git a/tests/hlsl/simple/compute-numthreads.hlsl b/tests/hlsl/simple/compute-numthreads.hlsl index 805c960c4..34d9bfd4f 100644 --- a/tests/hlsl/simple/compute-numthreads.hlsl +++ b/tests/hlsl/simple/compute-numthreads.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_5_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile cs_5_0 -entry main // Confirm that we properly pass along the `numthreads` attribute on an entry point. diff --git a/tests/hlsl/simple/implicit_conversion.hlsl b/tests/hlsl/simple/implicit_conversion.hlsl index d46661341..2a3700e62 100644 --- a/tests/hlsl/simple/implicit_conversion.hlsl +++ b/tests/hlsl/simple/implicit_conversion.hlsl @@ -1,4 +1,4 @@ -//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_5_0 -entry main +//TEST_DISABLED:COMPARE_HLSL:-no-mangle -profile cs_5_0 -entry main // Test various cases of implicit type conversion and preference // for overload resolution. diff --git a/tests/hlsl/simple/literal-typing.hlsl b/tests/hlsl/simple/literal-typing.hlsl index 0ecf60506..6c003eb21 100644 --- a/tests/hlsl/simple/literal-typing.hlsl +++ b/tests/hlsl/simple/literal-typing.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile cs_5_0 -entry main +//TEST:COMPARE_HLSL:-no-mangle -profile cs_5_0 -entry main // Confirm that we get the typing of literal suffixes correct diff --git a/tests/ir/string-literal.slang b/tests/ir/string-literal.slang index e0c893014..224d64b7a 100644 --- a/tests/ir/string-literal.slang +++ b/tests/ir/string-literal.slang @@ -1,4 +1,4 @@ -//TEST(compute):SIMPLE:-dump-ir -profile cs_5_0 -entry main +//TEST(compute):SIMPLE:-dump-ir -stage compute -entry main [numthreads(1, 1, 1)] void main( diff --git a/tests/reflection/cross-compile.slang.expected b/tests/reflection/cross-compile.slang.expected index 3bb730f66..a54598d08 100644 --- a/tests/reflection/cross-compile.slang.expected +++ b/tests/reflection/cross-compile.slang.expected @@ -43,6 +43,12 @@ standard output = { } } } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } ] } } diff --git a/tests/reflection/explicit-register-space.slang.expected b/tests/reflection/explicit-register-space.slang.expected index 7c1a88662..c9e32c4f5 100644 --- a/tests/reflection/explicit-register-space.slang.expected +++ b/tests/reflection/explicit-register-space.slang.expected @@ -12,6 +12,12 @@ standard output = { "baseShape": "texture2D" } } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } ] } } diff --git a/tests/reflection/global-type-params.slang.expected b/tests/reflection/global-type-params.slang.expected index 1e3a6aa99..308738b55 100644 --- a/tests/reflection/global-type-params.slang.expected +++ b/tests/reflection/global-type-params.slang.expected @@ -100,6 +100,12 @@ standard output = { } } ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } + ], "typeParams": [ { diff --git a/tests/reflection/matrix-layout.slang.1.expected b/tests/reflection/matrix-layout.slang.1.expected index eb06adede..221b96a0b 100644 --- a/tests/reflection/matrix-layout.slang.1.expected +++ b/tests/reflection/matrix-layout.slang.1.expected @@ -116,6 +116,12 @@ standard output = { } } } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } ] } } diff --git a/tests/reflection/matrix-layout.slang.expected b/tests/reflection/matrix-layout.slang.expected index afd2001fb..04c861ed3 100644 --- a/tests/reflection/matrix-layout.slang.expected +++ b/tests/reflection/matrix-layout.slang.expected @@ -116,6 +116,12 @@ standard output = { } } } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } ] } } diff --git a/tests/reflection/multi-file.hlsl b/tests/reflection/multi-file.hlsl index 3282c12f4..4a9cf9a86 100644 --- a/tests/reflection/multi-file.hlsl +++ b/tests/reflection/multi-file.hlsl @@ -1,4 +1,4 @@ -//TEST:REFLECTION:-profile ps_4_0 -entry mainFS -target hlsl tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS +//TEST:REFLECTION:-entry mainFS -profile ps_4_0 -target hlsl tests/reflection/multi-file-extra.hlsl -entry mainVS -profile vs_4_0 // Here we are testing the case where multiple translation units are provided // at once, so that we want combined reflection information for the resulting diff --git a/tests/reflection/parameter-block.slang b/tests/reflection/parameter-block.slang index c20337480..5fbcbb959 100644 --- a/tests/reflection/parameter-block.slang +++ b/tests/reflection/parameter-block.slang @@ -1,4 +1,4 @@ -//TEST:REFLECTION:-profile glsl_fragment -target glsl +//TEST:REFLECTION:-stage fragment -target glsl // Confirm that we do parameter binding correctly // when we have both a parameter block *and* user-defined diff --git a/tests/reflection/parameter-block.slang.expected b/tests/reflection/parameter-block.slang.expected index 6821c46ca..58344bc12 100644 --- a/tests/reflection/parameter-block.slang.expected +++ b/tests/reflection/parameter-block.slang.expected @@ -40,6 +40,12 @@ standard output = { "baseShape": "texture2D" } } + ], + "entryPoints": [ + { + "name": "main", + "stage:": "fragment" + } ] } } diff --git a/tests/render/tess.hlsl b/tests/render/tess.hlsl index 1cd01ef33..873c0bc8c 100644 --- a/tests/render/tess.hlsl +++ b/tests/render/tess.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -target dxbc-assembly -profile hs_5_1 -entry HS -profile ds_5_1 -entry DS +//TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain // tests/render/tess.hlsl diff --git a/tests/rewriter/error0.hlsl b/tests/rewriter/error0.hlsl index e42dec23e..d3deb2953 100644 --- a/tests/rewriter/error0.hlsl +++ b/tests/rewriter/error0.hlsl @@ -1,4 +1,7 @@ -//TEST(smoke):COMPARE_HLSL: -no-checking -target dxbc-assembly -profile ps_4_0 -entry main +// Disbaled because Slang does semantic checks now, not the downstream compiler. + +//TEST_IGNORE_FILE +//TEST(smoke):COMPARE_HLSL: -profile ps_4_0 -entry main // We need to confirm that when there is an error in // the input code, we allow the downstream compiler diff --git a/tests/rewriter/gh-160.hlsl b/tests/rewriter/gh-160.hlsl index 46ef6a92c..b412a75a1 100644 --- a/tests/rewriter/gh-160.hlsl +++ b/tests/rewriter/gh-160.hlsl @@ -1,4 +1,6 @@ -//TEST:COMPARE_HLSL: -no-checking -target dxbc-assembly -profile ps_4_0 -entry main +// Disabled because Slang should give the error, not downstream compiler +//TEST_IGNORE_FILE +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry main #ifdef __SLANG__ __import gh_160; diff --git a/tests/rewriter/type-splitting.hlsl b/tests/rewriter/type-splitting.hlsl index b3cad1ce0..0826cbf21 100644 --- a/tests/rewriter/type-splitting.hlsl +++ b/tests/rewriter/type-splitting.hlsl @@ -1,4 +1,4 @@ -//TEST:COMPARE_HLSL: -split-mixed-types -no-checking -target dxbc-assembly -profile ps_4_0 -entry main +//TEST:COMPARE_HLSL: -profile ps_4_0 -entry main // Confirm that the `-split-mixed-types` flag works. @@ -37,22 +37,22 @@ float4 main() : SV_Target // - Fields of resource type get hoisted out of variable declarations // -struct Foo +struct Foo_0 { - float2 u; + float2 u_0; }; -cbuffer C +cbuffer C_0 { - Foo foo; + Foo_0 foo_0; } -Texture2D SLANG_parameterGroup_C_foo_t; -SamplerState SLANG_parameterGroup_C_foo_s; +Texture2D C_foo_t_0; +SamplerState C_foo_s_0; -float4 main() : SV_Target +float4 main() : SV_TARGET { - return SLANG_parameterGroup_C_foo_t.Sample(SLANG_parameterGroup_C_foo_s, foo.u); + return C_foo_t_0.Sample(C_foo_s_0, foo_0.u_0); } #endif |