From e04abb54bc69d90a503852d60a89e8bac7b60ec8 Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 25 Oct 2023 12:21:35 -0700 Subject: Fix single iteration loop detection logic. (#3287) Co-authored-by: Yong He --- source/slang/slang-ir-simplify-cfg.cpp | 4 ++-- tests/ir/loop-unroll-simplify.slang | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 tests/ir/loop-unroll-simplify.slang diff --git a/source/slang/slang-ir-simplify-cfg.cpp b/source/slang/slang-ir-simplify-cfg.cpp index 0fe752c8f..127a515ce 100644 --- a/source/slang/slang-ir-simplify-cfg.cpp +++ b/source/slang/slang-ir-simplify-cfg.cpp @@ -97,8 +97,8 @@ static bool isTrivialSingleIterationLoop( { if (!context.domTree->dominates(loop->getParent(), branchTarget)) return false; - if (targetBlock != loop->getBreakBlock()) - return false; + if (branchTarget != loop->getBreakBlock()) + continue; if (findBreakableRegionHeaderInst(context.domTree, block) != loop) { // If the break is initiated from a nested region, this is not trivial. diff --git a/tests/ir/loop-unroll-simplify.slang b/tests/ir/loop-unroll-simplify.slang new file mode 100644 index 000000000..f935b8b1e --- /dev/null +++ b/tests/ir/loop-unroll-simplify.slang @@ -0,0 +1,14 @@ +//TEST:SIMPLE(filecheck=CHECK): -entry main -target hlsl -profile cs_6_3 + +RWStructuredBuffer output; + +void main() +{ + // Test that the unrolled code does not have trivial single iteration loops. + // CHECK-NOT: break + [ForceUnroll] + for (int i = 0; i < 2; i++) + { + output[i] = i; + } +} -- cgit v1.2.3