From d1b45f3059e100d096327eb178c1bac365e564f1 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Tue, 7 Nov 2017 11:57:48 -0800 Subject: IR: support for select and negate (#257) - During IR emit, treat a "select" expression (`?:` operator) like any other `InvokeExpr`, since it will have an `__intrinsic_op` modifier attached to turn it into a `select` instruction. - During HLSL/GLSL emit from IR, turn a `select` instruction into a `?:` expression - Also add support for the `neg` instruction during HLSL/GLSL emit Note that right now we are assuming HLSL semantics for `?:` where it does not short-circuit. Correctly handling the GLSL case would require going back to special-case codegen for `SelectExpr`, but we can cross that bridge when we come to it. --- source/slang/emit.cpp | 17 +++++++++++++++++ source/slang/lower-to-ir.cpp | 5 ----- tests/compute/select-expr.slang | 18 ++++++++++++++++++ tests/compute/select-expr.slang.expected.txt | 4 ++++ 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 tests/compute/select-expr.slang create mode 100644 tests/compute/select-expr.slang.expected.txt diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index d95946204..b66ff76c9 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -4911,6 +4911,13 @@ emitDeclImpl(decl, nullptr); } break; + case kIROp_Neg: + { + emit("-"); + emitIROperand(ctx, inst->getArg(0)); + } + break; + case kIROp_Sample: emitIROperand(ctx, inst->getArg(0)); emit(".Sample("); @@ -5033,6 +5040,16 @@ emitDeclImpl(decl, nullptr); } break; + case kIROp_Select: + { + emitIROperand(ctx, inst->getArg(0)); + emit(" ? "); + emitIROperand(ctx, inst->getArg(1)); + emit(" : "); + emitIROperand(ctx, inst->getArg(2)); + } + break; + default: emit("/* unhandled */"); break; diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp index 2672c5698..2c64c539b 100644 --- a/source/slang/lower-to-ir.cpp +++ b/source/slang/lower-to-ir.cpp @@ -1497,11 +1497,6 @@ struct ExprLoweringVisitorBase : ExprVisitor return emitDeclRef(context, expr->declRef); } - LoweredValInfo visitSelectExpr(SelectExpr* /*expr*/) - { - SLANG_UNIMPLEMENTED_X("codegen for select expression"); - } - LoweredValInfo visitGenericAppExpr(GenericAppExpr* /*expr*/) { SLANG_UNIMPLEMENTED_X("generic application expression during code generation"); diff --git a/tests/compute/select-expr.slang b/tests/compute/select-expr.slang new file mode 100644 index 000000000..d90708ab9 --- /dev/null +++ b/tests/compute/select-expr.slang @@ -0,0 +1,18 @@ +//TEST(smoke,compute):COMPARE_COMPUTE: +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out + + +// Test IR code generation for the `?:` "select" operator + +int test(int input) +{ + return input > 1 ? -input : input; +} + +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + outputBuffer[dispatchThreadID.x] = test((int) dispatchThreadID.x); +} \ No newline at end of file diff --git a/tests/compute/select-expr.slang.expected.txt b/tests/compute/select-expr.slang.expected.txt new file mode 100644 index 000000000..384f9a732 --- /dev/null +++ b/tests/compute/select-expr.slang.expected.txt @@ -0,0 +1,4 @@ +0 +1 +FFFFFFFE +FFFFFFFD -- cgit v1.2.3