summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com>2023-09-20 16:47:56 -0400
committerGitHub <noreply@github.com>2023-09-20 16:47:56 -0400
commit5b23870eb0d3c0f1545304f67d15cffc16830107 (patch)
tree36e5a0a2fcb86291bc3e69d3ac9edccbb10a3de7
parent25c79ada2c0fcc6c5ecb3e71ca073109adc1d7eb (diff)
Redirect destination-driven lowering logic to regular lowering for `SelectExpr` (#3219)
* Redirect destination-driven lowering logic to regular lowering for select expr * Add test
-rw-r--r--source/slang/slang-lower-to-ir.cpp6
-rw-r--r--tests/autodiff/nan-select.slang36
-rw-r--r--tests/autodiff/nan-select.slang.expected.txt6
3 files changed, 48 insertions, 0 deletions
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index 640482f12..034178dca 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -5031,6 +5031,12 @@ struct DestinationDrivenRValueExprLoweringVisitor
assign(context, destination, rValue);
}
+ void visitSelectExpr(SelectExpr* expr)
+ {
+ auto rValue = lowerRValueExpr(context, expr);
+ assign(context, destination, rValue);
+ }
+
void visitInvokeExpr(InvokeExpr* expr)
{
LoweredValInfo resultRVal;
diff --git a/tests/autodiff/nan-select.slang b/tests/autodiff/nan-select.slang
new file mode 100644
index 000000000..31a185e6b
--- /dev/null
+++ b/tests/autodiff/nan-select.slang
@@ -0,0 +1,36 @@
+//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<float> outputBuffer;
+
+typedef DifferentialPair<float> dpfloat;
+typedef float.Differential dfloat;
+
+[BackwardDifferentiable]
+float f(float x)
+{
+ float k = x > 1e-8 ? atan2(x, x) : 0.0;
+ return k;
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+ {
+ dpfloat dpa = diffPair(2.0);
+
+ __bwd_diff(f)(dpa, 1.0);
+
+ outputBuffer[0] = dpa.d; // Expect: 0.0
+ }
+
+ {
+ dpfloat dpa = diffPair(0.0,);
+
+ __bwd_diff(f)(dpa, 1.0);
+
+ outputBuffer[1] = dpa.d; // Expect: 0.0, but if select is not turned into if-else,
+ // this will be 'inf' or 'nan'
+ }
+}
diff --git a/tests/autodiff/nan-select.slang.expected.txt b/tests/autodiff/nan-select.slang.expected.txt
new file mode 100644
index 000000000..e070cf84d
--- /dev/null
+++ b/tests/autodiff/nan-select.slang.expected.txt
@@ -0,0 +1,6 @@
+type: float
+0.000000
+0.000000
+0.000000
+0.000000
+0.000000