From 71efd949fa5276e2464416fcf237f8fd2c486281 Mon Sep 17 00:00:00 2001 From: Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> Date: Wed, 15 Mar 2023 22:26:58 -0400 Subject: AD: Primal-Hoisting Rework + Checkpoint Policy Framework (#2702) --- tests/autodiff/reverse-control-flow-1.slang | 42 +++++++++++++++++++ .../reverse-control-flow-1.slang.expected.txt | 6 +++ tests/autodiff/reverse-control-flow.slang | 42 ------------------- .../reverse-control-flow.slang.expected.txt | 6 --- tests/autodiff/reverse-inout-param-1.slang | 47 ++++++++++++++++++++++ .../reverse-inout-param-1.slang.expected.txt | 6 +++ tests/autodiff/reverse-inout-param.slang | 47 ---------------------- .../reverse-inout-param.slang.expected.txt | 6 --- 8 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 tests/autodiff/reverse-control-flow-1.slang create mode 100644 tests/autodiff/reverse-control-flow-1.slang.expected.txt delete mode 100644 tests/autodiff/reverse-control-flow.slang delete mode 100644 tests/autodiff/reverse-control-flow.slang.expected.txt create mode 100644 tests/autodiff/reverse-inout-param-1.slang create mode 100644 tests/autodiff/reverse-inout-param-1.slang.expected.txt delete mode 100644 tests/autodiff/reverse-inout-param.slang delete mode 100644 tests/autodiff/reverse-inout-param.slang.expected.txt (limited to 'tests') diff --git a/tests/autodiff/reverse-control-flow-1.slang b/tests/autodiff/reverse-control-flow-1.slang new file mode 100644 index 000000000..7d2f518be --- /dev/null +++ b/tests/autodiff/reverse-control-flow-1.slang @@ -0,0 +1,42 @@ +//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; + +typedef DifferentialPair dpfloat; +typedef float.Differential dfloat; + +[BackwardDifferentiable] +float test_single_branch(float y) +{ + float o; + if (y > 0.5) + { + o = y * 2.0f; + } + else + { + o = y + 1.0f; + } + + return o; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + { + dpfloat dpa = dpfloat(1.0, 0.0); + + __bwd_diff(test_single_branch)(dpa, 1.0f); + outputBuffer[0] = dpa.d; // Expect: 2.0 + } + + { + dpfloat dpa = dpfloat(0.4, 0.0); + + __bwd_diff(test_single_branch)(dpa, 1.0f); + outputBuffer[1] = dpa.d; // Expect: 1.0 + } +} diff --git a/tests/autodiff/reverse-control-flow-1.slang.expected.txt b/tests/autodiff/reverse-control-flow-1.slang.expected.txt new file mode 100644 index 000000000..86aa47f11 --- /dev/null +++ b/tests/autodiff/reverse-control-flow-1.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +2.000000 +1.000000 +0.000000 +0.000000 +0.000000 diff --git a/tests/autodiff/reverse-control-flow.slang b/tests/autodiff/reverse-control-flow.slang deleted file mode 100644 index 7d2f518be..000000000 --- a/tests/autodiff/reverse-control-flow.slang +++ /dev/null @@ -1,42 +0,0 @@ -//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; - -typedef DifferentialPair dpfloat; -typedef float.Differential dfloat; - -[BackwardDifferentiable] -float test_single_branch(float y) -{ - float o; - if (y > 0.5) - { - o = y * 2.0f; - } - else - { - o = y + 1.0f; - } - - return o; -} - -[numthreads(1, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) -{ - { - dpfloat dpa = dpfloat(1.0, 0.0); - - __bwd_diff(test_single_branch)(dpa, 1.0f); - outputBuffer[0] = dpa.d; // Expect: 2.0 - } - - { - dpfloat dpa = dpfloat(0.4, 0.0); - - __bwd_diff(test_single_branch)(dpa, 1.0f); - outputBuffer[1] = dpa.d; // Expect: 1.0 - } -} diff --git a/tests/autodiff/reverse-control-flow.slang.expected.txt b/tests/autodiff/reverse-control-flow.slang.expected.txt deleted file mode 100644 index 86aa47f11..000000000 --- a/tests/autodiff/reverse-control-flow.slang.expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -type: float -2.000000 -1.000000 -0.000000 -0.000000 -0.000000 diff --git a/tests/autodiff/reverse-inout-param-1.slang b/tests/autodiff/reverse-inout-param-1.slang new file mode 100644 index 000000000..de0d8f7ed --- /dev/null +++ b/tests/autodiff/reverse-inout-param-1.slang @@ -0,0 +1,47 @@ +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +struct D : IDifferentiable +{ + float n; + float m; +} + +[BackwardDifferentiable] +void g(no_diff float p, inout float x) +{ + x = p * ((x+1)*(x+1)); +} + +[BackwardDifferentiable] +void f(no_diff float p, inout float x) +{ + g(p, x); + g(p, x); +} +[BackwardDifferentiable] +float f_ref(no_diff float p, float x) +{ + float y1 = p * (x+1)*(x+1); + float y2 = p * (y1+1)*(y1+1); + return y2; +} + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + var x = diffPair(2.0, 1.0); + + __bwd_diff(f)(3.0, x); + + outputBuffer[0] = x.p; // should be 2, since bwd_diff does not write back new primal val. + outputBuffer[1] = x.d; // 3024 + + var refVal = __fwd_diff(f_ref)(3.0, diffPair(2.0, 1.0)).d; + outputBuffer[2] = refVal; // 3024 + +} diff --git a/tests/autodiff/reverse-inout-param-1.slang.expected.txt b/tests/autodiff/reverse-inout-param-1.slang.expected.txt new file mode 100644 index 000000000..2df174e2f --- /dev/null +++ b/tests/autodiff/reverse-inout-param-1.slang.expected.txt @@ -0,0 +1,6 @@ +type: float +2.000000 +3024.000000 +3024.000000 +0.000000 +0.000000 diff --git a/tests/autodiff/reverse-inout-param.slang b/tests/autodiff/reverse-inout-param.slang deleted file mode 100644 index de0d8f7ed..000000000 --- a/tests/autodiff/reverse-inout-param.slang +++ /dev/null @@ -1,47 +0,0 @@ -//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type -//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj - -//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer -RWStructuredBuffer outputBuffer; - -struct D : IDifferentiable -{ - float n; - float m; -} - -[BackwardDifferentiable] -void g(no_diff float p, inout float x) -{ - x = p * ((x+1)*(x+1)); -} - -[BackwardDifferentiable] -void f(no_diff float p, inout float x) -{ - g(p, x); - g(p, x); -} -[BackwardDifferentiable] -float f_ref(no_diff float p, float x) -{ - float y1 = p * (x+1)*(x+1); - float y2 = p * (y1+1)*(y1+1); - return y2; -} - -[numthreads(1, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) -{ - var x = diffPair(2.0, 1.0); - - __bwd_diff(f)(3.0, x); - - outputBuffer[0] = x.p; // should be 2, since bwd_diff does not write back new primal val. - outputBuffer[1] = x.d; // 3024 - - var refVal = __fwd_diff(f_ref)(3.0, diffPair(2.0, 1.0)).d; - outputBuffer[2] = refVal; // 3024 - -} diff --git a/tests/autodiff/reverse-inout-param.slang.expected.txt b/tests/autodiff/reverse-inout-param.slang.expected.txt deleted file mode 100644 index 2df174e2f..000000000 --- a/tests/autodiff/reverse-inout-param.slang.expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -type: float -2.000000 -3024.000000 -3024.000000 -0.000000 -0.000000 -- cgit v1.2.3