[llvm] r329577 - [MachineLICM] Re-enable hoisting of constant stores
Zaara Syeda via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 9 07:50:03 PDT 2018
Author: syzaara
Date: Mon Apr 9 07:50:02 2018
New Revision: 329577
URL: http://llvm.org/viewvc/llvm-project?rev=329577&view=rev
Log:
[MachineLICM] Re-enable hoisting of constant stores
This patch fixes an issue exposed on the SystemZ build bots when committing
https://reviews.llvm.org/rL327856. The hoisting was temporarily disabled with
an option. This patch now re-enables hoisting and checks that we only hoist a
store instruction when all its operands are either constant caller preserved
registers or immediates.
Differential Revision: https://reviews.llvm.org/D45286
Added:
llvm/trunk/test/CodeGen/SystemZ/hoist-const-stores.ll
Modified:
llvm/trunk/lib/CodeGen/MachineLICM.cpp
Modified: llvm/trunk/lib/CodeGen/MachineLICM.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLICM.cpp?rev=329577&r1=329576&r2=329577&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineLICM.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineLICM.cpp Mon Apr 9 07:50:02 2018
@@ -74,7 +74,7 @@ SinkInstsToAvoidSpills("sink-insts-to-av
static cl::opt<bool>
HoistConstStores("hoist-const-stores",
cl::desc("Hoist invariant stores"),
- cl::init(false), cl::Hidden);
+ cl::init(true), cl::Hidden);
STATISTIC(NumHoisted,
"Number of machine instructions hoisted out of loops");
@@ -902,10 +902,13 @@ static bool mayLoadFromGOTOrConstantPool
// This means, the value being stored and the address where it is being stored
// is constant throughout the body of the function (not including prologue and
// epilogue). When called with an MI that isn't a store, it returns false.
+// A future improvement can be to check if the store registers are constant
+// throughout the loop rather than throughout the funtion.
static bool isInvariantStore(const MachineInstr &MI,
const TargetRegisterInfo *TRI,
const MachineRegisterInfo *MRI) {
+ bool FoundCallerPresReg = false;
if (!MI.mayStore() || MI.hasUnmodeledSideEffects() ||
(MI.getNumOperands() == 0))
return false;
@@ -922,9 +925,13 @@ static bool isInvariantStore(const Machi
return false;
if (!TRI->isCallerPreservedPhysReg(Reg, *MI.getMF()))
return false;
+ else
+ FoundCallerPresReg = true;
+ } else if (!MO.isImm()) {
+ return false;
}
}
- return true;
+ return FoundCallerPresReg;
}
// Return true if the input MI is a copy instruction that feeds an invariant
Added: llvm/trunk/test/CodeGen/SystemZ/hoist-const-stores.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/hoist-const-stores.ll?rev=329577&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/hoist-const-stores.ll (added)
+++ llvm/trunk/test/CodeGen/SystemZ/hoist-const-stores.ll Mon Apr 9 07:50:02 2018
@@ -0,0 +1,145 @@
+; RUN: llc -verify-machineinstrs -mtriple=s390x-ibm-linux -mcpu=z13 -O3 -hoist-const-stores < %s | FileCheck %s
+
+ at b = dso_local local_unnamed_addr global i32 15, align 4
+ at e = dso_local local_unnamed_addr global i32 -1, align 4
+ at f = common dso_local global i32 0, align 4
+ at g = dso_local local_unnamed_addr global i32* @f, align 8
+ at c = common dso_local local_unnamed_addr global i32 0, align 4
+ at a = common dso_local local_unnamed_addr global [6 x i32] zeroinitializer, align 4
+ at d = common dso_local local_unnamed_addr global i32 0, align 4
+ at h = common dso_local local_unnamed_addr global i32 0, align 4
+ at .str = private unnamed_addr constant [15 x i8] c"checksum = %X\0A\00", align 2
+
+; Function Attrs: nounwind
+define dso_local signext i32 @main() {
+entry:
+ %i = alloca i32, align 4
+ %.pr = load i32, i32* @c, align 4, !tbaa !2
+ %cmp6 = icmp slt i32 %.pr, 6
+ br i1 %cmp6, label %for.body.preheader, label %for.end
+
+for.body.preheader: ; preds = %entry
+ store i32 5, i32* getelementptr inbounds ([6 x i32], [6 x i32]* @a, i64 0, i64 1), align 4, !tbaa !2
+ store i32 6, i32* @c, align 4, !tbaa !2
+ br label %for.end
+
+for.end: ; preds = %for.body.preheader, %entry
+ %0 = bitcast i32* %i to i8*
+ call void @llvm.lifetime.start.p0i8(i64 4, i8* nonnull %0)
+ store i32 14, i32* %i, align 4, !tbaa !2
+ %.pr2 = load i32, i32* @d, align 4, !tbaa !2
+ %cmp25 = icmp sgt i32 %.pr2, -1
+ br i1 %cmp25, label %for.cond4thread-pre-split.lr.ph, label %for.end.for.end11_crit_edge
+
+for.end.for.end11_crit_edge: ; preds = %for.end
+ %.pre10 = load i32, i32* @b, align 4, !tbaa !2
+ br label %for.end11
+
+; CHECK: # %for.cond4thread-pre-split.lr.ph
+; CHECK-NOT: mvhi 164(%r15), 0
+; CHECK: # %for.end9
+; CHECK: mvhi 164(%r15), 0
+
+for.cond4thread-pre-split.lr.ph: ; preds = %for.end
+ %1 = ptrtoint i32* %i to i64
+ %2 = trunc i64 %1 to i32
+ %3 = load i32*, i32** @g, align 8
+ %.pr3.pre = load i32, i32* @e, align 4, !tbaa !2
+ br label %for.cond4thread-pre-split
+
+for.cond4thread-pre-split: ; preds = %for.cond4thread-pre-split.lr.ph, %for.end9
+ %4 = phi i32 [ %.pr2, %for.cond4thread-pre-split.lr.ph ], [ %dec, %for.end9 ]
+ %5 = phi i32 [ 14, %for.cond4thread-pre-split.lr.ph ], [ 0, %for.end9 ]
+ %.pr3 = phi i32 [ %.pr3.pre, %for.cond4thread-pre-split.lr.ph ], [ %.pr37, %for.end9 ]
+ %cmp54 = icmp slt i32 %.pr3, 1
+ br i1 %cmp54, label %for.body6.preheader, label %for.end9
+
+for.body6.preheader: ; preds = %for.cond4thread-pre-split
+ store i32 %5, i32* %3, align 4, !tbaa !2
+ %6 = load i32, i32* @e, align 4, !tbaa !2
+ %inc811 = add nsw i32 %6, 1
+ store i32 %inc811, i32* @e, align 4, !tbaa !2
+ %cmp512 = icmp slt i32 %6, 0
+ br i1 %cmp512, label %for.body6.for.body6_crit_edge, label %for.end9.loopexit
+
+for.body6.for.body6_crit_edge: ; preds = %for.body6.preheader, %for.body6.for.body6_crit_edge.3
+ %.pre = load i32, i32* %i, align 4, !tbaa !2
+ store i32 %.pre, i32* %3, align 4, !tbaa !2
+ %7 = load i32, i32* @e, align 4, !tbaa !2
+ %inc8 = add nsw i32 %7, 1
+ store i32 %inc8, i32* @e, align 4, !tbaa !2
+ %cmp5 = icmp slt i32 %7, 0
+ br i1 %cmp5, label %for.body6.for.body6_crit_edge.1, label %for.end9.loopexit
+
+for.end9.loopexit: ; preds = %for.body6.for.body6_crit_edge, %for.body6.for.body6_crit_edge.1, %for.body6.for.body6_crit_edge.2, %for.body6.for.body6_crit_edge.3, %for.body6.preheader
+ %inc8.lcssa = phi i32 [ %inc811, %for.body6.preheader ], [ %inc8, %for.body6.for.body6_crit_edge ], [ %inc8.1, %for.body6.for.body6_crit_edge.1 ], [ %inc8.2, %for.body6.for.body6_crit_edge.2 ], [ %inc8.3, %for.body6.for.body6_crit_edge.3 ]
+ %.pre9 = load i32, i32* @d, align 4, !tbaa !2
+ br label %for.end9
+
+for.end9: ; preds = %for.end9.loopexit, %for.cond4thread-pre-split
+ %8 = phi i32 [ %.pre9, %for.end9.loopexit ], [ %4, %for.cond4thread-pre-split ]
+ %.pr37 = phi i32 [ %inc8.lcssa, %for.end9.loopexit ], [ %.pr3, %for.cond4thread-pre-split ]
+ store i32 %2, i32* @h, align 4, !tbaa !2
+ store i32 0, i32* %i, align 4, !tbaa !2
+ %9 = load i32, i32* @b, align 4, !tbaa !2
+ %10 = load i32, i32* @f, align 4, !tbaa !2
+ %xor = xor i32 %10, %9
+ %idxprom = sext i32 %xor to i64
+ %arrayidx = getelementptr inbounds [6 x i32], [6 x i32]* @a, i64 0, i64 %idxprom
+ %11 = load i32, i32* %arrayidx, align 4, !tbaa !2
+ store i32 %11, i32* @b, align 4, !tbaa !2
+ %dec = add nsw i32 %8, -1
+ store i32 %dec, i32* @d, align 4, !tbaa !2
+ %cmp2 = icmp sgt i32 %8, 0
+ br i1 %cmp2, label %for.cond4thread-pre-split, label %for.end11
+
+for.end11: ; preds = %for.end9, %for.end.for.end11_crit_edge
+ %12 = phi i32 [ %.pre10, %for.end.for.end11_crit_edge ], [ %11, %for.end9 ]
+ %call = call signext i32 (i8*, ...) @printf(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str, i64 0, i64 0), i32 signext %12)
+ call void @llvm.lifetime.end.p0i8(i64 4, i8* nonnull %0)
+ ret i32 0
+
+for.body6.for.body6_crit_edge.1: ; preds = %for.body6.for.body6_crit_edge
+ %.pre.1 = load i32, i32* %i, align 4, !tbaa !2
+ store i32 %.pre.1, i32* %3, align 4, !tbaa !2
+ %13 = load i32, i32* @e, align 4, !tbaa !2
+ %inc8.1 = add nsw i32 %13, 1
+ store i32 %inc8.1, i32* @e, align 4, !tbaa !2
+ %cmp5.1 = icmp slt i32 %13, 0
+ br i1 %cmp5.1, label %for.body6.for.body6_crit_edge.2, label %for.end9.loopexit
+
+for.body6.for.body6_crit_edge.2: ; preds = %for.body6.for.body6_crit_edge.1
+ %.pre.2 = load i32, i32* %i, align 4, !tbaa !2
+ store i32 %.pre.2, i32* %3, align 4, !tbaa !2
+ %14 = load i32, i32* @e, align 4, !tbaa !2
+ %inc8.2 = add nsw i32 %14, 1
+ store i32 %inc8.2, i32* @e, align 4, !tbaa !2
+ %cmp5.2 = icmp slt i32 %14, 0
+ br i1 %cmp5.2, label %for.body6.for.body6_crit_edge.3, label %for.end9.loopexit
+
+for.body6.for.body6_crit_edge.3: ; preds = %for.body6.for.body6_crit_edge.2
+ %.pre.3 = load i32, i32* %i, align 4, !tbaa !2
+ store i32 %.pre.3, i32* %3, align 4, !tbaa !2
+ %15 = load i32, i32* @e, align 4, !tbaa !2
+ %inc8.3 = add nsw i32 %15, 1
+ store i32 %inc8.3, i32* @e, align 4, !tbaa !2
+ %cmp5.3 = icmp slt i32 %15, 0
+ br i1 %cmp5.3, label %for.body6.for.body6_crit_edge, label %for.end9.loopexit
+}
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture)
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture)
+
+; Function Attrs: nounwind
+declare dso_local signext i32 @printf(i8* nocapture readonly, ...)
+
+!llvm.module.flags = !{!0}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{!3, !3, i64 0}
+!3 = !{!"int", !4, i64 0}
+!4 = !{!"omnipotent char", !5, i64 0}
+!5 = !{!"Simple C/C++ TBAA"}
More information about the llvm-commits
mailing list