diff options
3 files changed, 32 insertions, 3 deletions
diff --git a/source/slang/slang-ir-eliminate-multilevel-break.cpp b/source/slang/slang-ir-eliminate-multilevel-break.cpp index 65e388608..19c95edfd 100644 --- a/source/slang/slang-ir-eliminate-multilevel-break.cpp +++ b/source/slang/slang-ir-eliminate-multilevel-break.cpp @@ -193,6 +193,14 @@ struct EliminateMultiLevelBreakContext { if (as<IRBlock>(terminator->getParent()) == block) { + // Don't double count instructions like + // ifElse(cond, true, after, after) + if(const auto ifElse = as<IRIfElse>(terminator)) + { + if(&ifElse->afterBlock == use) + continue; + } + relevantUses.add(use); } } diff --git a/source/slang/slang-ir-simplify-cfg.cpp b/source/slang/slang-ir-simplify-cfg.cpp index f2d0c4555..63c40b16f 100644 --- a/source/slang/slang-ir-simplify-cfg.cpp +++ b/source/slang/slang-ir-simplify-cfg.cpp @@ -444,6 +444,30 @@ static bool trySimplifyIfElse(IRBuilder& builder, IRIfElse* ifElseInst) return true; } } + else + { + // Otherwise, we can try to remove at least remove one of the trivial branches + // Remove either the true or false block if it jumps to the after block + // with no parameters. + + const auto afterBlock = ifElseInst->getAfterBlock(); + if(!afterBlock->getFirstParam()) + { + const auto trueBlock = ifElseInst->getTrueBlock(); + const auto falseBlock = ifElseInst->getFalseBlock(); + + if(isTrueBranchTrivial && trueBlock != afterBlock && !trueBlock->hasMoreThanOneUse()) + { + trueBlock->replaceUsesWith(afterBlock); + trueBlock->removeAndDeallocate(); + } + else if(isFalseBranchTrivial && falseBlock != afterBlock && !falseBlock->hasMoreThanOneUse()) + { + falseBlock->replaceUsesWith(afterBlock); + falseBlock->removeAndDeallocate(); + } + } + } return false; } diff --git a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-output.slang.1.expected b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-output.slang.1.expected index a6c28c86b..2340caa21 100644 --- a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-output.slang.1.expected +++ b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-output.slang.1.expected @@ -64,9 +64,6 @@ void accumulate_0(inout uint value_2, hitObjectNV hit_0) MyAttributes_0 _S3 = HitObject_GetAttributes_0(hit_0); value_2 = value_2 + (16U + _S3.value_0); } - else - { - } return; } |