[llvm] bc00f47 - [LoopSink] Do not try to sink phi nodes.

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2022-03-06T11:16:22Z
New Revision: bc00f47c016a9042138d16a5ead9147c631396e5

URL: https://github.com/llvm/llvm-project/commit/bc00f47c016a9042138d16a5ead9147c631396e5
DIFF: https://github.com/llvm/llvm-project/commit/bc00f47c016a9042138d16a5ead9147c631396e5.diff

LOG: [LoopSink] Do not try to sink phi nodes.

Skip phi nodes in the preheader. They may not be considered loop
invariant by the assertion below.

Reviewed By: reames

Differential Revision: https://reviews.llvm.org/D121010

Added: 
    llvm/test/Transforms/LICM/loop-sink-phi-in-preheader.ll

Modified: 
    llvm/lib/Transforms/Scalar/LoopSink.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Scalar/LoopSink.cpp b/llvm/lib/Transforms/Scalar/LoopSink.cpp
index 316227bdfd497..c7b37a313b5b5 100644
--- a/llvm/lib/Transforms/Scalar/LoopSink.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopSink.cpp
@@ -319,6 +319,8 @@ static bool sinkLoopInvariantInstructions(Loop &L, AAResults &AA, LoopInfo &LI,
   // on B (A appears after B), A needs to be sinked first before B can be
   // sinked.
   for (Instruction &I : llvm::make_early_inc_range(llvm::reverse(*Preheader))) {
+    if (isa<PHINode>(&I))
+      continue;
     // No need to check for instruction's operands are loop invariant.
     assert(L.hasLoopInvariantOperands(&I) &&
            "Insts in a loop's preheader should have loop invariant operands!");

diff  --git a/llvm/test/Transforms/LICM/loop-sink-phi-in-preheader.ll b/llvm/test/Transforms/LICM/loop-sink-phi-in-preheader.ll
new file mode 100644
index 0000000000000..4dfe0a13156f8
--- /dev/null
+++ b/llvm/test/Transforms/LICM/loop-sink-phi-in-preheader.ll
@@ -0,0 +1,33 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -S -passes=loop-sink %s | FileCheck %s
+
+define void @preheader_of_inner_has_phi() !prof !0 {
+; CHECK-LABEL: @preheader_of_inner_has_phi(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[OUTER_HEADER:%.*]]
+; CHECK:       outer.header:
+; CHECK-NEXT:    [[PH_1:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[PH_2:%.*]], [[OUTER_LATCH:%.*]] ]
+; CHECK-NEXT:    br label [[INNER:%.*]]
+; CHECK:       inner:
+; CHECK-NEXT:    [[PH_2]] = phi i32 [ 0, [[OUTER_HEADER]] ], [ 0, [[INNER]] ]
+; CHECK-NEXT:    br i1 false, label [[OUTER_LATCH]], label [[INNER]], !prof [[PROF1:![0-9]+]]
+; CHECK:       outer.latch:
+; CHECK-NEXT:    br label [[OUTER_HEADER]]
+;
+entry:
+  br label %outer.header
+
+outer.header:
+  %ph.1 = phi i32 [ 0, %entry ], [ %ph.2, %outer.latch ]
+  br label %inner
+
+inner:
+  %ph.2 = phi i32 [ 0, %outer.header ], [ 0, %inner ]
+  br i1 false, label %outer.latch, label %inner, !prof !1
+
+outer.latch:
+  br label %outer.header
+}
+
+!0 = !{!"function_entry_count", i64 549102}
+!1 = !{!"branch_weights", i32 4027913, i32 1}