diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/TailDuplicator.h | 3 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/MachineBlockPlacement.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/TailDuplication.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/TailDuplicator.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/tail-dup-bundle.mir | 36 |
5 files changed, 46 insertions, 5 deletions
diff --git a/llvm/include/llvm/CodeGen/TailDuplicator.h b/llvm/include/llvm/CodeGen/TailDuplicator.h index 483c0ab1eec..e5f110293c3 100644 --- a/llvm/include/llvm/CodeGen/TailDuplicator.h +++ b/llvm/include/llvm/CodeGen/TailDuplicator.h @@ -61,13 +61,14 @@ class TailDuplicator { public: /// Prepare to run on a specific machine function. /// @param MF - Function that will be processed + /// @param PreRegAlloc - true if used before register allocation /// @param MBPI - Branch Probability Info. Used to propagate correct /// probabilities when modifying the CFG. /// @param LayoutMode - When true, don't use the existing layout to make /// decisions. /// @param TailDupSize - Maxmimum size of blocks to tail-duplicate. Zero /// default implies using the command line value TailDupSize. - void initMF(MachineFunction &MF, + void initMF(MachineFunction &MF, bool PreRegAlloc, const MachineBranchProbabilityInfo *MBPI, bool LayoutMode, unsigned TailDupSize = 0); diff --git a/llvm/lib/CodeGen/MachineBlockPlacement.cpp b/llvm/lib/CodeGen/MachineBlockPlacement.cpp index 65330308dad..c30f306a169 100644 --- a/llvm/lib/CodeGen/MachineBlockPlacement.cpp +++ b/llvm/lib/CodeGen/MachineBlockPlacement.cpp @@ -2729,7 +2729,8 @@ bool MachineBlockPlacement::runOnMachineFunction(MachineFunction &MF) { MPDT = &getAnalysis<MachinePostDominatorTree>(); if (MF.getFunction()->optForSize()) TailDupSize = 1; - TailDup.initMF(MF, MBPI, /* LayoutMode */ true, TailDupSize); + bool PreRegAlloc = false; + TailDup.initMF(MF, PreRegAlloc, MBPI, /* LayoutMode */ true, TailDupSize); precomputeTriangleChains(); } diff --git a/llvm/lib/CodeGen/TailDuplication.cpp b/llvm/lib/CodeGen/TailDuplication.cpp index 489a607eb17..131b9a22768 100644 --- a/llvm/lib/CodeGen/TailDuplication.cpp +++ b/llvm/lib/CodeGen/TailDuplication.cpp @@ -52,7 +52,10 @@ bool TailDuplicatePass::runOnMachineFunction(MachineFunction &MF) { auto MBPI = &getAnalysis<MachineBranchProbabilityInfo>(); - Duplicator.initMF(MF, MBPI, /* LayoutMode */ false); + // TODO: Querying isSSA() to determine pre-/post-regalloc is fragile, better + // split this into two passes instead. + bool PreRegAlloc = MF.getRegInfo().isSSA(); + Duplicator.initMF(MF, PreRegAlloc, MBPI, /* LayoutMode */ false); bool MadeChange = false; while (Duplicator.tailDuplicateBlocks()) diff --git a/llvm/lib/CodeGen/TailDuplicator.cpp b/llvm/lib/CodeGen/TailDuplicator.cpp index 0f22040f3ae..bd3a20f936d 100644 --- a/llvm/lib/CodeGen/TailDuplicator.cpp +++ b/llvm/lib/CodeGen/TailDuplicator.cpp @@ -75,7 +75,7 @@ static cl::opt<bool> static cl::opt<unsigned> TailDupLimit("tail-dup-limit", cl::init(~0U), cl::Hidden); -void TailDuplicator::initMF(MachineFunction &MFin, +void TailDuplicator::initMF(MachineFunction &MFin, bool PreRegAlloc, const MachineBranchProbabilityInfo *MBPIin, bool LayoutModeIn, unsigned TailDupSizeIn) { MF = &MFin; @@ -89,7 +89,7 @@ void TailDuplicator::initMF(MachineFunction &MFin, assert(MBPI != nullptr && "Machine Branch Probability Info required"); LayoutMode = LayoutModeIn; - PreRegAlloc = MRI->isSSA(); + this->PreRegAlloc = PreRegAlloc; } static void VerifyPHIs(MachineFunction &MF, bool CheckExtra) { diff --git a/llvm/test/CodeGen/ARM/tail-dup-bundle.mir b/llvm/test/CodeGen/ARM/tail-dup-bundle.mir new file mode 100644 index 00000000000..67c1cb5a6b9 --- /dev/null +++ b/llvm/test/CodeGen/ARM/tail-dup-bundle.mir @@ -0,0 +1,36 @@ +# RUN: llc -o - %s -run-pass=block-placement -mtriple=thumbv7k-apple-ios8.0.0 -verify-machineinstrs -O3 | FileCheck %s +--- +# CHECK-LABEL: name: func +# Make sure the bundle gets duplicated correctly +# CHECK: BUNDLE implicit-def dead %itstate, implicit-def %cpsr, implicit killed %r0, implicit killed %cpsr { +# CHECK: t2IT 1, 24, implicit-def %itstate +# CHECK: t2CMPri killed %r0, 9, 1, killed %cpsr, implicit-def %cpsr, implicit internal killed %itstate +# CHECK: } +# CHECK: BUNDLE implicit-def dead %itstate, implicit-def %cpsr, implicit killed %r0, implicit killed %cpsr { +# CHECK: t2IT 1, 24, implicit-def %itstate +# CHECK: t2CMPri killed %r0, 9, 1, killed %cpsr, implicit-def %cpsr, implicit internal killed %itstate +# CHECK: } +name: func +tracksRegLiveness: true +body: | + bb.0: + liveins: %r0, %lr, %r7 + + bb.1: + liveins: %r0 + + t2CMPri %r0, 32, 14, _, implicit-def %cpsr + BUNDLE implicit-def dead %itstate, implicit-def %cpsr, implicit killed %r0, implicit killed %cpsr { + t2IT 1, 24, implicit-def %itstate + t2CMPri killed %r0, 9, 1, killed %cpsr, implicit-def %cpsr, implicit internal killed %itstate + } + t2Bcc %bb.3, 1, killed %cpsr + + bb.2: + %r0 = IMPLICIT_DEF + t2B %bb.1, 14, _ + + bb.3: + %r0 = IMPLICIT_DEF + t2B %bb.1, 14, _ +... |
