From 6b44630afe4ff180ba608142e9515abcd369775e Mon Sep 17 00:00:00 2001 From: Ronan Date: Thu, 3 Apr 2025 06:17:15 +0200 Subject: Fixed generic interface specialization crashes (#6601): (#6688) * Fixed generic interface specialization crashes: - Add an export decoration to specialized generic interfaces. * Fixed generic interface specialization crashes: - Add an export decoration to specialized generic interfaces. - Use getTypeNameHint(...) instead of a manual mangler. * In cloneInstDecorationsAndChildren: specialize all linkage decorations, not just the exports. - If a linkage decoration is already present, it is not specialized and replaced by the specialized one. - If a specialization uses the TypeNameHint, sanitize it to be used as an identifier. - Use the identifier name sanitizer from slang-mangle. * Added tests/generics/generic-interface-linkage.slang - See #6601 and #6688 --- .../generics/generic-interface-linkage.slang | 81 ++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 tests/language-feature/generics/generic-interface-linkage.slang (limited to 'tests/language-feature') diff --git a/tests/language-feature/generics/generic-interface-linkage.slang b/tests/language-feature/generics/generic-interface-linkage.slang new file mode 100644 index 000000000..657ac3d48 --- /dev/null +++ b/tests/language-feature/generics/generic-interface-linkage.slang @@ -0,0 +1,81 @@ + +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +interface IGetter +{ + float get(uint id); +} + +struct GetterImpl : IGetter +{ + float[8] data; + + __init(float[8] data) + { this.data = data; } + + float get(uint id) + { + return data[id]; + } +} +interface IFoo +{ + associatedtype Params : IGetter; + + Params bar(); +} + +struct FooImpl1: IFoo<8> +{ + typealias Params = GetterImpl; + + __init() + { } + + Params bar() + { + float x = outputBuffer[0]; + return GetterImpl({x, x+1, x+2, x+3, x+4, x+5, x+6, x+7}); + } +} + +struct FooImpl2: IFoo<8> +{ + typealias Params = GetterImpl; + + __init() + { } + + Params bar() + { + float x = 2 * outputBuffer[0]; + return GetterImpl({x+3, x+5, x+7, x+9, x+11, x+13, x+15, x+17}); + } +} + +IFoo<8> getFoo(uint id) +{ + if (id == 0) + return FooImpl1(); + else + return FooImpl2(); +} + +float doThing(uint id) +{ + IFoo<8> foo = getFoo(id); + return foo.bar().get(0); +} + +[shader("compute")] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + // CHECK: 0 + outputBuffer[0] = doThing(0); + // CHECK: 3 + outputBuffer[1] = doThing(1); +} \ No newline at end of file -- cgit v1.2.3