summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-11-07 16:47:36 -0800
committerGitHub <noreply@github.com>2017-11-07 16:47:36 -0800
commita5dfa5cd2bfa11fb3d9e84877f8dead1815e9077 (patch)
treefbc440ab3e7dc6843b3ef653a70e134b58758885 /source
parent6e591ada0eb652c320bba4bd8a46cd579946df01 (diff)
IR: add support for `discard` statement (#261)
- Add definition of `discard` instruction - A `discard` is a terminator instruction, just like `returnVoid` - Lower `DiscardStmt` in AST to a `discard` instruction in the IR - Emit `discard` instruction as a `discard;` statement when emitting HLSL/GLSL - Add a test case using the "graphics compute" mode that tests discard. The test writes to one entry in a UAV before doing a conditional (always true at runtime) discard, and then writes to another entry; we expect to see the results of the first write, but not the second.
Diffstat (limited to 'source')
-rw-r--r--source/slang/emit.cpp5
-rw-r--r--source/slang/ir-inst-defs.h2
-rw-r--r--source/slang/ir-insts.h5
-rw-r--r--source/slang/ir.cpp12
-rw-r--r--source/slang/lower-to-ir.cpp5
5 files changed, 29 insertions, 0 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 332125fc6..2b7030897 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -5296,6 +5296,10 @@ emitDeclImpl(decl, nullptr);
emit(";\n");
break;
+ case kIROp_discard:
+ emit("discard;\n");
+ break;
+
case kIROp_swizzleSet:
{
auto ii = (IRSwizzleSet*)inst;
@@ -5425,6 +5429,7 @@ emitDeclImpl(decl, nullptr);
case kIROp_ReturnVal:
case kIROp_ReturnVoid:
+ case kIROp_discard:
emitIRInst(ctx, terminator);
return;
diff --git a/source/slang/ir-inst-defs.h b/source/slang/ir-inst-defs.h
index d2e2c12e8..a8118f714 100644
--- a/source/slang/ir-inst-defs.h
+++ b/source/slang/ir-inst-defs.h
@@ -181,6 +181,8 @@ INST(if, if, 3, 0)
INST(ifElse, ifElse, 4, 0)
INST(loopTest, loopTest, 3, 0)
+INST(discard, discard, 0, 0)
+
INST(Add, add, 2, 0)
INST(Sub, sub, 2, 0)
INST(Mul, mul, 2, 0)
diff --git a/source/slang/ir-insts.h b/source/slang/ir-insts.h
index f70ab46ff..06ccf2921 100644
--- a/source/slang/ir-insts.h
+++ b/source/slang/ir-insts.h
@@ -135,6 +135,9 @@ struct IRReturnVal : IRReturn
struct IRReturnVoid : IRReturn
{};
+struct IRDiscard : IRTerminatorInst
+{};
+
struct IRBlock;
struct IRUnconditionalBranch : IRTerminatorInst
@@ -464,6 +467,8 @@ struct IRBuilder
IRInst* emitReturn();
+ IRInst* emitDiscard();
+
IRInst* emitBranch(
IRBlock* block);
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index b1af6521c..8fbe20aa6 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -166,6 +166,7 @@ namespace Slang
case kIROp_if:
case kIROp_ifElse:
case kIROp_loopTest:
+ case kIROp_discard:
return true;
}
}
@@ -1150,6 +1151,17 @@ namespace Slang
return inst;
}
+ IRInst* IRBuilder::emitDiscard()
+ {
+ auto inst = createInst<IRDiscard>(
+ this,
+ kIROp_discard,
+ nullptr);
+ addInst(inst);
+ return inst;
+ }
+
+
IRInst* IRBuilder::emitBranch(
IRBlock* pBlock)
{
diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp
index 4fabd6a81..86f037435 100644
--- a/source/slang/lower-to-ir.cpp
+++ b/source/slang/lower-to-ir.cpp
@@ -1912,6 +1912,11 @@ struct StmtLoweringVisitor : StmtVisitor<StmtLoweringVisitor>
getBuilder()->emitReturn();
}
}
+
+ void visitDiscardStmt(DiscardStmt* /*stmt*/)
+ {
+ getBuilder()->emitDiscard();
+ }
};
void lowerStmt(