From 3d7552582bb4d4e330b1e90bcdced046cebd140c Mon Sep 17 00:00:00 2001 From: Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:24:18 -0400 Subject: Fix bug with overload resolution under nested generics (#3107) * Add test for generic param inference bug for nested generics * Change description & simplify test * Add expected file * Check parent decl before unifying type parameters --- tests/compute/generics-overload-2.slang | 38 ++++++++++++++++++++++ .../compute/generics-overload-2.slang.expected.txt | 4 +++ 2 files changed, 42 insertions(+) create mode 100644 tests/compute/generics-overload-2.slang create mode 100644 tests/compute/generics-overload-2.slang.expected.txt (limited to 'tests') diff --git a/tests/compute/generics-overload-2.slang b/tests/compute/generics-overload-2.slang new file mode 100644 index 000000000..8ca55ce7d --- /dev/null +++ b/tests/compute/generics-overload-2.slang @@ -0,0 +1,38 @@ +//TEST(smoke,compute):COMPARE_COMPUTE: -shaderobj +//TEST(smoke,compute):COMPARE_COMPUTE:-cpu -shaderobj + +// Test overload resolution for nested generic definitions + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + + +__generic +struct Foo +{ + T test(uint index, T x) + { + return __realCast(1.f); + } + + __generic + T test(vector index, T x) + { + return __realCast(2.f); + } +}; + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + uint tid = dispatchThreadID.x + 2; + + Foo obj; + + float outVal = obj.test(tid, 0.f); + outputBuffer[0] = outVal; // Expect: 1 + + float outVal2 = obj.test(uint2(tid, tid), 0.f); + outputBuffer[1] = outVal2; // Expect: 2 +} \ No newline at end of file diff --git a/tests/compute/generics-overload-2.slang.expected.txt b/tests/compute/generics-overload-2.slang.expected.txt new file mode 100644 index 000000000..b7ad1e4a8 --- /dev/null +++ b/tests/compute/generics-overload-2.slang.expected.txt @@ -0,0 +1,4 @@ +3F800000 +40000000 +0 +0 -- cgit v1.2.3