From 83514bd25160a9af91abc1b9acd7e44657447526 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 21 Sep 2020 08:27:10 -0700 Subject: Enable all dynamic dispatch tests on CUDA. (#1552) * Enable all dynamic dispatch tests on CUDA. * Fix expected cross-compile test results. --- tests/compute/dynamic-dispatch-10.slang | 2 +- tests/compute/dynamic-dispatch-11.slang | 2 +- tests/compute/dynamic-dispatch-12.slang | 2 +- tests/compute/dynamic-dispatch-13.slang | 2 +- tests/compute/dynamic-dispatch-2.slang | 2 +- tests/compute/dynamic-dispatch-3.slang | 2 +- tests/compute/dynamic-dispatch-4.slang | 2 +- tests/compute/dynamic-dispatch-5.slang | 2 +- tests/compute/dynamic-dispatch-6.slang | 2 +- tests/compute/dynamic-dispatch-7.slang | 2 +- tests/compute/dynamic-dispatch-8.slang | 2 +- tests/compute/dynamic-dispatch-9.slang | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/compute') diff --git a/tests/compute/dynamic-dispatch-10.slang b/tests/compute/dynamic-dispatch-10.slang index 19f734c47..db0ad8fc1 100644 --- a/tests/compute/dynamic-dispatch-10.slang +++ b/tests/compute/dynamic-dispatch-10.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for specializing a generic with // an existential value. diff --git a/tests/compute/dynamic-dispatch-11.slang b/tests/compute/dynamic-dispatch-11.slang index 18b416697..c21f88b7f 100644 --- a/tests/compute/dynamic-dispatch-11.slang +++ b/tests/compute/dynamic-dispatch-11.slang @@ -1,7 +1,7 @@ // Test using interface typed shader parameters with dynamic dispatch. //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization [anyValueSize(8)] interface IInterface diff --git a/tests/compute/dynamic-dispatch-12.slang b/tests/compute/dynamic-dispatch-12.slang index 67598033d..cd122ec56 100644 --- a/tests/compute/dynamic-dispatch-12.slang +++ b/tests/compute/dynamic-dispatch-12.slang @@ -1,7 +1,7 @@ // Test using interface typed shader parameters with dynamic dispatch. //TEST(compute):COMPARE_COMPUTE:-cpu -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda [anyValueSize(8)] interface IInterface diff --git a/tests/compute/dynamic-dispatch-13.slang b/tests/compute/dynamic-dispatch-13.slang index 723f42f52..4e523e483 100644 --- a/tests/compute/dynamic-dispatch-13.slang +++ b/tests/compute/dynamic-dispatch-13.slang @@ -1,7 +1,7 @@ // Test using interface typed shader parameters wrapped inside a `StructuredBuffer`. //TEST(compute):COMPARE_COMPUTE:-cpu -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda [anyValueSize(8)] interface IInterface diff --git a/tests/compute/dynamic-dispatch-2.slang b/tests/compute/dynamic-dispatch-2.slang index 1bbc8edf4..8fa96db23 100644 --- a/tests/compute/dynamic-dispatch-2.slang +++ b/tests/compute/dynamic-dispatch-2.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for static member functions // of associated type. diff --git a/tests/compute/dynamic-dispatch-3.slang b/tests/compute/dynamic-dispatch-3.slang index 2e1e2076a..851251ffd 100644 --- a/tests/compute/dynamic-dispatch-3.slang +++ b/tests/compute/dynamic-dispatch-3.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for static member functions // of associated type. diff --git a/tests/compute/dynamic-dispatch-4.slang b/tests/compute/dynamic-dispatch-4.slang index bc60df1b0..b2d20020e 100644 --- a/tests/compute/dynamic-dispatch-4.slang +++ b/tests/compute/dynamic-dispatch-4.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for generic-typed local variables. diff --git a/tests/compute/dynamic-dispatch-5.slang b/tests/compute/dynamic-dispatch-5.slang index c0a022325..88c26eee7 100644 --- a/tests/compute/dynamic-dispatch-5.slang +++ b/tests/compute/dynamic-dispatch-5.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for general `This` type. [anyValueSize(8)] diff --git a/tests/compute/dynamic-dispatch-6.slang b/tests/compute/dynamic-dispatch-6.slang index 99f6c9e82..8becc9381 100644 --- a/tests/compute/dynamic-dispatch-6.slang +++ b/tests/compute/dynamic-dispatch-6.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for generic-typed return values. [anyValueSize(8)] diff --git a/tests/compute/dynamic-dispatch-7.slang b/tests/compute/dynamic-dispatch-7.slang index a13062aa0..eb79f03ef 100644 --- a/tests/compute/dynamic-dispatch-7.slang +++ b/tests/compute/dynamic-dispatch-7.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for associated-typed return values // and local variables. diff --git a/tests/compute/dynamic-dispatch-8.slang b/tests/compute/dynamic-dispatch-8.slang index a2a93525e..440be385e 100644 --- a/tests/compute/dynamic-dispatch-8.slang +++ b/tests/compute/dynamic-dispatch-8.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for extential type parameters. diff --git a/tests/compute/dynamic-dispatch-9.slang b/tests/compute/dynamic-dispatch-9.slang index 786bb217b..d69707d5d 100644 --- a/tests/compute/dynamic-dispatch-9.slang +++ b/tests/compute/dynamic-dispatch-9.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -xslang -disable-specialization -//DISABLE_TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization +//TEST(compute):COMPARE_COMPUTE:-cuda -xslang -disable-specialization // Test dynamic dispatch code gen for initializing an extential value // from a generic value. -- cgit v1.2.3