From 4ad0470025da4e808c46023f9a2525febcf973a2 Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 23 Nov 2022 16:02:56 -0800 Subject: Fix issues around dynamic generic function and autodiff. (#2528) * Fix issues around dynamic generic function and autodiff. * Fix return type issue. * Fix type unification for generic `inout` parameter. * Fix. Co-authored-by: Yong He --- tests/autodiff/bool-return-val.slang | 28 +++++++++++++ tests/autodiff/bool-return-val.slang.expected.txt | 5 +++ tests/autodiff/dynamic-dispatch-generic-2.slang | 49 ++++++++++++++++++++++ .../dynamic-dispatch-generic-2.slang.expected.txt | 6 +++ tests/autodiff/dynamic-dispatch-generic.slang | 46 ++++++++++++++++++++ .../dynamic-dispatch-generic.slang.expected.txt | 6 +++ tests/autodiff/generic-autodiff-1.slang | 39 +++++++++++++++++ .../autodiff/generic-autodiff-1.slang.expected.txt | 6 +++ 8 files changed, 185 insertions(+) create mode 100644 tests/autodiff/bool-return-val.slang create mode 100644 tests/autodiff/bool-return-val.slang.expected.txt create mode 100644 tests/autodiff/dynamic-dispatch-generic-2.slang create mode 100644 tests/autodiff/dynamic-dispatch-generic-2.slang.expected.txt create mode 100644 tests/autodiff/dynamic-dispatch-generic.slang create mode 100644 tests/autodiff/dynamic-dispatch-generic.slang.expected.txt create mode 100644 tests/autodiff/generic-autodiff-1.slang create mode 100644 tests/autodiff/generic-autodiff-1.slang.expected.txt (limited to 'tests') diff --git a/tests/autodiff/bool-return-val.slang b/tests/autodiff/bool-return-val.slang new file mode 100644 index 000000000..a43495dd9 --- /dev/null +++ b/tests/autodiff/bool-return-val.slang @@ -0,0 +1,28 @@ +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +struct NonDiff +{ + float a; +} + +[ForwardDifferentiable] +bool myFunc(NonDiff fIn, inout float x) +{ + x = pow(x, fIn.a); + return x > 100.f; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID: SV_DispatchThreadID) +{ + float a = 10.0; + NonDiff fIn = { a }; + DifferentialPair dpx = DifferentialPair(4.f, 1.f); + bool res = __fwd_diff(myFunc)(fIn, dpx); + + outputBuffer[0] = res?1:0; +} \ No newline at end of file diff --git a/tests/autodiff/bool-return-val.slang.expected.txt b/tests/autodiff/bool-return-val.slang.expected.txt new file mode 100644 index 000000000..5fce3dc6d --- /dev/null +++ b/tests/autodiff/bool-return-val.slang.expected.txt @@ -0,0 +1,5 @@ +type: float +1.000000 +0.000000 +0.000000 +0.000000 \ No newline at end of file diff --git a/tests/autodiff/dynamic-dispatch-generic-2.slang b/tests/autodiff/dynamic-dispatch-generic-2.slang new file mode 100644 index 000000000..bbf7c7da1 --- /dev/null +++ b/tests/autodiff/dynamic-dispatch-generic-2.slang @@ -0,0 +1,49 @@ +// Test calling differentiable function through dynamic dispatch. + +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[anyValueSize(16)] +interface IInterface +{ + [ForwardDifferentiable] + float calc(float x); +} + +struct A : IInterface +{ + float z; + [ForwardDifferentiable] + float calc(float x) { return x * x * x; } +}; + +struct B : IInterface +{ + float z; + + [ForwardDifferentiable] + float calc(float x) { return x * x + z; } +}; + +[ForwardDifferentiable] +float sqr(T obj, float x) +{ + return obj.calc(x); +} + +//TEST_INPUT: type_conformance A:IInterface = 0 +//TEST_INPUT: type_conformance B:IInterface = 1 + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + var obj = createDynamicObject(dispatchThreadID.x, 0); // A + outputBuffer[0] = __fwd_diff(sqr)(obj, DifferentialPair(2.0, 1.0)).d; // A.calc, expect 12 + + obj = createDynamicObject(dispatchThreadID.x + 1, 0); // B + outputBuffer[1] = __fwd_diff(sqr)(obj, DifferentialPair(1.5, 1.0)).d; // B.calc, expect 3 +} diff --git a/tests/autodiff/dynamic-dispatch-generic-2.slang.expected.txt b/tests/autodiff/dynamic-dispatch-generic-2.slang.expected.txt new file mode 100644 index 000000000..8a664e432 --- /dev/null +++ b/tests/autodiff/dynamic-dispatch-generic-2.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +12.000000 +3.000000 +0.000000 +0.000000 +0.000000 diff --git a/tests/autodiff/dynamic-dispatch-generic.slang b/tests/autodiff/dynamic-dispatch-generic.slang new file mode 100644 index 000000000..37c37a745 --- /dev/null +++ b/tests/autodiff/dynamic-dispatch-generic.slang @@ -0,0 +1,46 @@ +// Test calling differentiable function through dynamic dispatch. + +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[anyValueSize(16)] +interface IInterface +{ + [ForwardDifferentiable] + static float calc(float x); +} + +struct A : IInterface +{ + [ForwardDifferentiable] + static float calc(float x) { return x * x * x; } +}; + +struct B : IInterface +{ + [ForwardDifferentiable] + static float calc(float x) { return x * x; } +}; + +[ForwardDifferentiable] +float sqr(T obj, float x) +{ + return obj.calc(x); +} + +//TEST_INPUT: type_conformance A:IInterface = 0 +//TEST_INPUT: type_conformance B:IInterface = 1 + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + var obj = createDynamicObject(dispatchThreadID.x, 0); // A + outputBuffer[0] = __fwd_diff(sqr)(obj, DifferentialPair(2.0, 1.0)).d; // A.calc, expect 12 + + obj = createDynamicObject(dispatchThreadID.x + 1, 0); // B + outputBuffer[1] = __fwd_diff(sqr)(obj, DifferentialPair(1.5, 1.0)).d; // B.calc, expect 3 +} diff --git a/tests/autodiff/dynamic-dispatch-generic.slang.expected.txt b/tests/autodiff/dynamic-dispatch-generic.slang.expected.txt new file mode 100644 index 000000000..8a664e432 --- /dev/null +++ b/tests/autodiff/dynamic-dispatch-generic.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +12.000000 +3.000000 +0.000000 +0.000000 +0.000000 diff --git a/tests/autodiff/generic-autodiff-1.slang b/tests/autodiff/generic-autodiff-1.slang new file mode 100644 index 000000000..db7ae7e87 --- /dev/null +++ b/tests/autodiff/generic-autodiff-1.slang @@ -0,0 +1,39 @@ +// Test calling differentiable function through dynamic dispatch. + +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[anyValueSize(16)] +interface IInterface +{ + [mutating] + float sample(); +} + +struct A : IInterface +{ + float z; + [mutating] + float sample() { z = z + 1.0; return 1.0; } +}; + + +[ForwardDifferentiable] +float sqr(inout T obj, float x) +{ + return obj.sample() + x*x; +} + +//TEST_INPUT: type_conformance A:IInterface = 0 + + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + A obj; + obj.z = 0.0; + outputBuffer[0] = __fwd_diff(sqr)(obj, DifferentialPair(2.0, 1.0)).d; +} diff --git a/tests/autodiff/generic-autodiff-1.slang.expected.txt b/tests/autodiff/generic-autodiff-1.slang.expected.txt new file mode 100644 index 000000000..64510fe94 --- /dev/null +++ b/tests/autodiff/generic-autodiff-1.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +4.000000 +0.000000 +0.000000 +0.000000 +0.000000 -- cgit v1.2.3