From 0f55649cc1aa8ad3218b7f8ba7b1eabdd2ec6526 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Fri, 8 Dec 2017 14:23:12 -0800 Subject: Cleanups to `ParameterBlock` behavior. (#304) * Cleanups to `ParameterBlock` behavior. These add some more realistic tests using the `ParameterBlock` support, and show that it can work with the "rewriter" mode. Unfortunately, this code does *not* currently work with the rewriter + the IR at once. That will need to be fixed in a follow-on change, because I now see that the root problem is pretty ugly. * cleanup --- .../compute/rewriter-parameter-block-complex.hlsl | 32 ++++++++++++++++++++ ...ter-parameter-block-complex.hlsl.1.expected.txt | 4 +++ ...riter-parameter-block-complex.hlsl.expected.txt | 4 +++ .../compute/rewriter-parameter-block-complex.slang | 21 +++++++++++++ tests/compute/rewriter-parameter-block.hlsl | 34 ++++++++++++++++++++++ .../rewriter-parameter-block.hlsl.1.expected.txt | 4 +++ .../rewriter-parameter-block.hlsl.expected.txt | 4 +++ tests/compute/rewriter-parameter-block.slang | 25 ++++++++++++++++ 8 files changed, 128 insertions(+) create mode 100644 tests/compute/rewriter-parameter-block-complex.hlsl create mode 100644 tests/compute/rewriter-parameter-block-complex.hlsl.1.expected.txt create mode 100644 tests/compute/rewriter-parameter-block-complex.hlsl.expected.txt create mode 100644 tests/compute/rewriter-parameter-block-complex.slang create mode 100644 tests/compute/rewriter-parameter-block.hlsl create mode 100644 tests/compute/rewriter-parameter-block.hlsl.1.expected.txt create mode 100644 tests/compute/rewriter-parameter-block.hlsl.expected.txt create mode 100644 tests/compute/rewriter-parameter-block.slang (limited to 'tests/compute') diff --git a/tests/compute/rewriter-parameter-block-complex.hlsl b/tests/compute/rewriter-parameter-block-complex.hlsl new file mode 100644 index 000000000..4dc312f95 --- /dev/null +++ b/tests/compute/rewriter-parameter-block-complex.hlsl @@ -0,0 +1,32 @@ +//TEST(compute):HLSL_COMPUTE:-xslang -no-checking +//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir + +// Doesn't work with IR yet. +//DISABLED_TEST(compute):HLSL_COMPUTE:-xslang -no-checking -xslang -use-ir + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out + +//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(0) +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1) + +//TEST_INPUT:cbuffer(data=[4096]):dxbinding(1),glbinding(1) +//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4):dxbinding(2),glbinding(2) + +// Test that we can declare a `ParameterBlock<...>` type as a shader +// parameter (potentially nested inside a `cbuffer`) and use it in +// shader code processed by the "rewriter" + +import rewriter_parameter_block_complex; + +RWStructuredBuffer outputBuffer : register(u0); + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + uint tid = dispatchThreadID.x; + int inVal = tid; + + int outVal = test(gA, inVal) + test(gB, inVal); + + outputBuffer[tid] = outVal; +} \ No newline at end of file diff --git a/tests/compute/rewriter-parameter-block-complex.hlsl.1.expected.txt b/tests/compute/rewriter-parameter-block-complex.hlsl.1.expected.txt new file mode 100644 index 000000000..883f72716 --- /dev/null +++ b/tests/compute/rewriter-parameter-block-complex.hlsl.1.expected.txt @@ -0,0 +1,4 @@ +1110 +1121 +1132 +1143 diff --git a/tests/compute/rewriter-parameter-block-complex.hlsl.expected.txt b/tests/compute/rewriter-parameter-block-complex.hlsl.expected.txt new file mode 100644 index 000000000..883f72716 --- /dev/null +++ b/tests/compute/rewriter-parameter-block-complex.hlsl.expected.txt @@ -0,0 +1,4 @@ +1110 +1121 +1132 +1143 diff --git a/tests/compute/rewriter-parameter-block-complex.slang b/tests/compute/rewriter-parameter-block-complex.slang new file mode 100644 index 000000000..826dd5047 --- /dev/null +++ b/tests/compute/rewriter-parameter-block-complex.slang @@ -0,0 +1,21 @@ +// rewriter-parameter-block.slang +//TEST_IGNORE_FILE: + +// A type that mixes uniform and resource fields +struct Data +{ + int val; + RWStructuredBuffer buf; +}; + +// A function that uses that type +int test(Data data, int val) +{ + return data.val + data.buf[val]; +} + +cbuffer C +{ + ParameterBlock gA; + Data gB; +}; diff --git a/tests/compute/rewriter-parameter-block.hlsl b/tests/compute/rewriter-parameter-block.hlsl new file mode 100644 index 000000000..0cc06cc10 --- /dev/null +++ b/tests/compute/rewriter-parameter-block.hlsl @@ -0,0 +1,34 @@ +//TEST(compute):HLSL_COMPUTE:-xslang -no-checking +//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir + +// Doesn't work with rewriter + IR yet. +//DISABLED_TEST(compute):HLSL_COMPUTE:-xslang -no-checking -xslang -use-ir + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out + +//TEST_INPUT:cbuffer(data=[256]):dxbinding(0),glbinding(0) +//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1) + +//TEST_INPUT:cbuffer(data=[65536]):dxbinding(1),glbinding(1) + +//TEST_INPUT:cbuffer(data=[4096]):dxbinding(2),glbinding(2) +//TEST_INPUT:ubuffer(data=[16 32 48 64], stride=4):dxbinding(2),glbinding(2) + +// Test that we can declare a `ParameterBlock<...>` type as a shader +// parameter (potentially nested inside a `cbuffer`) and use it in +// shader code processed by the "rewriter" + +import rewriter_parameter_block; + +RWStructuredBuffer outputBuffer : register(u0); + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + uint tid = dispatchThreadID.x; + int inVal = tid; + + int outVal = test(gA, inVal) + test(gB, inVal) + extra; + + outputBuffer[tid] = outVal; +} \ No newline at end of file diff --git a/tests/compute/rewriter-parameter-block.hlsl.1.expected.txt b/tests/compute/rewriter-parameter-block.hlsl.1.expected.txt new file mode 100644 index 000000000..479b9e0da --- /dev/null +++ b/tests/compute/rewriter-parameter-block.hlsl.1.expected.txt @@ -0,0 +1,4 @@ +11110 +11121 +11132 +11143 diff --git a/tests/compute/rewriter-parameter-block.hlsl.expected.txt b/tests/compute/rewriter-parameter-block.hlsl.expected.txt new file mode 100644 index 000000000..479b9e0da --- /dev/null +++ b/tests/compute/rewriter-parameter-block.hlsl.expected.txt @@ -0,0 +1,4 @@ +11110 +11121 +11132 +11143 diff --git a/tests/compute/rewriter-parameter-block.slang b/tests/compute/rewriter-parameter-block.slang new file mode 100644 index 000000000..830f22f4e --- /dev/null +++ b/tests/compute/rewriter-parameter-block.slang @@ -0,0 +1,25 @@ +// rewriter-parameter-block.slang +//TEST_IGNORE_FILE: + +// A type that mixes uniform and resource fields +struct Data +{ + int val; + RWStructuredBuffer buf; +}; + +// A function that uses that type +int test(Data data, int val) +{ + return data.val + data.buf[val]; +} + +// A global-scope parameter block of the mixed type +ParameterBlock gA; + +// A constant buffer declaration containing the mixed type +cbuffer C +{ + int extra; + ParameterBlock gB; +}; -- cgit v1.2.3