diff options
Diffstat (limited to 'tests/compute')
7 files changed, 97 insertions, 25 deletions
diff --git a/tests/compute/matrix-layout-structured-buffer.slang b/tests/compute/matrix-layout-structured-buffer.slang index 36596424d..bb7dbb381 100644 --- a/tests/compute/matrix-layout-structured-buffer.slang +++ b/tests/compute/matrix-layout-structured-buffer.slang @@ -1,18 +1,9 @@ // matrix-layout-structured-buffer.slang -// This test is set up to confirm that `StructuredBuffer` types are -// always laid out column-major by fxc/dxc, even when row-major layout has been -// requested globally. -// -// This behavior should be considered a bug in Slang because either: -// -// 1. we should report reflection layout information that acknowledges this behavior, or -// 2. we should alter our HLSL output passed to fxc/dxc to provide consistent -// behavior that matches our reflection data. -// -// For now this test exists to document the situation. It's output can/should -// be updated if we decide to fix the underlying problem by taking option (2). -// +// This test confirms that we apply the matrix layout +// mode requested by the user, even in the case of structured +// buffers of matrices, where fxc/dxc do *not* respect +// the matrix layout mode by default. //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-column-major diff --git a/tests/compute/matrix-layout-structured-buffer.slang.1.expected.txt b/tests/compute/matrix-layout-structured-buffer.slang.1.expected.txt new file mode 100644 index 000000000..18d8be654 --- /dev/null +++ b/tests/compute/matrix-layout-structured-buffer.slang.1.expected.txt @@ -0,0 +1,12 @@ +80010300 +90111301 +88060B02 +95160C03 +81020404 +910F1405 +86070906 +96170D07 +82000508 +8F101209 +87080A0A +97150E0B diff --git a/tests/compute/matrix-layout-structured-buffer.slang.2.expected.txt b/tests/compute/matrix-layout-structured-buffer.slang.2.expected.txt new file mode 100644 index 000000000..fd74697bb --- /dev/null +++ b/tests/compute/matrix-layout-structured-buffer.slang.2.expected.txt @@ -0,0 +1,12 @@ +80040100 +91151201 +8A020B02 +8F130C03 +84080504 +950D1605 +82060306 +93171007 +88000908 +8D110E09 +860A070A +970F140B
\ No newline at end of file diff --git a/tests/compute/matrix-layout-structured-buffer.slang.3.expected.txt b/tests/compute/matrix-layout-structured-buffer.slang.3.expected.txt new file mode 100644 index 000000000..18d8be654 --- /dev/null +++ b/tests/compute/matrix-layout-structured-buffer.slang.3.expected.txt @@ -0,0 +1,12 @@ +80010300 +90111301 +88060B02 +95160C03 +81020404 +910F1405 +86070906 +96170D07 +82000508 +8F101209 +87080A0A +97150E0B diff --git a/tests/compute/matrix-layout-structured-buffer.slang.expected.txt b/tests/compute/matrix-layout-structured-buffer.slang.expected.txt index 18d8be654..e0bbef746 100644 --- a/tests/compute/matrix-layout-structured-buffer.slang.expected.txt +++ b/tests/compute/matrix-layout-structured-buffer.slang.expected.txt @@ -1,12 +1,12 @@ -80010300 -90111301 -88060B02 -95160C03 -81020404 -910F1405 -86070906 -96170D07 -82000508 -8F101209 -87080A0A -97150E0B +80040100 +91151201 +8A020B02 +8F130C03 +84080504 +950D1605 +82060306 +93171007 +88000908 +8D110E09 +860A070A +970F140B diff --git a/tests/compute/structured-buffer-of-matrices.slang b/tests/compute/structured-buffer-of-matrices.slang new file mode 100644 index 000000000..e87cf8c59 --- /dev/null +++ b/tests/compute/structured-buffer-of-matrices.slang @@ -0,0 +1,41 @@ +// structured-buffer-of-matrices.slang + +// This test confirms that we have implemented a workaround +// for the issue where the Microsoft HLSL compilers (fxc and dxc) +// ignore matrix layout settings (like `#pragma pack_matrx`) +// in the case where a matrix type is used directly in a +// structured buffer (e.g., `StructuredBuffer<float4x4>`), +// and instead always use column-major layout. +// +// With our fix in place, this test should produce the same +// output on all targets, correctly respecting the user's +// request for row-major layout via command-line option. + +//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -compile-arg -O3 -xslang -matrix-layout-row-major +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -xslang -matrix-layout-row-major +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -xslang -matrix-layout-row-major + +// Note: we are using a buffer of floating-point matrices, but fill it with integer +// data, to allow this test to work on the Vulkan targets, which do not currently +// support integer matrices, because of GLSL limitations. + +//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15], stride=64):name gInput +RWStructuredBuffer<float4x4> gInput; + + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gOutput +RWStructuredBuffer<int> gOutput; + +int test(int val) +{ + return asint(gInput[0][(val+1)&3][(val+3)&3]); +} + +[numthreads(4, 1, 1)] +void computeMain(uint3 tid : SV_DispatchThreadID) +{ + int value = tid.x; + value = test(value); + gOutput[tid.x] = value; +}
\ No newline at end of file diff --git a/tests/compute/structured-buffer-of-matrices.slang.expected.txt b/tests/compute/structured-buffer-of-matrices.slang.expected.txt new file mode 100644 index 000000000..1e59fb2f4 --- /dev/null +++ b/tests/compute/structured-buffer-of-matrices.slang.expected.txt @@ -0,0 +1,4 @@ +7 +8 +D +2 |