[ModuloSchedule] removeBranch() *before* creating the trip count condition

The Hexagon code assumes there's no existing terminator when inserting its
trip count condition check.

This causes swp-stages5.ll to break. The generated code looks good to me,
it is likely a permutation. I have disabled the new codegen path to keep
everything green and will investigate along with the other 3-4 tests
that have different codegen.

Fixes expensive-checks build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373629 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/ModuloSchedule.cpp b/lib/CodeGen/ModuloSchedule.cpp
index 30aa81487c8b165d97dee99abbb5fd36d6b6eda9..d891d644664f501d4a923e26a53dce58aac8d3dc 100644 (file)
--- a/lib/CodeGen/ModuloSchedule.cpp
+++ b/lib/CodeGen/ModuloSchedule.cpp
@@ -1772,12 +1772,12 @@ void PeelingModuloScheduleExpander::fixupBranches() {
     MachineBasicBlock *Fallthrough = *Prolog->succ_begin();
     MachineBasicBlock *Epilog = *EI;
     SmallVector<MachineOperand, 4> Cond;
+    TII->removeBranch(*Prolog);
     Optional<bool> StaticallyGreater =
         Info->createTripCountGreaterCondition(TC, *Prolog, Cond);
     if (!StaticallyGreater.hasValue()) {
       LLVM_DEBUG(dbgs() << "Dynamic: TC > " << TC << "\n");
       // Dynamically branch based on Cond.
-      TII->removeBranch(*Prolog);
       TII->insertBranch(*Prolog, Epilog, Fallthrough, Cond, DebugLoc());
     } else if (*StaticallyGreater == false) {
       LLVM_DEBUG(dbgs() << "Static-false: TC > " << TC << "\n");
@@ -1788,7 +1788,6 @@ void PeelingModuloScheduleExpander::fixupBranches() {
         P.RemoveOperand(2);
         P.RemoveOperand(1);
       }
-      TII->removeBranch(*Prolog);
       TII->insertUnconditionalBranch(*Prolog, Epilog, DebugLoc());
       KernelDisposed = true;
     } else {

diff --git a/test/CodeGen/Hexagon/swp-stages5.ll b/test/CodeGen/Hexagon/swp-stages5.ll
index 1f8463fbc30f9b942f15d417b56b0b0ddf05263a..fdfb2101cd36cfe549ff33bc265bb5b3d8a430a1 100644 (file)
--- a/test/CodeGen/Hexagon/swp-stages5.ll
+++ b/test/CodeGen/Hexagon/swp-stages5.ll
@@ -1,4 +1,4 @@
-; RUN: llc -march=hexagon -mcpu=hexagonv5 -enable-pipeliner -pipeliner-max-stages=2 -hexagon-bit=0 < %s -pipeliner-experimental-cg=true | FileCheck %s
+; RUN: llc -march=hexagon -mcpu=hexagonv5 -enable-pipeliner -pipeliner-max-stages=2 -hexagon-bit=0 < %s | FileCheck %s
 
 ; Very similar to swp-stages4.ll, but the pipelined schedule is a little
 ; different.