summaryrefslogtreecommitdiffstats
path: root/tests/compute
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2024-02-20 12:24:00 -0800
committerGitHub <noreply@github.com>2024-02-20 12:24:00 -0800
commit4d20fd329956ac89408b1628a8291fea01bc9a6d (patch)
tree8e62d9c1ec05142fd25d0b31073fdb56d44691b0 /tests/compute
parent8e9b61e3bac69dbb37a1451b62302e688a017ced (diff)
Refactor compiler option representations. (#3598)
* Refactor compiler option representation. * Fix binary compatibility. * Add a test for specifying compiler options at link time. * Fix binary compatibility. * Fix binary compatibility. * Fix backward compatibility on matrix layout. * Fix. * Fix. * Fix. * Fix gfx. * Fix gfx. * Fix dynamic dispatch. * Polish.
Diffstat (limited to 'tests/compute')
-rw-r--r--tests/compute/column-major.slang6
-rw-r--r--tests/compute/column-major.slang.expected.txt6
-rw-r--r--tests/compute/disable-warning.slang3
3 files changed, 7 insertions, 8 deletions
diff --git a/tests/compute/column-major.slang b/tests/compute/column-major.slang
index ae4c008e9..dd89c5f41 100644
--- a/tests/compute/column-major.slang
+++ b/tests/compute/column-major.slang
@@ -3,9 +3,9 @@
// Unfortunately CPU and CUDA only work with row layout, so they have to be disabled here.
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -compile-arg -O3 -shaderobj
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -dx12 -shaderobj
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj -Xslang -matrix-layout-column-major
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -dx12 -shaderobj -Xslang -matrix-layout-column-major
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -Xslang -matrix-layout-column-major
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj
// This data is in column major layout order....
diff --git a/tests/compute/column-major.slang.expected.txt b/tests/compute/column-major.slang.expected.txt
index 14ab70a6a..1e24f3253 100644
--- a/tests/compute/column-major.slang.expected.txt
+++ b/tests/compute/column-major.slang.expected.txt
@@ -1,5 +1,5 @@
type: float
+11.000000
+22.000000
+33.000000
1.000000
-2.000000
-3.000000
-141.000000
diff --git a/tests/compute/disable-warning.slang b/tests/compute/disable-warning.slang
index 2fd2bde61..61c952358 100644
--- a/tests/compute/disable-warning.slang
+++ b/tests/compute/disable-warning.slang
@@ -1,4 +1,3 @@
-//TEST(smoke,compute):COMPARE_COMPUTE: -shaderobj -Xslang... -Wno-unrecommended-implicit-conversion -X.
//TEST(smoke,compute):COMPARE_COMPUTE:-cpu -shaderobj -Xslang... -Wno-unrecommended-implicit-conversion -X.
// Test to check warning disable
@@ -11,7 +10,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
{
uint v = dispatchThreadID.x;
// This coercion loses data and would normally produce a warning
- int v1 = v;
+ int16_t v1 = v;
outputBuffer[dispatchThreadID.x] = v1;
} \ No newline at end of file