[PATCH] D36985: [LoopUnswitch] Fix a simple bug which disables loop unswitch for select statement

[Wei Mi via Phabricator via llvm-commits]

wmi created this revision.

This is to fix PR34257. https://reviews.llvm.org/rL309059 takes an early return when FindLIVLoopCondition fails to find a loop invariant condition. This is wrong and it will disable loop unswitch for select. The patch fixes the bug.


Repository:
  rL LLVM

https://reviews.llvm.org/D36985

Files:
  lib/Transforms/Scalar/LoopUnswitch.cpp
  test/Transforms/LoopUnswitch/unswitch-select.ll


Index: test/Transforms/LoopUnswitch/unswitch-select.ll
===================================================================
--- test/Transforms/LoopUnswitch/unswitch-select.ll
+++ test/Transforms/LoopUnswitch/unswitch-select.ll
@@ -0,0 +1,26 @@
+; REQUIRES: asserts
+; RUN: opt < %s -loop-unswitch -disable-output -stats 2>&1| FileCheck %s
+
+; Check the select statement in the loop will be unswitched.
+; CHECK: 1 loop-unswitch - Number of selects unswitched
+define i32 @test(i1 zeroext %x, i32 %a) local_unnamed_addr #0 {
+entry:
+  br label %while.cond
+
+while.cond:                                       ; preds = %while.body, %entry
+  %i.0 = phi i32 [ 0, %entry ], [ %inc, %while.body ]
+  %s.0 = phi i32 [ %a, %entry ], [ %add, %while.body ]
+  %cmp = icmp slt i32 %i.0, 10000
+  br i1 %cmp, label %while.body, label %while.end
+
+while.body:                                       ; preds = %while.cond
+  %cond = select i1 %x, i32 %a, i32 %i.0
+  %add = add nsw i32 %s.0, %cond
+  %inc = add nsw i32 %i.0, 1
+  br label %while.cond
+
+while.end:                                        ; preds = %while.cond
+  %s.0.lcssa = phi i32 [ %s.0, %while.cond ]
+  ret i32 %s.0.lcssa
+}
+
Index: lib/Transforms/Scalar/LoopUnswitch.cpp
===================================================================
--- lib/Transforms/Scalar/LoopUnswitch.cpp
+++ lib/Transforms/Scalar/LoopUnswitch.cpp
@@ -708,10 +708,8 @@
         // unswitch on it if we desire.
         Value *LoopCond = FindLIVLoopCondition(BI->getCondition(),
                                                currentLoop, Changed).first;
-        if (!LoopCond || EqualityPropUnSafe(*LoopCond))
-          continue;
-
-        if (UnswitchIfProfitable(LoopCond, ConstantInt::getTrue(Context), TI)) {
+        if (LoopCond && !EqualityPropUnSafe(*LoopCond) &&
+            UnswitchIfProfitable(LoopCond, ConstantInt::getTrue(Context), TI)) {
           ++NumBranches;
           return true;
         }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36985.112070.patch
Type: text/x-patch
Size: 1961 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170821/a7658e10/attachment.bin>