From 0b05fe33c82ee301c134f5b9a87a596aa47121c8 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 10 Nov 2022 14:19:20 -0800 Subject: Fix inlining pass. (#2506) * Fix inlining pass. * Add more check against corner cases. * Revise comments. * Fixes. * Fix premake script. * Fixes. Co-authored-by: Yong He --- tests/language-feature/general-inline.slang | 2 +- tests/language-feature/simple-inline.slang | 34 ++++++++++++++++++++++ .../simple-inline.slang.expected.txt | 4 +++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 tests/language-feature/simple-inline.slang create mode 100644 tests/language-feature/simple-inline.slang.expected.txt (limited to 'tests') diff --git a/tests/language-feature/general-inline.slang b/tests/language-feature/general-inline.slang index 168f24faa..f68687e53 100644 --- a/tests/language-feature/general-inline.slang +++ b/tests/language-feature/general-inline.slang @@ -1,4 +1,4 @@ -// multi-level-break.slang +// general-inline.slang //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST(compute):COMPARE_COMPUTE: -vk -shaderobj diff --git a/tests/language-feature/simple-inline.slang b/tests/language-feature/simple-inline.slang new file mode 100644 index 000000000..8203f489b --- /dev/null +++ b/tests/language-feature/simple-inline.slang @@ -0,0 +1,34 @@ +// simple-inline.slang + +//TEST(compute):COMPARE_COMPUTE: -shaderobj +//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj + +[ForceInline] +int test(int r) +{ + return r+2; +} + +[ForceInline] +void testVoid(int r, out int result) +{ + if (r == 0) + { + result = 2; + return; + } + result = r + 3; +} + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(1, 1, 1)] +void computeMain(int3 dispatchThreadID: SV_DispatchThreadID) +{ + outputBuffer[0] = test(dispatchThreadID.x); + int rs; + testVoid(dispatchThreadID.x + 2, rs); + outputBuffer[1] = rs; +} diff --git a/tests/language-feature/simple-inline.slang.expected.txt b/tests/language-feature/simple-inline.slang.expected.txt new file mode 100644 index 000000000..0a0140e23 --- /dev/null +++ b/tests/language-feature/simple-inline.slang.expected.txt @@ -0,0 +1,4 @@ +2 +5 +0 +0 \ No newline at end of file -- cgit v1.2.3