2004-02-16 15:17:43 +08:00
|
|
|
//===-- llvm/CodeGen/MachineBasicBlock.cpp ----------------------*- C++ -*-===//
|
|
|
|
//
|
2019-01-19 16:50:56 +08:00
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
2004-02-16 15:17:43 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Collect the sequence of machine instructions for a basic block.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "llvm/CodeGen/MachineBasicBlock.h"
|
2012-12-04 00:50:05 +08:00
|
|
|
#include "llvm/ADT/SmallPtrSet.h"
|
2017-12-13 10:51:04 +08:00
|
|
|
#include "llvm/CodeGen/LiveIntervals.h"
|
2010-06-23 01:25:57 +08:00
|
|
|
#include "llvm/CodeGen/LiveVariables.h"
|
|
|
|
#include "llvm/CodeGen/MachineDominators.h"
|
2004-02-16 15:17:43 +08:00
|
|
|
#include "llvm/CodeGen/MachineFunction.h"
|
2013-07-04 07:56:20 +08:00
|
|
|
#include "llvm/CodeGen/MachineInstrBuilder.h"
|
2010-06-23 01:25:57 +08:00
|
|
|
#include "llvm/CodeGen/MachineLoopInfo.h"
|
2013-02-11 17:24:47 +08:00
|
|
|
#include "llvm/CodeGen/MachineRegisterInfo.h"
|
2010-10-27 04:21:46 +08:00
|
|
|
#include "llvm/CodeGen/SlotIndexes.h"
|
2017-11-08 09:01:31 +08:00
|
|
|
#include "llvm/CodeGen/TargetInstrInfo.h"
|
2017-11-17 09:07:10 +08:00
|
|
|
#include "llvm/CodeGen/TargetRegisterInfo.h"
|
|
|
|
#include "llvm/CodeGen/TargetSubtargetInfo.h"
|
2018-04-30 22:59:11 +08:00
|
|
|
#include "llvm/Config/llvm-config.h"
|
2013-01-02 19:36:10 +08:00
|
|
|
#include "llvm/IR/BasicBlock.h"
|
|
|
|
#include "llvm/IR/DataLayout.h"
|
Make MachineBasicBlock::updateTerminator to update DebugLoc as well
Summary:
Currently MachineBasicBlock::updateTerminator simply drops DebugLoc for newly created branch instructions, which may cause incorrect stepping and/or imprecise sample profile data. Below is an example:
```
1 extern int bar(int x);
2
3 int foo(int *begin, int *end) {
4 int *i;
5 int ret = 0;
6 for (
7 i = begin ;
8 i != end ;
9 i++)
10 {
11 ret += bar(*i);
12 }
13 return ret;
14 }
```
Below is a bitcode of 'foo' at the end of LLVM-IR level optimizations with -O3:
```
define i32 @foo(i32* readonly %begin, i32* readnone %end) !dbg !4 {
entry:
%cmp6 = icmp eq i32* %begin, %end, !dbg !9
br i1 %cmp6, label %for.end, label %for.body.preheader, !dbg !12
for.body.preheader: ; preds = %entry
br label %for.body, !dbg !13
for.body: ; preds = %for.body.preheader, %for.body
%ret.08 = phi i32 [ %add, %for.body ], [ 0, %for.body.preheader ]
%i.07 = phi i32* [ %incdec.ptr, %for.body ], [ %begin, %for.body.preheader ]
%0 = load i32, i32* %i.07, align 4, !dbg !13, !tbaa !15
%call = tail call i32 @bar(i32 %0), !dbg !19
%add = add nsw i32 %call, %ret.08, !dbg !20
%incdec.ptr = getelementptr inbounds i32, i32* %i.07, i64 1, !dbg !21
%cmp = icmp eq i32* %incdec.ptr, %end, !dbg !9
br i1 %cmp, label %for.end.loopexit, label %for.body, !dbg !12, !llvm.loop !22
for.end.loopexit: ; preds = %for.body
br label %for.end, !dbg !24
for.end: ; preds = %for.end.loopexit, %entry
%ret.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.end.loopexit ]
ret i32 %ret.0.lcssa, !dbg !24
}
```
where
```
!12 = !DILocation(line: 6, column: 3, scope: !11)
```
. As you can see, the terminator of 'entry' block, which is a loop control branch, has a DebugLoc of line 6, column 3. Howerver, after the execution of 'MachineBlock::updateTerminator' function, which is triggered by MachineSinking pass, the DebugLoc info is dropped as below (see there's no debug-location for JNE_1):
```
bb.0.entry:
successors: %bb.4(0x30000000), %bb.1.for.body.preheader(0x50000000)
liveins: %rdi, %rsi
%6 = COPY %rsi
%5 = COPY %rdi
%8 = SUB64rr %5, %6, implicit-def %eflags, debug-location !9
JNE_1 %bb.1.for.body.preheader, implicit %eflags
```
This patch addresses this issue and make newly created branch instructions to keep debug-location info.
Reviewers: aprantl, MatzeB, craig.topper, qcolombet
Reviewed By: qcolombet
Subscribers: qcolombet, llvm-commits
Differential Revision: https://reviews.llvm.org/D29596
llvm-svn: 294976
2017-02-14 02:15:31 +08:00
|
|
|
#include "llvm/IR/DebugInfoMetadata.h"
|
2015-06-27 06:04:20 +08:00
|
|
|
#include "llvm/IR/ModuleSlotTracker.h"
|
2010-01-26 12:55:51 +08:00
|
|
|
#include "llvm/MC/MCAsmInfo.h"
|
|
|
|
#include "llvm/MC/MCContext.h"
|
2015-12-13 17:52:14 +08:00
|
|
|
#include "llvm/Support/DataTypes.h"
|
2010-01-05 07:22:07 +08:00
|
|
|
#include "llvm/Support/Debug.h"
|
2009-07-24 18:36:58 +08:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2012-12-04 00:50:05 +08:00
|
|
|
#include "llvm/Target/TargetMachine.h"
|
2004-10-26 23:43:42 +08:00
|
|
|
#include <algorithm>
|
2004-02-16 15:17:43 +08:00
|
|
|
using namespace llvm;
|
|
|
|
|
2014-04-22 06:55:11 +08:00
|
|
|
#define DEBUG_TYPE "codegen"
|
|
|
|
|
2019-08-22 21:44:47 +08:00
|
|
|
static cl::opt<bool> PrintSlotIndexes(
|
|
|
|
"print-slotindexes",
|
|
|
|
cl::desc("When printing machine IR, annotate instructions and blocks with "
|
|
|
|
"SlotIndexes when available"),
|
|
|
|
cl::init(true), cl::Hidden);
|
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
MachineBasicBlock::MachineBasicBlock(MachineFunction &MF, const BasicBlock *B)
|
|
|
|
: BB(B), Number(-1), xParent(&MF) {
|
2008-07-29 05:51:04 +08:00
|
|
|
Insts.Parent = this;
|
2017-11-03 06:26:51 +08:00
|
|
|
if (B)
|
|
|
|
IrrLoopHeaderWeight = B->getIrrLoopHeaderWeight();
|
2004-05-24 15:14:35 +08:00
|
|
|
}
|
|
|
|
|
2008-07-18 07:49:46 +08:00
|
|
|
MachineBasicBlock::~MachineBasicBlock() {
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// Return the MCSymbol for this basic block.
|
2010-03-14 05:04:28 +08:00
|
|
|
MCSymbol *MachineBasicBlock::getSymbol() const {
|
2013-04-23 05:21:08 +08:00
|
|
|
if (!CachedMCSymbol) {
|
|
|
|
const MachineFunction *MF = getParent();
|
|
|
|
MCContext &Ctx = MF->getContext();
|
2016-10-01 14:46:33 +08:00
|
|
|
auto Prefix = Ctx.getAsmInfo()->getPrivateLabelPrefix();
|
2020-03-17 06:56:02 +08:00
|
|
|
|
2015-11-12 07:09:31 +08:00
|
|
|
assert(getNumber() >= 0 && "cannot get label for unreachable MBB");
|
2013-04-23 05:21:08 +08:00
|
|
|
|
2020-05-05 03:02:57 +08:00
|
|
|
// We emit a non-temporary symbol for every basic block if we have BBLabels
|
|
|
|
// or -- with basic block sections -- when a basic block begins a section.
|
|
|
|
// With basic block symbols, we use a unary encoding which can
|
|
|
|
// compress the symbol names significantly. For basic block sections where
|
|
|
|
// this block is the first in a cluster, we use a non-temp descriptive name.
|
|
|
|
// Otherwise we fall back to use temp label.
|
|
|
|
if (MF->hasBBLabels()) {
|
2020-03-17 06:56:02 +08:00
|
|
|
auto Iter = MF->getBBSectionsSymbolPrefix().begin();
|
|
|
|
if (getNumber() < 0 ||
|
|
|
|
getNumber() >= (int)MF->getBBSectionsSymbolPrefix().size())
|
|
|
|
report_fatal_error("Unreachable MBB: " + Twine(getNumber()));
|
2020-05-05 03:02:57 +08:00
|
|
|
// The basic blocks for function foo are named a.BB.foo, aa.BB.foo, and
|
|
|
|
// so on.
|
2020-03-17 06:56:02 +08:00
|
|
|
std::string Prefix(Iter + 1, Iter + getNumber() + 1);
|
|
|
|
std::reverse(Prefix.begin(), Prefix.end());
|
|
|
|
CachedMCSymbol =
|
2020-05-05 03:02:57 +08:00
|
|
|
Ctx.getOrCreateSymbol(Twine(Prefix) + ".BB." + Twine(MF->getName()));
|
|
|
|
} else if (MF->hasBBSections() && isBeginSection()) {
|
|
|
|
SmallString<5> Suffix;
|
|
|
|
if (SectionID == MBBSectionID::ColdSectionID) {
|
|
|
|
Suffix += ".cold";
|
|
|
|
} else if (SectionID == MBBSectionID::ExceptionSectionID) {
|
|
|
|
Suffix += ".eh";
|
|
|
|
} else {
|
|
|
|
Suffix += "." + std::to_string(SectionID.Number);
|
|
|
|
}
|
|
|
|
CachedMCSymbol = Ctx.getOrCreateSymbol(MF->getName() + Suffix);
|
2020-03-17 06:56:02 +08:00
|
|
|
} else {
|
2020-05-05 03:02:57 +08:00
|
|
|
CachedMCSymbol = Ctx.getOrCreateSymbol(Twine(Prefix) + "BB" +
|
|
|
|
Twine(MF->getFunctionNumber()) +
|
|
|
|
"_" + Twine(getNumber()));
|
2020-03-17 06:56:02 +08:00
|
|
|
}
|
|
|
|
}
|
2013-04-23 05:21:08 +08:00
|
|
|
return CachedMCSymbol;
|
2010-01-26 12:55:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-08-23 08:35:30 +08:00
|
|
|
raw_ostream &llvm::operator<<(raw_ostream &OS, const MachineBasicBlock &MBB) {
|
2009-07-24 18:36:58 +08:00
|
|
|
MBB.print(OS);
|
|
|
|
return OS;
|
|
|
|
}
|
2004-05-24 15:14:35 +08:00
|
|
|
|
2017-12-05 01:18:51 +08:00
|
|
|
Printable llvm::printMBBReference(const MachineBasicBlock &MBB) {
|
|
|
|
return Printable([&MBB](raw_ostream &OS) { return MBB.printAsOperand(OS); });
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// When an MBB is added to an MF, we need to update the parent pointer of the
|
|
|
|
/// MBB, the MBB numbering, and any instructions in the MBB to be on the right
|
|
|
|
/// operand list for registers.
|
2008-01-01 09:12:31 +08:00
|
|
|
///
|
|
|
|
/// MBBs start out as #-1. When a MBB is added to a MachineFunction, it
|
|
|
|
/// gets the next available unique MBB number. If it is removed from a
|
|
|
|
/// MachineFunction, it goes back to being #-1.
|
2016-08-31 02:40:47 +08:00
|
|
|
void ilist_callback_traits<MachineBasicBlock>::addNodeToList(
|
|
|
|
MachineBasicBlock *N) {
|
2008-07-08 07:14:23 +08:00
|
|
|
MachineFunction &MF = *N->getParent();
|
|
|
|
N->Number = MF.addToMBBNumbering(N);
|
2008-01-01 09:12:31 +08:00
|
|
|
|
|
|
|
// Make sure the instructions have their operands in the reginfo lists.
|
2008-07-08 07:14:23 +08:00
|
|
|
MachineRegisterInfo &RegInfo = MF.getRegInfo();
|
2011-12-14 10:11:42 +08:00
|
|
|
for (MachineBasicBlock::instr_iterator
|
|
|
|
I = N->instr_begin(), E = N->instr_end(); I != E; ++I)
|
2008-01-01 09:12:31 +08:00
|
|
|
I->AddRegOperandsToUseLists(RegInfo);
|
2004-05-13 05:35:22 +08:00
|
|
|
}
|
|
|
|
|
2016-08-31 02:40:47 +08:00
|
|
|
void ilist_callback_traits<MachineBasicBlock>::removeNodeFromList(
|
|
|
|
MachineBasicBlock *N) {
|
2007-12-31 12:56:33 +08:00
|
|
|
N->getParent()->removeFromMBBNumbering(N->Number);
|
2004-05-13 05:35:22 +08:00
|
|
|
N->Number = -1;
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// When we add an instruction to a basic block list, we update its parent
|
|
|
|
/// pointer and add its operands from reg use/def lists if appropriate.
|
2009-08-23 08:35:30 +08:00
|
|
|
void ilist_traits<MachineInstr>::addNodeToList(MachineInstr *N) {
|
2014-04-14 08:51:57 +08:00
|
|
|
assert(!N->getParent() && "machine instruction already in a basic block");
|
2008-07-08 07:14:23 +08:00
|
|
|
N->setParent(Parent);
|
2011-06-17 02:01:17 +08:00
|
|
|
|
2008-07-08 07:14:23 +08:00
|
|
|
// Add the instruction's register operands to their corresponding
|
|
|
|
// use/def lists.
|
|
|
|
MachineFunction *MF = Parent->getParent();
|
|
|
|
N->AddRegOperandsToUseLists(MF->getRegInfo());
|
2018-09-21 07:01:56 +08:00
|
|
|
MF->handleInsertion(*N);
|
2004-02-16 15:17:43 +08:00
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// When we remove an instruction from a basic block list, we update its parent
|
|
|
|
/// pointer and remove its operands from reg use/def lists if appropriate.
|
2009-08-23 08:35:30 +08:00
|
|
|
void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr *N) {
|
2014-04-14 08:51:57 +08:00
|
|
|
assert(N->getParent() && "machine instruction not in a basic block");
|
2008-07-08 07:14:23 +08:00
|
|
|
|
|
|
|
// Remove from the use/def lists.
|
2018-09-21 07:01:56 +08:00
|
|
|
if (MachineFunction *MF = N->getMF()) {
|
|
|
|
MF->handleRemoval(*N);
|
2012-08-10 06:49:37 +08:00
|
|
|
N->RemoveRegOperandsFromUseLists(MF->getRegInfo());
|
2018-09-21 07:01:56 +08:00
|
|
|
}
|
2011-06-17 02:01:17 +08:00
|
|
|
|
2014-04-14 08:51:57 +08:00
|
|
|
N->setParent(nullptr);
|
2004-02-16 15:17:43 +08:00
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// When moving a range of instructions from one MBB list to another, we need to
|
|
|
|
/// update the parent pointers and the use/def lists.
|
2016-09-12 00:38:18 +08:00
|
|
|
void ilist_traits<MachineInstr>::transferNodesFromList(ilist_traits &FromList,
|
|
|
|
instr_iterator First,
|
|
|
|
instr_iterator Last) {
|
2015-09-30 03:46:09 +08:00
|
|
|
assert(Parent->getParent() == FromList.Parent->getParent() &&
|
2019-01-24 06:59:52 +08:00
|
|
|
"cannot transfer MachineInstrs between MachineFunctions");
|
|
|
|
|
|
|
|
// If it's within the same BB, there's nothing to do.
|
|
|
|
if (this == &FromList)
|
|
|
|
return;
|
|
|
|
|
2016-08-31 02:00:45 +08:00
|
|
|
assert(Parent != FromList.Parent && "Two lists have the same parent?");
|
2008-01-01 09:12:31 +08:00
|
|
|
|
|
|
|
// If splicing between two blocks within the same function, just update the
|
|
|
|
// parent pointers.
|
2015-09-30 03:46:09 +08:00
|
|
|
for (; First != Last; ++First)
|
|
|
|
First->setParent(Parent);
|
2004-02-16 15:17:43 +08:00
|
|
|
}
|
|
|
|
|
2016-08-31 02:40:47 +08:00
|
|
|
void ilist_traits<MachineInstr>::deleteNode(MachineInstr *MI) {
|
2008-07-08 07:14:23 +08:00
|
|
|
assert(!MI->getParent() && "MI is still in a block!");
|
|
|
|
Parent->getParent()->DeleteMachineInstr(MI);
|
|
|
|
}
|
|
|
|
|
2010-07-07 22:33:51 +08:00
|
|
|
MachineBasicBlock::iterator MachineBasicBlock::getFirstNonPHI() {
|
2012-02-10 08:28:31 +08:00
|
|
|
instr_iterator I = instr_begin(), E = instr_end();
|
|
|
|
while (I != E && I->isPHI())
|
2010-07-07 22:33:51 +08:00
|
|
|
++I;
|
2012-10-27 01:11:42 +08:00
|
|
|
assert((I == E || !I->isInsideBundle()) &&
|
|
|
|
"First non-phi MI cannot be inside a bundle!");
|
2010-07-07 22:33:51 +08:00
|
|
|
return I;
|
|
|
|
}
|
|
|
|
|
2010-10-30 09:26:14 +08:00
|
|
|
MachineBasicBlock::iterator
|
|
|
|
MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
|
2017-01-20 08:44:31 +08:00
|
|
|
const TargetInstrInfo *TII = getParent()->getSubtarget().getInstrInfo();
|
|
|
|
|
2016-09-16 22:07:29 +08:00
|
|
|
iterator E = end();
|
2017-01-20 08:44:31 +08:00
|
|
|
while (I != E && (I->isPHI() || I->isPosition() ||
|
|
|
|
TII->isBasicBlockPrologue(*I)))
|
2016-09-16 22:07:29 +08:00
|
|
|
++I;
|
|
|
|
// FIXME: This needs to change if we wish to bundle labels
|
|
|
|
// inside the bundle.
|
|
|
|
assert((I == E || !I->isInsideBundle()) &&
|
|
|
|
"First non-phi / non-label instruction is inside a bundle!");
|
|
|
|
return I;
|
|
|
|
}
|
|
|
|
|
|
|
|
MachineBasicBlock::iterator
|
|
|
|
MachineBasicBlock::SkipPHIsLabelsAndDebug(MachineBasicBlock::iterator I) {
|
2017-01-20 08:44:31 +08:00
|
|
|
const TargetInstrInfo *TII = getParent()->getSubtarget().getInstrInfo();
|
|
|
|
|
2012-02-10 08:28:31 +08:00
|
|
|
iterator E = end();
|
2018-05-09 10:42:00 +08:00
|
|
|
while (I != E && (I->isPHI() || I->isPosition() || I->isDebugInstr() ||
|
2017-01-20 08:44:31 +08:00
|
|
|
TII->isBasicBlockPrologue(*I)))
|
2010-10-30 09:26:14 +08:00
|
|
|
++I;
|
2011-12-07 06:12:01 +08:00
|
|
|
// FIXME: This needs to change if we wish to bundle labels / dbg_values
|
|
|
|
// inside the bundle.
|
2012-10-27 01:11:42 +08:00
|
|
|
assert((I == E || !I->isInsideBundle()) &&
|
2016-09-16 22:07:29 +08:00
|
|
|
"First non-phi / non-label / non-debug "
|
|
|
|
"instruction is inside a bundle!");
|
2010-10-30 09:26:14 +08:00
|
|
|
return I;
|
|
|
|
}
|
|
|
|
|
2004-10-26 23:43:42 +08:00
|
|
|
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
|
2012-02-10 08:28:31 +08:00
|
|
|
iterator B = begin(), E = end(), I = E;
|
2018-05-09 10:42:00 +08:00
|
|
|
while (I != B && ((--I)->isTerminator() || I->isDebugInstr()))
|
2011-01-14 10:12:54 +08:00
|
|
|
; /*noop */
|
2012-02-10 08:28:31 +08:00
|
|
|
while (I != E && !I->isTerminator())
|
2011-12-07 06:12:01 +08:00
|
|
|
++I;
|
|
|
|
return I;
|
|
|
|
}
|
|
|
|
|
2011-12-14 10:11:42 +08:00
|
|
|
MachineBasicBlock::instr_iterator MachineBasicBlock::getFirstInstrTerminator() {
|
2012-02-10 08:28:31 +08:00
|
|
|
instr_iterator B = instr_begin(), E = instr_end(), I = E;
|
2018-05-09 10:42:00 +08:00
|
|
|
while (I != B && ((--I)->isTerminator() || I->isDebugInstr()))
|
2011-12-07 06:12:01 +08:00
|
|
|
; /*noop */
|
2012-02-10 08:28:31 +08:00
|
|
|
while (I != E && !I->isTerminator())
|
2011-01-14 14:33:45 +08:00
|
|
|
++I;
|
2011-01-14 10:12:54 +08:00
|
|
|
return I;
|
2004-02-24 02:14:48 +08:00
|
|
|
}
|
|
|
|
|
2015-06-23 22:47:29 +08:00
|
|
|
MachineBasicBlock::iterator MachineBasicBlock::getFirstNonDebugInstr() {
|
|
|
|
// Skip over begin-of-block dbg_value instructions.
|
2016-12-16 19:10:26 +08:00
|
|
|
return skipDebugInstructionsForward(begin(), end());
|
2015-06-23 22:47:29 +08:00
|
|
|
}
|
|
|
|
|
2011-01-14 05:28:52 +08:00
|
|
|
MachineBasicBlock::iterator MachineBasicBlock::getLastNonDebugInstr() {
|
2011-12-07 06:12:01 +08:00
|
|
|
// Skip over end-of-block dbg_value instructions.
|
2011-12-14 10:11:42 +08:00
|
|
|
instr_iterator B = instr_begin(), I = instr_end();
|
2011-01-14 05:28:52 +08:00
|
|
|
while (I != B) {
|
|
|
|
--I;
|
2011-12-07 06:12:01 +08:00
|
|
|
// Return instruction that starts a bundle.
|
2018-05-09 10:42:00 +08:00
|
|
|
if (I->isDebugInstr() || I->isInsideBundle())
|
2011-12-07 06:12:01 +08:00
|
|
|
continue;
|
|
|
|
return I;
|
|
|
|
}
|
|
|
|
// The block is all debug values.
|
|
|
|
return end();
|
|
|
|
}
|
|
|
|
|
2015-09-18 01:19:40 +08:00
|
|
|
bool MachineBasicBlock::hasEHPadSuccessor() const {
|
|
|
|
for (const_succ_iterator I = succ_begin(), E = succ_end(); I != E; ++I)
|
|
|
|
if ((*I)->isEHPad())
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-10-15 22:32:27 +08:00
|
|
|
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
|
2016-01-30 04:50:44 +08:00
|
|
|
LLVM_DUMP_METHOD void MachineBasicBlock::dump() const {
|
2010-01-05 07:22:07 +08:00
|
|
|
print(dbgs());
|
2004-02-16 15:17:43 +08:00
|
|
|
}
|
2012-09-07 03:06:06 +08:00
|
|
|
#endif
|
2004-02-16 15:17:43 +08:00
|
|
|
|
2017-06-23 07:27:16 +08:00
|
|
|
bool MachineBasicBlock::isLegalToHoistInto() const {
|
|
|
|
if (isReturnBlock() || hasEHPadSuccessor())
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-11-20 09:17:03 +08:00
|
|
|
StringRef MachineBasicBlock::getName() const {
|
|
|
|
if (const BasicBlock *LBB = getBasicBlock())
|
|
|
|
return LBB->getName();
|
|
|
|
else
|
2017-02-18 08:41:16 +08:00
|
|
|
return StringRef("", 0);
|
2009-11-20 09:17:03 +08:00
|
|
|
}
|
|
|
|
|
2012-03-07 08:18:18 +08:00
|
|
|
/// Return a hopefully unique identifier for this block.
|
|
|
|
std::string MachineBasicBlock::getFullName() const {
|
|
|
|
std::string Name;
|
|
|
|
if (getParent())
|
2012-08-22 14:07:19 +08:00
|
|
|
Name = (getParent()->getName() + ":").str();
|
2012-03-07 08:18:18 +08:00
|
|
|
if (getBasicBlock())
|
|
|
|
Name += getBasicBlock()->getName();
|
|
|
|
else
|
2015-03-28 01:51:30 +08:00
|
|
|
Name += ("BB" + Twine(getNumber())).str();
|
2012-03-07 08:18:18 +08:00
|
|
|
return Name;
|
|
|
|
}
|
|
|
|
|
2018-01-19 01:59:06 +08:00
|
|
|
void MachineBasicBlock::print(raw_ostream &OS, const SlotIndexes *Indexes,
|
2018-01-19 02:05:15 +08:00
|
|
|
bool IsStandalone) const {
|
2007-02-10 10:38:19 +08:00
|
|
|
const MachineFunction *MF = getParent();
|
2009-08-23 08:35:30 +08:00
|
|
|
if (!MF) {
|
2004-10-26 23:43:42 +08:00
|
|
|
OS << "Can't print out MachineBasicBlock because parent MachineFunction"
|
|
|
|
<< " is null\n";
|
2004-05-24 14:11:51 +08:00
|
|
|
return;
|
|
|
|
}
|
2017-12-16 06:22:58 +08:00
|
|
|
const Function &F = MF->getFunction();
|
|
|
|
const Module *M = F.getParent();
|
2015-06-27 06:04:20 +08:00
|
|
|
ModuleSlotTracker MST(M);
|
2018-02-08 13:02:00 +08:00
|
|
|
MST.incorporateFunction(F);
|
2018-01-19 02:05:15 +08:00
|
|
|
print(OS, MST, Indexes, IsStandalone);
|
2015-06-27 06:04:20 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void MachineBasicBlock::print(raw_ostream &OS, ModuleSlotTracker &MST,
|
2018-01-19 01:59:06 +08:00
|
|
|
const SlotIndexes *Indexes,
|
2018-01-19 02:05:15 +08:00
|
|
|
bool IsStandalone) const {
|
2015-06-27 06:04:20 +08:00
|
|
|
const MachineFunction *MF = getParent();
|
|
|
|
if (!MF) {
|
|
|
|
OS << "Can't print out MachineBasicBlock because parent MachineFunction"
|
|
|
|
<< " is null\n";
|
|
|
|
return;
|
|
|
|
}
|
2004-09-06 02:39:20 +08:00
|
|
|
|
2019-08-22 21:44:47 +08:00
|
|
|
if (Indexes && PrintSlotIndexes)
|
2010-10-27 04:21:46 +08:00
|
|
|
OS << Indexes->getMBBStartIdx(this) << '\t';
|
|
|
|
|
2018-02-08 13:02:00 +08:00
|
|
|
OS << "bb." << getNumber();
|
|
|
|
bool HasAttributes = false;
|
|
|
|
if (const auto *BB = getBasicBlock()) {
|
|
|
|
if (BB->hasName()) {
|
|
|
|
OS << "." << BB->getName();
|
|
|
|
} else {
|
|
|
|
HasAttributes = true;
|
|
|
|
OS << " (";
|
|
|
|
int Slot = MST.getLocalSlot(BB);
|
|
|
|
if (Slot == -1)
|
|
|
|
OS << "<ir-block badref>";
|
|
|
|
else
|
|
|
|
OS << (Twine("%ir-block.") + Twine(Slot)).str();
|
|
|
|
}
|
2009-11-01 04:19:03 +08:00
|
|
|
}
|
2011-12-07 05:08:39 +08:00
|
|
|
|
2018-02-08 13:02:00 +08:00
|
|
|
if (hasAddressTaken()) {
|
|
|
|
OS << (HasAttributes ? ", " : " (");
|
|
|
|
OS << "address-taken";
|
|
|
|
HasAttributes = true;
|
|
|
|
}
|
|
|
|
if (isEHPad()) {
|
|
|
|
OS << (HasAttributes ? ", " : " (");
|
|
|
|
OS << "landing-pad";
|
|
|
|
HasAttributes = true;
|
|
|
|
}
|
[Alignment][NFC] Deprecate Align::None()
Summary:
This is a follow up on https://reviews.llvm.org/D71473#inline-647262.
There's a caveat here that `Align(1)` relies on the compiler understanding of `Log2_64` implementation to produce good code. One could use `Align()` as a replacement but I believe it is less clear that the alignment is one in that case.
Reviewers: xbolva00, courbet, bollu
Subscribers: arsenm, dylanmckay, sdardis, nemanjai, jvesely, nhaehnle, hiraditya, kbarton, jrtc27, atanasyan, jsji, Jim, kerbowa, cfe-commits, llvm-commits
Tags: #clang, #llvm
Differential Revision: https://reviews.llvm.org/D73099
2020-01-21 22:00:04 +08:00
|
|
|
if (getAlignment() != Align(1)) {
|
2018-02-08 13:02:00 +08:00
|
|
|
OS << (HasAttributes ? ", " : " (");
|
[Alignment][NFC] Remove LogAlignment functions
Summary:
This is patch is part of a series to introduce an Alignment type.
See this thread for context: http://lists.llvm.org/pipermail/llvm-dev/2019-July/133851.html
See this patch for the introduction of the type: https://reviews.llvm.org/D64790
Reviewers: courbet
Subscribers: arsenm, sdardis, nemanjai, jvesely, nhaehnle, hiraditya, kbarton, jrtc27, MaskRay, atanasyan, jsji, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D67620
llvm-svn: 372231
2019-09-18 23:49:49 +08:00
|
|
|
OS << "align " << Log2(getAlignment());
|
2018-02-08 13:02:00 +08:00
|
|
|
HasAttributes = true;
|
|
|
|
}
|
|
|
|
if (HasAttributes)
|
|
|
|
OS << ")";
|
|
|
|
OS << ":\n";
|
2007-02-10 10:38:19 +08:00
|
|
|
|
2014-08-05 10:39:49 +08:00
|
|
|
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
|
2018-02-09 09:14:44 +08:00
|
|
|
const MachineRegisterInfo &MRI = MF->getRegInfo();
|
2018-02-14 02:08:26 +08:00
|
|
|
const TargetInstrInfo &TII = *getParent()->getSubtarget().getInstrInfo();
|
2018-02-16 00:23:59 +08:00
|
|
|
bool HasLineAttributes = false;
|
2018-02-09 09:14:44 +08:00
|
|
|
|
2018-02-15 04:23:05 +08:00
|
|
|
// Print the preds of this block according to the CFG.
|
2018-02-26 23:23:42 +08:00
|
|
|
if (!pred_empty() && IsStandalone) {
|
2018-02-15 04:23:05 +08:00
|
|
|
if (Indexes) OS << '\t';
|
|
|
|
// Don't indent(2), align with previous line attributes.
|
|
|
|
OS << "; predecessors: ";
|
|
|
|
for (auto I = pred_begin(), E = pred_end(); I != E; ++I) {
|
|
|
|
if (I != pred_begin())
|
2018-02-09 09:14:44 +08:00
|
|
|
OS << ", ";
|
2018-02-15 04:23:05 +08:00
|
|
|
OS << printMBBReference(**I);
|
2015-08-25 06:59:52 +08:00
|
|
|
}
|
2009-08-23 08:35:30 +08:00
|
|
|
OS << '\n';
|
2018-02-16 00:23:59 +08:00
|
|
|
HasLineAttributes = true;
|
2007-02-10 10:38:19 +08:00
|
|
|
}
|
2018-02-09 08:10:31 +08:00
|
|
|
|
2018-02-09 08:12:53 +08:00
|
|
|
if (!succ_empty()) {
|
2018-02-09 09:14:44 +08:00
|
|
|
if (Indexes) OS << '\t';
|
2018-02-09 08:12:53 +08:00
|
|
|
// Print the successors
|
|
|
|
OS.indent(2) << "successors: ";
|
|
|
|
for (auto I = succ_begin(), E = succ_end(); I != E; ++I) {
|
|
|
|
if (I != succ_begin())
|
|
|
|
OS << ", ";
|
|
|
|
OS << printMBBReference(**I);
|
2018-02-09 08:40:57 +08:00
|
|
|
if (!Probs.empty())
|
|
|
|
OS << '('
|
|
|
|
<< format("0x%08" PRIx32, getSuccProbability(I).getNumerator())
|
|
|
|
<< ')';
|
2018-02-09 08:12:53 +08:00
|
|
|
}
|
2018-02-26 23:23:42 +08:00
|
|
|
if (!Probs.empty() && IsStandalone) {
|
2018-02-09 08:40:57 +08:00
|
|
|
// Print human readable probabilities as comments.
|
|
|
|
OS << "; ";
|
|
|
|
for (auto I = succ_begin(), E = succ_end(); I != E; ++I) {
|
2018-09-28 13:27:32 +08:00
|
|
|
const BranchProbability &BP = getSuccProbability(I);
|
2018-02-09 08:40:57 +08:00
|
|
|
if (I != succ_begin())
|
|
|
|
OS << ", ";
|
|
|
|
OS << printMBBReference(**I) << '('
|
|
|
|
<< format("%.2f%%",
|
|
|
|
rint(((double)BP.getNumerator() / BP.getDenominator()) *
|
|
|
|
100.0 * 100.0) /
|
|
|
|
100.0)
|
|
|
|
<< ')';
|
|
|
|
}
|
2018-02-09 08:12:53 +08:00
|
|
|
}
|
2018-02-16 00:23:59 +08:00
|
|
|
|
|
|
|
OS << '\n';
|
|
|
|
HasLineAttributes = true;
|
2018-02-09 08:10:31 +08:00
|
|
|
}
|
|
|
|
|
2018-02-15 04:23:05 +08:00
|
|
|
if (!livein_empty() && MRI.tracksLiveness()) {
|
2010-10-27 04:21:46 +08:00
|
|
|
if (Indexes) OS << '\t';
|
2018-02-15 04:23:05 +08:00
|
|
|
OS.indent(2) << "liveins: ";
|
|
|
|
|
|
|
|
bool First = true;
|
|
|
|
for (const auto &LI : liveins()) {
|
|
|
|
if (!First)
|
2018-02-10 03:46:02 +08:00
|
|
|
OS << ", ";
|
2018-02-15 04:23:05 +08:00
|
|
|
First = false;
|
|
|
|
OS << printReg(LI.PhysReg, TRI);
|
|
|
|
if (!LI.LaneMask.all())
|
|
|
|
OS << ":0x" << PrintLaneMask(LI.LaneMask);
|
2018-02-10 03:46:02 +08:00
|
|
|
}
|
2018-02-16 00:23:59 +08:00
|
|
|
HasLineAttributes = true;
|
2006-09-26 11:41:59 +08:00
|
|
|
}
|
2010-10-27 04:21:46 +08:00
|
|
|
|
2018-02-16 00:23:59 +08:00
|
|
|
if (HasLineAttributes)
|
|
|
|
OS << '\n';
|
|
|
|
|
2018-02-14 02:08:26 +08:00
|
|
|
bool IsInBundle = false;
|
|
|
|
for (const MachineInstr &MI : instrs()) {
|
2019-08-22 21:44:47 +08:00
|
|
|
if (Indexes && PrintSlotIndexes) {
|
2018-02-14 02:08:26 +08:00
|
|
|
if (Indexes->hasIndex(MI))
|
|
|
|
OS << Indexes->getInstructionIndex(MI);
|
2010-10-27 04:21:46 +08:00
|
|
|
OS << '\t';
|
|
|
|
}
|
2018-02-14 02:08:26 +08:00
|
|
|
|
|
|
|
if (IsInBundle && !MI.isInsideBundle()) {
|
|
|
|
OS.indent(2) << "}\n";
|
|
|
|
IsInBundle = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
OS.indent(IsInBundle ? 4 : 2);
|
|
|
|
MI.print(OS, MST, IsStandalone, /*SkipOpers=*/false, /*SkipDebugLoc=*/false,
|
2018-04-11 00:46:13 +08:00
|
|
|
/*AddNewLine=*/false, &TII);
|
2018-02-14 02:08:26 +08:00
|
|
|
|
|
|
|
if (!IsInBundle && MI.getFlag(MachineInstr::BundledSucc)) {
|
|
|
|
OS << " {";
|
|
|
|
IsInBundle = true;
|
|
|
|
}
|
2018-04-11 00:46:13 +08:00
|
|
|
OS << '\n';
|
2004-09-06 02:39:20 +08:00
|
|
|
}
|
2005-04-01 14:48:38 +08:00
|
|
|
|
2018-02-14 02:08:26 +08:00
|
|
|
if (IsInBundle)
|
|
|
|
OS.indent(2) << "}\n";
|
|
|
|
|
2018-02-26 23:23:42 +08:00
|
|
|
if (IrrLoopHeaderWeight && IsStandalone) {
|
2017-11-03 06:26:51 +08:00
|
|
|
if (Indexes) OS << '\t';
|
2018-02-15 23:27:34 +08:00
|
|
|
OS.indent(2) << "; Irreducible loop header weight: "
|
|
|
|
<< IrrLoopHeaderWeight.getValue() << '\n';
|
2017-11-03 06:26:51 +08:00
|
|
|
}
|
2004-02-16 15:17:43 +08:00
|
|
|
}
|
2004-10-26 23:43:42 +08:00
|
|
|
|
2015-08-11 06:27:10 +08:00
|
|
|
void MachineBasicBlock::printAsOperand(raw_ostream &OS,
|
|
|
|
bool /*PrintType*/) const {
|
2017-12-05 01:18:51 +08:00
|
|
|
OS << "%bb." << getNumber();
|
2014-01-09 10:29:41 +08:00
|
|
|
}
|
|
|
|
|
2015-09-26 05:51:14 +08:00
|
|
|
void MachineBasicBlock::removeLiveIn(MCPhysReg Reg, LaneBitmask LaneMask) {
|
2016-08-12 11:55:06 +08:00
|
|
|
LiveInVector::iterator I = find_if(
|
|
|
|
LiveIns, [Reg](const RegisterMaskPair &LI) { return LI.PhysReg == Reg; });
|
2015-09-10 02:08:03 +08:00
|
|
|
if (I == LiveIns.end())
|
|
|
|
return;
|
|
|
|
|
|
|
|
I->LaneMask &= ~LaneMask;
|
2016-12-15 22:36:06 +08:00
|
|
|
if (I->LaneMask.none())
|
2012-03-29 04:11:42 +08:00
|
|
|
LiveIns.erase(I);
|
2007-02-20 05:49:54 +08:00
|
|
|
}
|
|
|
|
|
2017-06-01 04:30:22 +08:00
|
|
|
MachineBasicBlock::livein_iterator
|
|
|
|
MachineBasicBlock::removeLiveIn(MachineBasicBlock::livein_iterator I) {
|
2017-06-01 05:25:03 +08:00
|
|
|
// Get non-const version of iterator.
|
|
|
|
LiveInVector::iterator LI = LiveIns.begin() + (I - LiveIns.begin());
|
|
|
|
return LiveIns.erase(LI);
|
2017-06-01 04:30:22 +08:00
|
|
|
}
|
|
|
|
|
2015-09-26 05:51:14 +08:00
|
|
|
bool MachineBasicBlock::isLiveIn(MCPhysReg Reg, LaneBitmask LaneMask) const {
|
2016-08-12 11:55:06 +08:00
|
|
|
livein_iterator I = find_if(
|
|
|
|
LiveIns, [Reg](const RegisterMaskPair &LI) { return LI.PhysReg == Reg; });
|
2016-12-17 03:11:56 +08:00
|
|
|
return I != livein_end() && (I->LaneMask & LaneMask).any();
|
2015-09-10 02:08:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void MachineBasicBlock::sortUniqueLiveIns() {
|
llvm::sort(C.begin(), C.end(), ...) -> llvm::sort(C, ...)
Summary: The convenience wrapper in STLExtras is available since rL342102.
Reviewers: dblaikie, javed.absar, JDevlieghere, andreadb
Subscribers: MatzeB, sanjoy, arsenm, dschuff, mehdi_amini, sdardis, nemanjai, jvesely, nhaehnle, sbc100, jgravelle-google, eraman, aheejin, kbarton, JDevlieghere, javed.absar, gbedwell, jrtc27, mgrang, atanasyan, steven_wu, george.burgess.iv, dexonsmith, kristina, jsji, llvm-commits
Differential Revision: https://reviews.llvm.org/D52573
llvm-svn: 343163
2018-09-27 10:13:45 +08:00
|
|
|
llvm::sort(LiveIns,
|
2018-04-07 02:08:42 +08:00
|
|
|
[](const RegisterMaskPair &LI0, const RegisterMaskPair &LI1) {
|
|
|
|
return LI0.PhysReg < LI1.PhysReg;
|
|
|
|
});
|
2015-09-10 02:08:03 +08:00
|
|
|
// Liveins are sorted by physreg now we can merge their lanemasks.
|
|
|
|
LiveInVector::const_iterator I = LiveIns.begin();
|
|
|
|
LiveInVector::const_iterator J;
|
|
|
|
LiveInVector::iterator Out = LiveIns.begin();
|
|
|
|
for (; I != LiveIns.end(); ++Out, I = J) {
|
2020-04-08 22:40:26 +08:00
|
|
|
MCRegister PhysReg = I->PhysReg;
|
2015-09-26 05:51:14 +08:00
|
|
|
LaneBitmask LaneMask = I->LaneMask;
|
2015-09-10 02:08:03 +08:00
|
|
|
for (J = std::next(I); J != LiveIns.end() && J->PhysReg == PhysReg; ++J)
|
|
|
|
LaneMask |= J->LaneMask;
|
|
|
|
Out->PhysReg = PhysReg;
|
|
|
|
Out->LaneMask = LaneMask;
|
|
|
|
}
|
|
|
|
LiveIns.erase(Out, LiveIns.end());
|
2015-07-29 23:57:49 +08:00
|
|
|
}
|
|
|
|
|
2020-04-08 22:40:26 +08:00
|
|
|
Register
|
2019-08-13 08:55:24 +08:00
|
|
|
MachineBasicBlock::addLiveIn(MCRegister PhysReg, const TargetRegisterClass *RC) {
|
2013-07-04 07:56:20 +08:00
|
|
|
assert(getParent() && "MBB must be inserted in function");
|
2019-08-13 08:55:24 +08:00
|
|
|
assert(PhysReg.isPhysical() && "Expected physreg");
|
2013-07-04 07:56:20 +08:00
|
|
|
assert(RC && "Register class is required");
|
2015-08-28 07:27:47 +08:00
|
|
|
assert((isEHPad() || this == &getParent()->front()) &&
|
2013-07-04 07:56:20 +08:00
|
|
|
"Only the entry block and landing pads can have physreg live ins");
|
|
|
|
|
|
|
|
bool LiveIn = isLiveIn(PhysReg);
|
2013-07-04 12:32:35 +08:00
|
|
|
iterator I = SkipPHIsAndLabels(begin()), E = end();
|
2013-07-04 07:56:20 +08:00
|
|
|
MachineRegisterInfo &MRI = getParent()->getRegInfo();
|
2014-08-05 10:39:49 +08:00
|
|
|
const TargetInstrInfo &TII = *getParent()->getSubtarget().getInstrInfo();
|
2013-07-04 07:56:20 +08:00
|
|
|
|
|
|
|
// Look for an existing copy.
|
|
|
|
if (LiveIn)
|
|
|
|
for (;I != E && I->isCopy(); ++I)
|
2019-08-06 05:34:45 +08:00
|
|
|
if (I->getOperand(1).getReg() == PhysReg) {
|
Apply llvm-prefer-register-over-unsigned from clang-tidy to LLVM
Summary:
This clang-tidy check is looking for unsigned integer variables whose initializer
starts with an implicit cast from llvm::Register and changes the type of the
variable to llvm::Register (dropping the llvm:: where possible).
Partial reverts in:
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
X86FixupLEAs.cpp - Some functions return unsigned and arguably should be MCRegister
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
HexagonBitSimplify.cpp - Function takes BitTracker::RegisterRef which appears to be unsigned&
MachineVerifier.cpp - Ambiguous operator==() given MCRegister and const Register
PPCFastISel.cpp - No Register::operator-=()
PeepholeOptimizer.cpp - TargetInstrInfo::optimizeLoadInstr() takes an unsigned&
MachineTraceMetrics.cpp - MachineTraceMetrics lacks a suitable constructor
Manual fixups in:
ARMFastISel.cpp - ARMEmitLoad() now takes a Register& instead of unsigned&
HexagonSplitDouble.cpp - Ternary operator was ambiguous between unsigned/Register
HexagonConstExtenders.cpp - Has a local class named Register, used llvm::Register instead of Register.
PPCFastISel.cpp - PPCEmitLoad() now takes a Register& instead of unsigned&
Depends on D65919
Reviewers: arsenm, bogner, craig.topper, RKSimon
Reviewed By: arsenm
Subscribers: RKSimon, craig.topper, lenary, aemerson, wuzish, jholewinski, MatzeB, qcolombet, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, wdng, nhaehnle, sbc100, jgravelle-google, kristof.beyls, hiraditya, aheejin, kbarton, fedor.sergeev, javed.absar, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, rogfer01, MartinMosbeck, brucehoult, the_o, tpr, PkmX, jocewei, jsji, Petar.Avramovic, asbirlea, Jim, s.egerton, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65962
llvm-svn: 369041
2019-08-16 03:22:08 +08:00
|
|
|
Register VirtReg = I->getOperand(0).getReg();
|
2013-07-04 07:56:20 +08:00
|
|
|
if (!MRI.constrainRegClass(VirtReg, RC))
|
|
|
|
llvm_unreachable("Incompatible live-in register class.");
|
|
|
|
return VirtReg;
|
|
|
|
}
|
|
|
|
|
|
|
|
// No luck, create a virtual register.
|
Apply llvm-prefer-register-over-unsigned from clang-tidy to LLVM
Summary:
This clang-tidy check is looking for unsigned integer variables whose initializer
starts with an implicit cast from llvm::Register and changes the type of the
variable to llvm::Register (dropping the llvm:: where possible).
Partial reverts in:
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
X86FixupLEAs.cpp - Some functions return unsigned and arguably should be MCRegister
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
HexagonBitSimplify.cpp - Function takes BitTracker::RegisterRef which appears to be unsigned&
MachineVerifier.cpp - Ambiguous operator==() given MCRegister and const Register
PPCFastISel.cpp - No Register::operator-=()
PeepholeOptimizer.cpp - TargetInstrInfo::optimizeLoadInstr() takes an unsigned&
MachineTraceMetrics.cpp - MachineTraceMetrics lacks a suitable constructor
Manual fixups in:
ARMFastISel.cpp - ARMEmitLoad() now takes a Register& instead of unsigned&
HexagonSplitDouble.cpp - Ternary operator was ambiguous between unsigned/Register
HexagonConstExtenders.cpp - Has a local class named Register, used llvm::Register instead of Register.
PPCFastISel.cpp - PPCEmitLoad() now takes a Register& instead of unsigned&
Depends on D65919
Reviewers: arsenm, bogner, craig.topper, RKSimon
Reviewed By: arsenm
Subscribers: RKSimon, craig.topper, lenary, aemerson, wuzish, jholewinski, MatzeB, qcolombet, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, wdng, nhaehnle, sbc100, jgravelle-google, kristof.beyls, hiraditya, aheejin, kbarton, fedor.sergeev, javed.absar, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, rogfer01, MartinMosbeck, brucehoult, the_o, tpr, PkmX, jocewei, jsji, Petar.Avramovic, asbirlea, Jim, s.egerton, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65962
llvm-svn: 369041
2019-08-16 03:22:08 +08:00
|
|
|
Register VirtReg = MRI.createVirtualRegister(RC);
|
2013-07-04 07:56:20 +08:00
|
|
|
BuildMI(*this, I, DebugLoc(), TII.get(TargetOpcode::COPY), VirtReg)
|
|
|
|
.addReg(PhysReg, RegState::Kill);
|
|
|
|
if (!LiveIn)
|
|
|
|
addLiveIn(PhysReg);
|
|
|
|
return VirtReg;
|
|
|
|
}
|
|
|
|
|
2006-10-24 08:02:26 +08:00
|
|
|
void MachineBasicBlock::moveBefore(MachineBasicBlock *NewAfter) {
|
2015-10-10 03:23:20 +08:00
|
|
|
getParent()->splice(NewAfter->getIterator(), getIterator());
|
2006-10-24 08:02:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void MachineBasicBlock::moveAfter(MachineBasicBlock *NewBefore) {
|
2015-10-10 03:23:20 +08:00
|
|
|
getParent()->splice(++NewBefore->getIterator(), getIterator());
|
2006-10-24 08:02:26 +08:00
|
|
|
}
|
|
|
|
|
2009-11-12 11:55:33 +08:00
|
|
|
void MachineBasicBlock::updateTerminator() {
|
2014-08-05 10:39:49 +08:00
|
|
|
const TargetInstrInfo *TII = getParent()->getSubtarget().getInstrInfo();
|
2009-11-12 11:55:33 +08:00
|
|
|
// A block with no successors has no concerns with fall-through edges.
|
2016-05-26 05:53:46 +08:00
|
|
|
if (this->succ_empty())
|
|
|
|
return;
|
2009-11-12 11:55:33 +08:00
|
|
|
|
2014-04-14 08:51:57 +08:00
|
|
|
MachineBasicBlock *TBB = nullptr, *FBB = nullptr;
|
2009-11-12 11:55:33 +08:00
|
|
|
SmallVector<MachineOperand, 4> Cond;
|
Make MachineBasicBlock::updateTerminator to update DebugLoc as well
Summary:
Currently MachineBasicBlock::updateTerminator simply drops DebugLoc for newly created branch instructions, which may cause incorrect stepping and/or imprecise sample profile data. Below is an example:
```
1 extern int bar(int x);
2
3 int foo(int *begin, int *end) {
4 int *i;
5 int ret = 0;
6 for (
7 i = begin ;
8 i != end ;
9 i++)
10 {
11 ret += bar(*i);
12 }
13 return ret;
14 }
```
Below is a bitcode of 'foo' at the end of LLVM-IR level optimizations with -O3:
```
define i32 @foo(i32* readonly %begin, i32* readnone %end) !dbg !4 {
entry:
%cmp6 = icmp eq i32* %begin, %end, !dbg !9
br i1 %cmp6, label %for.end, label %for.body.preheader, !dbg !12
for.body.preheader: ; preds = %entry
br label %for.body, !dbg !13
for.body: ; preds = %for.body.preheader, %for.body
%ret.08 = phi i32 [ %add, %for.body ], [ 0, %for.body.preheader ]
%i.07 = phi i32* [ %incdec.ptr, %for.body ], [ %begin, %for.body.preheader ]
%0 = load i32, i32* %i.07, align 4, !dbg !13, !tbaa !15
%call = tail call i32 @bar(i32 %0), !dbg !19
%add = add nsw i32 %call, %ret.08, !dbg !20
%incdec.ptr = getelementptr inbounds i32, i32* %i.07, i64 1, !dbg !21
%cmp = icmp eq i32* %incdec.ptr, %end, !dbg !9
br i1 %cmp, label %for.end.loopexit, label %for.body, !dbg !12, !llvm.loop !22
for.end.loopexit: ; preds = %for.body
br label %for.end, !dbg !24
for.end: ; preds = %for.end.loopexit, %entry
%ret.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.end.loopexit ]
ret i32 %ret.0.lcssa, !dbg !24
}
```
where
```
!12 = !DILocation(line: 6, column: 3, scope: !11)
```
. As you can see, the terminator of 'entry' block, which is a loop control branch, has a DebugLoc of line 6, column 3. Howerver, after the execution of 'MachineBlock::updateTerminator' function, which is triggered by MachineSinking pass, the DebugLoc info is dropped as below (see there's no debug-location for JNE_1):
```
bb.0.entry:
successors: %bb.4(0x30000000), %bb.1.for.body.preheader(0x50000000)
liveins: %rdi, %rsi
%6 = COPY %rsi
%5 = COPY %rdi
%8 = SUB64rr %5, %6, implicit-def %eflags, debug-location !9
JNE_1 %bb.1.for.body.preheader, implicit %eflags
```
This patch addresses this issue and make newly created branch instructions to keep debug-location info.
Reviewers: aprantl, MatzeB, craig.topper, qcolombet
Reviewed By: qcolombet
Subscribers: qcolombet, llvm-commits
Differential Revision: https://reviews.llvm.org/D29596
llvm-svn: 294976
2017-02-14 02:15:31 +08:00
|
|
|
DebugLoc DL = findBranchDebugLoc();
|
2016-07-15 22:41:04 +08:00
|
|
|
bool B = TII->analyzeBranch(*this, TBB, FBB, Cond);
|
2009-11-12 11:55:33 +08:00
|
|
|
(void) B;
|
|
|
|
assert(!B && "UpdateTerminators requires analyzable predecessors!");
|
|
|
|
if (Cond.empty()) {
|
|
|
|
if (TBB) {
|
2016-05-26 05:53:46 +08:00
|
|
|
// The block has an unconditional branch. If its successor is now its
|
|
|
|
// layout successor, delete the branch.
|
2009-11-12 11:55:33 +08:00
|
|
|
if (isLayoutSuccessor(TBB))
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2009-11-12 11:55:33 +08:00
|
|
|
} else {
|
2016-05-26 05:53:46 +08:00
|
|
|
// The block has an unconditional fallthrough. If its successor is not its
|
|
|
|
// layout successor, insert a branch. First we have to locate the only
|
|
|
|
// non-landing-pad successor, as that is the fallthrough block.
|
2011-11-22 21:13:16 +08:00
|
|
|
for (succ_iterator SI = succ_begin(), SE = succ_end(); SI != SE; ++SI) {
|
2015-08-28 07:27:47 +08:00
|
|
|
if ((*SI)->isEHPad())
|
2011-11-22 21:13:16 +08:00
|
|
|
continue;
|
|
|
|
assert(!TBB && "Found more than one non-landing-pad successor!");
|
|
|
|
TBB = *SI;
|
|
|
|
}
|
2011-11-23 16:23:54 +08:00
|
|
|
|
2016-05-26 05:53:46 +08:00
|
|
|
// If there is no non-landing-pad successor, the block has no fall-through
|
|
|
|
// edges to be concerned with.
|
2011-11-23 16:23:54 +08:00
|
|
|
if (!TBB)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Finally update the unconditional successor to be reached via a branch
|
|
|
|
// if it would not be reached by fallthrough.
|
2009-11-12 11:55:33 +08:00
|
|
|
if (!isLayoutSuccessor(TBB))
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, TBB, nullptr, Cond, DL);
|
2009-11-12 11:55:33 +08:00
|
|
|
}
|
2016-05-26 05:53:46 +08:00
|
|
|
return;
|
|
|
|
}
|
2012-04-17 06:03:00 +08:00
|
|
|
|
2016-05-26 05:53:46 +08:00
|
|
|
if (FBB) {
|
|
|
|
// The block has a non-fallthrough conditional branch. If one of its
|
|
|
|
// successors is its layout successor, rewrite it to a fallthrough
|
|
|
|
// conditional branch.
|
|
|
|
if (isLayoutSuccessor(TBB)) {
|
2016-09-15 04:43:16 +08:00
|
|
|
if (TII->reverseBranchCondition(Cond))
|
2012-04-17 06:03:00 +08:00
|
|
|
return;
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, FBB, nullptr, Cond, DL);
|
2016-05-26 05:53:46 +08:00
|
|
|
} else if (isLayoutSuccessor(FBB)) {
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, TBB, nullptr, Cond, DL);
|
2016-05-26 05:53:46 +08:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2012-04-17 06:03:00 +08:00
|
|
|
|
2016-05-26 05:53:46 +08:00
|
|
|
// Walk through the successors and find the successor which is not a landing
|
|
|
|
// pad and is not the conditional branch destination (in TBB) as the
|
|
|
|
// fallthrough successor.
|
|
|
|
MachineBasicBlock *FallthroughBB = nullptr;
|
|
|
|
for (succ_iterator SI = succ_begin(), SE = succ_end(); SI != SE; ++SI) {
|
|
|
|
if ((*SI)->isEHPad() || *SI == TBB)
|
|
|
|
continue;
|
|
|
|
assert(!FallthroughBB && "Found more than one fallthrough successor.");
|
|
|
|
FallthroughBB = *SI;
|
|
|
|
}
|
|
|
|
|
2016-07-04 03:14:17 +08:00
|
|
|
if (!FallthroughBB) {
|
|
|
|
if (canFallThrough()) {
|
|
|
|
// We fallthrough to the same basic block as the conditional jump targets.
|
|
|
|
// Remove the conditional jump, leaving unconditional fallthrough.
|
|
|
|
// FIXME: This does not seem like a reasonable pattern to support, but it
|
|
|
|
// has been seen in the wild coming out of degenerate ARM test cases.
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
Make MachineBasicBlock::updateTerminator to update DebugLoc as well
Summary:
Currently MachineBasicBlock::updateTerminator simply drops DebugLoc for newly created branch instructions, which may cause incorrect stepping and/or imprecise sample profile data. Below is an example:
```
1 extern int bar(int x);
2
3 int foo(int *begin, int *end) {
4 int *i;
5 int ret = 0;
6 for (
7 i = begin ;
8 i != end ;
9 i++)
10 {
11 ret += bar(*i);
12 }
13 return ret;
14 }
```
Below is a bitcode of 'foo' at the end of LLVM-IR level optimizations with -O3:
```
define i32 @foo(i32* readonly %begin, i32* readnone %end) !dbg !4 {
entry:
%cmp6 = icmp eq i32* %begin, %end, !dbg !9
br i1 %cmp6, label %for.end, label %for.body.preheader, !dbg !12
for.body.preheader: ; preds = %entry
br label %for.body, !dbg !13
for.body: ; preds = %for.body.preheader, %for.body
%ret.08 = phi i32 [ %add, %for.body ], [ 0, %for.body.preheader ]
%i.07 = phi i32* [ %incdec.ptr, %for.body ], [ %begin, %for.body.preheader ]
%0 = load i32, i32* %i.07, align 4, !dbg !13, !tbaa !15
%call = tail call i32 @bar(i32 %0), !dbg !19
%add = add nsw i32 %call, %ret.08, !dbg !20
%incdec.ptr = getelementptr inbounds i32, i32* %i.07, i64 1, !dbg !21
%cmp = icmp eq i32* %incdec.ptr, %end, !dbg !9
br i1 %cmp, label %for.end.loopexit, label %for.body, !dbg !12, !llvm.loop !22
for.end.loopexit: ; preds = %for.body
br label %for.end, !dbg !24
for.end: ; preds = %for.end.loopexit, %entry
%ret.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.end.loopexit ]
ret i32 %ret.0.lcssa, !dbg !24
}
```
where
```
!12 = !DILocation(line: 6, column: 3, scope: !11)
```
. As you can see, the terminator of 'entry' block, which is a loop control branch, has a DebugLoc of line 6, column 3. Howerver, after the execution of 'MachineBlock::updateTerminator' function, which is triggered by MachineSinking pass, the DebugLoc info is dropped as below (see there's no debug-location for JNE_1):
```
bb.0.entry:
successors: %bb.4(0x30000000), %bb.1.for.body.preheader(0x50000000)
liveins: %rdi, %rsi
%6 = COPY %rsi
%5 = COPY %rdi
%8 = SUB64rr %5, %6, implicit-def %eflags, debug-location !9
JNE_1 %bb.1.for.body.preheader, implicit %eflags
```
This patch addresses this issue and make newly created branch instructions to keep debug-location info.
Reviewers: aprantl, MatzeB, craig.topper, qcolombet
Reviewed By: qcolombet
Subscribers: qcolombet, llvm-commits
Differential Revision: https://reviews.llvm.org/D29596
llvm-svn: 294976
2017-02-14 02:15:31 +08:00
|
|
|
|
2016-07-04 03:14:17 +08:00
|
|
|
// Finally update the unconditional successor to be reached via a branch if
|
|
|
|
// it would not be reached by fallthrough.
|
|
|
|
if (!isLayoutSuccessor(TBB))
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, TBB, nullptr, Cond, DL);
|
2016-07-04 03:14:17 +08:00
|
|
|
return;
|
|
|
|
}
|
2016-05-26 05:53:46 +08:00
|
|
|
|
2016-07-04 03:14:17 +08:00
|
|
|
// We enter here iff exactly one successor is TBB which cannot fallthrough
|
|
|
|
// and the rest successors if any are EHPads. In this case, we need to
|
|
|
|
// change the conditional branch into unconditional branch.
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2016-07-04 03:14:17 +08:00
|
|
|
Cond.clear();
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, TBB, nullptr, Cond, DL);
|
2016-05-26 05:53:46 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The block has a fallthrough conditional branch.
|
|
|
|
if (isLayoutSuccessor(TBB)) {
|
2016-09-15 04:43:16 +08:00
|
|
|
if (TII->reverseBranchCondition(Cond)) {
|
2016-05-26 05:53:46 +08:00
|
|
|
// We can't reverse the condition, add an unconditional branch.
|
|
|
|
Cond.clear();
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, FallthroughBB, nullptr, Cond, DL);
|
2016-05-26 05:53:46 +08:00
|
|
|
return;
|
2009-11-12 11:55:33 +08:00
|
|
|
}
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, FallthroughBB, nullptr, Cond, DL);
|
2016-05-26 05:53:46 +08:00
|
|
|
} else if (!isLayoutSuccessor(FallthroughBB)) {
|
2016-09-15 04:43:16 +08:00
|
|
|
TII->removeBranch(*this);
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*this, TBB, FallthroughBB, Cond, DL);
|
2009-11-12 11:55:33 +08:00
|
|
|
}
|
|
|
|
}
|
2006-10-24 08:02:26 +08:00
|
|
|
|
2015-12-13 17:26:17 +08:00
|
|
|
void MachineBasicBlock::validateSuccProbs() const {
|
|
|
|
#ifndef NDEBUG
|
|
|
|
int64_t Sum = 0;
|
|
|
|
for (auto Prob : Probs)
|
|
|
|
Sum += Prob.getNumerator();
|
|
|
|
// Due to precision issue, we assume that the sum of probabilities is one if
|
|
|
|
// the difference between the sum of their numerators and the denominator is
|
|
|
|
// no greater than the number of successors.
|
2015-12-14 01:00:25 +08:00
|
|
|
assert((uint64_t)std::abs(Sum - BranchProbability::getDenominator()) <=
|
2015-12-13 17:26:17 +08:00
|
|
|
Probs.size() &&
|
|
|
|
"The sum of successors's probabilities exceeds one.");
|
|
|
|
#endif // NDEBUG
|
|
|
|
}
|
|
|
|
|
2015-11-05 05:37:58 +08:00
|
|
|
void MachineBasicBlock::addSuccessor(MachineBasicBlock *Succ,
|
|
|
|
BranchProbability Prob) {
|
|
|
|
// Probability list is either empty (if successor list isn't empty, this means
|
|
|
|
// disabled optimization) or has the same size as successor list.
|
2015-12-01 19:05:39 +08:00
|
|
|
if (!(Probs.empty() && !Successors.empty()))
|
2015-11-05 05:37:58 +08:00
|
|
|
Probs.push_back(Prob);
|
|
|
|
Successors.push_back(Succ);
|
|
|
|
Succ->addPredecessor(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
void MachineBasicBlock::addSuccessorWithoutProb(MachineBasicBlock *Succ) {
|
|
|
|
// We need to make sure probability list is either empty or has the same size
|
|
|
|
// of successor list. When this function is called, we can safely delete all
|
|
|
|
// probability in the list.
|
|
|
|
Probs.clear();
|
|
|
|
Successors.push_back(Succ);
|
|
|
|
Succ->addPredecessor(this);
|
|
|
|
}
|
|
|
|
|
2018-07-13 19:13:58 +08:00
|
|
|
void MachineBasicBlock::splitSuccessor(MachineBasicBlock *Old,
|
|
|
|
MachineBasicBlock *New,
|
|
|
|
bool NormalizeSuccProbs) {
|
|
|
|
succ_iterator OldI = llvm::find(successors(), Old);
|
|
|
|
assert(OldI != succ_end() && "Old is not a successor of this block!");
|
|
|
|
assert(llvm::find(successors(), New) == succ_end() &&
|
|
|
|
"New is already a successor of this block!");
|
|
|
|
|
|
|
|
// Add a new successor with equal probability as the original one. Note
|
|
|
|
// that we directly copy the probability using the iterator rather than
|
|
|
|
// getting a potentially synthetic probability computed when unknown. This
|
|
|
|
// preserves the probabilities as-is and then we can renormalize them and
|
|
|
|
// query them effectively afterward.
|
|
|
|
addSuccessor(New, Probs.empty() ? BranchProbability::getUnknown()
|
|
|
|
: *getProbabilityIterator(OldI));
|
|
|
|
if (NormalizeSuccProbs)
|
|
|
|
normalizeSuccProbs();
|
|
|
|
}
|
|
|
|
|
2015-12-13 17:26:17 +08:00
|
|
|
void MachineBasicBlock::removeSuccessor(MachineBasicBlock *Succ,
|
|
|
|
bool NormalizeSuccProbs) {
|
2016-08-12 06:21:41 +08:00
|
|
|
succ_iterator I = find(Successors, Succ);
|
2015-12-13 17:26:17 +08:00
|
|
|
removeSuccessor(I, NormalizeSuccProbs);
|
2004-10-26 23:43:42 +08:00
|
|
|
}
|
|
|
|
|
2011-06-17 02:01:17 +08:00
|
|
|
MachineBasicBlock::succ_iterator
|
2015-12-13 17:26:17 +08:00
|
|
|
MachineBasicBlock::removeSuccessor(succ_iterator I, bool NormalizeSuccProbs) {
|
2004-10-26 23:43:42 +08:00
|
|
|
assert(I != Successors.end() && "Not a current successor!");
|
2011-06-17 04:22:37 +08:00
|
|
|
|
2015-11-05 05:37:58 +08:00
|
|
|
// If probability list is empty it means we don't use it (disabled
|
|
|
|
// optimization).
|
|
|
|
if (!Probs.empty()) {
|
|
|
|
probability_iterator WI = getProbabilityIterator(I);
|
|
|
|
Probs.erase(WI);
|
2015-12-13 17:26:17 +08:00
|
|
|
if (NormalizeSuccProbs)
|
|
|
|
normalizeSuccProbs();
|
2015-11-05 05:37:58 +08:00
|
|
|
}
|
|
|
|
|
2004-10-26 23:43:42 +08:00
|
|
|
(*I)->removePredecessor(this);
|
2009-01-09 06:19:34 +08:00
|
|
|
return Successors.erase(I);
|
2004-10-26 23:43:42 +08:00
|
|
|
}
|
|
|
|
|
2011-06-17 04:22:37 +08:00
|
|
|
void MachineBasicBlock::replaceSuccessor(MachineBasicBlock *Old,
|
|
|
|
MachineBasicBlock *New) {
|
2012-08-10 11:23:27 +08:00
|
|
|
if (Old == New)
|
|
|
|
return;
|
2011-06-17 04:22:37 +08:00
|
|
|
|
2012-08-10 11:23:27 +08:00
|
|
|
succ_iterator E = succ_end();
|
|
|
|
succ_iterator NewI = E;
|
|
|
|
succ_iterator OldI = E;
|
|
|
|
for (succ_iterator I = succ_begin(); I != E; ++I) {
|
|
|
|
if (*I == Old) {
|
|
|
|
OldI = I;
|
|
|
|
if (NewI != E)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*I == New) {
|
|
|
|
NewI = I;
|
|
|
|
if (OldI != E)
|
|
|
|
break;
|
|
|
|
}
|
2011-06-17 04:22:37 +08:00
|
|
|
}
|
2012-08-10 11:23:27 +08:00
|
|
|
assert(OldI != E && "Old is not a successor of this block");
|
2011-06-17 04:22:37 +08:00
|
|
|
|
2012-08-10 11:23:27 +08:00
|
|
|
// If New isn't already a successor, let it take Old's place.
|
|
|
|
if (NewI == E) {
|
2015-11-18 09:45:10 +08:00
|
|
|
Old->removePredecessor(this);
|
2012-08-10 11:23:27 +08:00
|
|
|
New->addPredecessor(this);
|
|
|
|
*OldI = New;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// New is already a successor.
|
2015-11-05 05:37:58 +08:00
|
|
|
// Update its probability instead of adding a duplicate edge.
|
2015-12-01 13:29:22 +08:00
|
|
|
if (!Probs.empty()) {
|
|
|
|
auto ProbIter = getProbabilityIterator(NewI);
|
|
|
|
if (!ProbIter->isUnknown())
|
|
|
|
*ProbIter += *getProbabilityIterator(OldI);
|
|
|
|
}
|
2015-11-18 09:45:10 +08:00
|
|
|
removeSuccessor(OldI);
|
2011-06-17 04:22:37 +08:00
|
|
|
}
|
|
|
|
|
[x86] Introduce a pass to begin more systematically fixing PR36028 and similar issues.
The key idea is to lower COPY nodes populating EFLAGS by scanning the
uses of EFLAGS and introducing dedicated code to preserve the necessary
state in a GPR. In the vast majority of cases, these uses are cmovCC and
jCC instructions. For such cases, we can very easily save and restore
the necessary information by simply inserting a setCC into a GPR where
the original flags are live, and then testing that GPR directly to feed
the cmov or conditional branch.
However, things are a bit more tricky if arithmetic is using the flags.
This patch handles the vast majority of cases that seem to come up in
practice: adc, adcx, adox, rcl, and rcr; all without taking advantage of
partially preserved EFLAGS as LLVM doesn't currently model that at all.
There are a large number of operations that techinaclly observe EFLAGS
currently but shouldn't in this case -- they typically are using DF.
Currently, they will not be handled by this approach. However, I have
never seen this issue come up in practice. It is already pretty rare to
have these patterns come up in practical code with LLVM. I had to resort
to writing MIR tests to cover most of the logic in this pass already.
I suspect even with its current amount of coverage of arithmetic users
of EFLAGS it will be a significant improvement over the current use of
pushf/popf. It will also produce substantially faster code in most of
the common patterns.
This patch also removes all of the old lowering for EFLAGS copies, and
the hack that forced us to use a frame pointer when EFLAGS copies were
found anywhere in a function so that the dynamic stack adjustment wasn't
a problem. None of this is needed as we now lower all of these copies
directly in MI and without require stack adjustments.
Lots of thanks to Reid who came up with several aspects of this
approach, and Craig who helped me work out a couple of things tripping
me up while working on this.
Differential Revision: https://reviews.llvm.org/D45146
llvm-svn: 329657
2018-04-10 09:41:17 +08:00
|
|
|
void MachineBasicBlock::copySuccessor(MachineBasicBlock *Orig,
|
|
|
|
succ_iterator I) {
|
|
|
|
if (Orig->Probs.empty())
|
|
|
|
addSuccessor(*I, Orig->getSuccProbability(I));
|
|
|
|
else
|
|
|
|
addSuccessorWithoutProb(*I);
|
|
|
|
}
|
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
void MachineBasicBlock::addPredecessor(MachineBasicBlock *Pred) {
|
|
|
|
Predecessors.push_back(Pred);
|
2004-10-26 23:43:42 +08:00
|
|
|
}
|
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
void MachineBasicBlock::removePredecessor(MachineBasicBlock *Pred) {
|
2016-08-12 06:21:41 +08:00
|
|
|
pred_iterator I = find(Predecessors, Pred);
|
2004-10-26 23:43:42 +08:00
|
|
|
assert(I != Predecessors.end() && "Pred is not a predecessor of this block!");
|
|
|
|
Predecessors.erase(I);
|
|
|
|
}
|
2007-05-18 07:58:53 +08:00
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
void MachineBasicBlock::transferSuccessors(MachineBasicBlock *FromMBB) {
|
|
|
|
if (this == FromMBB)
|
2008-05-06 03:05:59 +08:00
|
|
|
return;
|
2011-06-17 02:01:17 +08:00
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
while (!FromMBB->succ_empty()) {
|
|
|
|
MachineBasicBlock *Succ = *FromMBB->succ_begin();
|
2011-06-17 04:22:37 +08:00
|
|
|
|
2019-08-30 19:23:10 +08:00
|
|
|
// If probability list is empty it means we don't use it (disabled
|
|
|
|
// optimization).
|
2015-12-01 13:29:22 +08:00
|
|
|
if (!FromMBB->Probs.empty()) {
|
|
|
|
auto Prob = *FromMBB->Probs.begin();
|
|
|
|
addSuccessor(Succ, Prob);
|
|
|
|
} else
|
|
|
|
addSuccessorWithoutProb(Succ);
|
2011-06-17 04:22:37 +08:00
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
FromMBB->removeSuccessor(Succ);
|
2010-07-07 04:24:04 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2015-09-30 03:46:09 +08:00
|
|
|
MachineBasicBlock::transferSuccessorsAndUpdatePHIs(MachineBasicBlock *FromMBB) {
|
|
|
|
if (this == FromMBB)
|
2010-07-07 04:24:04 +08:00
|
|
|
return;
|
2011-06-17 02:01:17 +08:00
|
|
|
|
2015-09-30 03:46:09 +08:00
|
|
|
while (!FromMBB->succ_empty()) {
|
|
|
|
MachineBasicBlock *Succ = *FromMBB->succ_begin();
|
2015-12-01 13:29:22 +08:00
|
|
|
if (!FromMBB->Probs.empty()) {
|
|
|
|
auto Prob = *FromMBB->Probs.begin();
|
|
|
|
addSuccessor(Succ, Prob);
|
|
|
|
} else
|
|
|
|
addSuccessorWithoutProb(Succ);
|
2015-09-30 03:46:09 +08:00
|
|
|
FromMBB->removeSuccessor(Succ);
|
2010-07-07 04:24:04 +08:00
|
|
|
|
|
|
|
// Fix up any PHI nodes in the successor.
|
2019-08-30 19:23:10 +08:00
|
|
|
Succ->replacePhiUsesWith(FromMBB, this);
|
2010-07-07 04:24:04 +08:00
|
|
|
}
|
2015-12-13 17:26:17 +08:00
|
|
|
normalizeSuccProbs();
|
2008-05-06 03:05:59 +08:00
|
|
|
}
|
|
|
|
|
2012-07-31 01:36:47 +08:00
|
|
|
bool MachineBasicBlock::isPredecessor(const MachineBasicBlock *MBB) const {
|
2016-08-12 11:55:06 +08:00
|
|
|
return is_contained(predecessors(), MBB);
|
2012-07-31 01:36:47 +08:00
|
|
|
}
|
|
|
|
|
2009-03-31 04:06:29 +08:00
|
|
|
bool MachineBasicBlock::isSuccessor(const MachineBasicBlock *MBB) const {
|
2016-08-12 11:55:06 +08:00
|
|
|
return is_contained(successors(), MBB);
|
2007-05-18 07:58:53 +08:00
|
|
|
}
|
2007-06-04 14:44:01 +08:00
|
|
|
|
2009-03-31 04:06:29 +08:00
|
|
|
bool MachineBasicBlock::isLayoutSuccessor(const MachineBasicBlock *MBB) const {
|
2008-10-03 06:09:09 +08:00
|
|
|
MachineFunction::const_iterator I(this);
|
2014-03-02 20:27:27 +08:00
|
|
|
return std::next(I) == MachineFunction::const_iterator(MBB);
|
2008-10-03 06:09:09 +08:00
|
|
|
}
|
|
|
|
|
2017-03-31 23:55:37 +08:00
|
|
|
MachineBasicBlock *MachineBasicBlock::getFallThrough() {
|
2015-10-10 03:23:20 +08:00
|
|
|
MachineFunction::iterator Fallthrough = getIterator();
|
2009-11-26 08:32:21 +08:00
|
|
|
++Fallthrough;
|
|
|
|
// If FallthroughBlock is off the end of the function, it can't fall through.
|
|
|
|
if (Fallthrough == getParent()->end())
|
2017-03-31 23:55:37 +08:00
|
|
|
return nullptr;
|
2009-11-26 08:32:21 +08:00
|
|
|
|
|
|
|
// If FallthroughBlock isn't a successor, no fallthrough is possible.
|
2015-10-10 03:23:20 +08:00
|
|
|
if (!isSuccessor(&*Fallthrough))
|
2017-03-31 23:55:37 +08:00
|
|
|
return nullptr;
|
2009-11-26 08:32:21 +08:00
|
|
|
|
2009-12-05 08:32:59 +08:00
|
|
|
// Analyze the branches, if any, at the end of the block.
|
2014-04-14 08:51:57 +08:00
|
|
|
MachineBasicBlock *TBB = nullptr, *FBB = nullptr;
|
2009-12-05 08:32:59 +08:00
|
|
|
SmallVector<MachineOperand, 4> Cond;
|
2014-08-05 10:39:49 +08:00
|
|
|
const TargetInstrInfo *TII = getParent()->getSubtarget().getInstrInfo();
|
2016-07-15 22:41:04 +08:00
|
|
|
if (TII->analyzeBranch(*this, TBB, FBB, Cond)) {
|
2009-12-05 08:32:59 +08:00
|
|
|
// If we couldn't analyze the branch, examine the last instruction.
|
|
|
|
// If the block doesn't end in a known control barrier, assume fallthrough
|
2012-01-27 02:24:25 +08:00
|
|
|
// is possible. The isPredicated check is needed because this code can be
|
2009-12-05 08:32:59 +08:00
|
|
|
// called during IfConversion, where an instruction which is normally a
|
2012-01-27 04:19:05 +08:00
|
|
|
// Barrier is predicated and thus no longer an actual control barrier.
|
2017-03-31 23:55:37 +08:00
|
|
|
return (empty() || !back().isBarrier() || TII->isPredicated(back()))
|
|
|
|
? &*Fallthrough
|
|
|
|
: nullptr;
|
2009-12-05 08:32:59 +08:00
|
|
|
}
|
2009-11-26 08:32:21 +08:00
|
|
|
|
|
|
|
// If there is no branch, control always falls through.
|
2017-03-31 23:55:37 +08:00
|
|
|
if (!TBB) return &*Fallthrough;
|
2009-11-26 08:32:21 +08:00
|
|
|
|
|
|
|
// If there is some explicit branch to the fallthrough block, it can obviously
|
|
|
|
// reach, even though the branch should get folded to fall through implicitly.
|
|
|
|
if (MachineFunction::iterator(TBB) == Fallthrough ||
|
|
|
|
MachineFunction::iterator(FBB) == Fallthrough)
|
2017-03-31 23:55:37 +08:00
|
|
|
return &*Fallthrough;
|
2009-11-26 08:32:21 +08:00
|
|
|
|
|
|
|
// If it's an unconditional branch to some block not the fall through, it
|
|
|
|
// doesn't fall through.
|
2017-03-31 23:55:37 +08:00
|
|
|
if (Cond.empty()) return nullptr;
|
2009-11-26 08:32:21 +08:00
|
|
|
|
|
|
|
// Otherwise, if it is conditional and has no explicit false block, it falls
|
|
|
|
// through.
|
2017-03-31 23:55:37 +08:00
|
|
|
return (FBB == nullptr) ? &*Fallthrough : nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MachineBasicBlock::canFallThrough() {
|
|
|
|
return getFallThrough() != nullptr;
|
2009-11-26 08:32:21 +08:00
|
|
|
}
|
|
|
|
|
2020-01-21 04:56:09 +08:00
|
|
|
MachineBasicBlock *MachineBasicBlock::SplitCriticalEdge(
|
|
|
|
MachineBasicBlock *Succ, Pass &P,
|
|
|
|
std::vector<SparseBitVector<>> *LiveInSets) {
|
2016-04-22 04:46:27 +08:00
|
|
|
if (!canSplitCriticalEdge(Succ))
|
2014-04-14 08:51:57 +08:00
|
|
|
return nullptr;
|
2012-04-25 03:06:55 +08:00
|
|
|
|
2010-06-23 01:25:57 +08:00
|
|
|
MachineFunction *MF = getParent();
|
2015-09-30 03:46:09 +08:00
|
|
|
DebugLoc DL; // FIXME: this is nowhere
|
2010-06-23 01:25:57 +08:00
|
|
|
|
|
|
|
MachineBasicBlock *NMBB = MF->CreateMachineBasicBlock();
|
2014-03-02 20:27:27 +08:00
|
|
|
MF->insert(std::next(MachineFunction::iterator(this)), NMBB);
|
2018-05-14 20:53:11 +08:00
|
|
|
LLVM_DEBUG(dbgs() << "Splitting critical edge: " << printMBBReference(*this)
|
|
|
|
<< " -- " << printMBBReference(*NMBB) << " -- "
|
|
|
|
<< printMBBReference(*Succ) << '\n');
|
2013-02-12 11:49:20 +08:00
|
|
|
|
2016-04-22 05:01:13 +08:00
|
|
|
LiveIntervals *LIS = P.getAnalysisIfAvailable<LiveIntervals>();
|
|
|
|
SlotIndexes *Indexes = P.getAnalysisIfAvailable<SlotIndexes>();
|
2013-02-12 11:49:20 +08:00
|
|
|
if (LIS)
|
|
|
|
LIS->insertMBBInMaps(NMBB);
|
|
|
|
else if (Indexes)
|
2013-02-11 07:29:54 +08:00
|
|
|
Indexes->insertMBBInMaps(NMBB);
|
2010-06-23 01:25:57 +08:00
|
|
|
|
2011-05-30 04:10:28 +08:00
|
|
|
// On some targets like Mips, branches may kill virtual registers. Make sure
|
|
|
|
// that LiveVariables is properly updated after updateTerminator replaces the
|
|
|
|
// terminators.
|
2016-04-22 05:01:13 +08:00
|
|
|
LiveVariables *LV = P.getAnalysisIfAvailable<LiveVariables>();
|
2011-05-30 04:10:28 +08:00
|
|
|
|
|
|
|
// Collect a list of virtual registers killed by the terminators.
|
2020-04-08 22:40:26 +08:00
|
|
|
SmallVector<Register, 4> KilledRegs;
|
2011-05-30 04:10:28 +08:00
|
|
|
if (LV)
|
2011-12-14 10:11:42 +08:00
|
|
|
for (instr_iterator I = getFirstInstrTerminator(), E = instr_end();
|
2011-12-07 06:12:01 +08:00
|
|
|
I != E; ++I) {
|
2015-10-10 03:23:20 +08:00
|
|
|
MachineInstr *MI = &*I;
|
2011-05-30 04:10:28 +08:00
|
|
|
for (MachineInstr::mop_iterator OI = MI->operands_begin(),
|
|
|
|
OE = MI->operands_end(); OI != OE; ++OI) {
|
2012-02-09 13:59:36 +08:00
|
|
|
if (!OI->isReg() || OI->getReg() == 0 ||
|
|
|
|
!OI->isUse() || !OI->isKill() || OI->isUndef())
|
2011-05-30 04:10:28 +08:00
|
|
|
continue;
|
Apply llvm-prefer-register-over-unsigned from clang-tidy to LLVM
Summary:
This clang-tidy check is looking for unsigned integer variables whose initializer
starts with an implicit cast from llvm::Register and changes the type of the
variable to llvm::Register (dropping the llvm:: where possible).
Partial reverts in:
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
X86FixupLEAs.cpp - Some functions return unsigned and arguably should be MCRegister
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
HexagonBitSimplify.cpp - Function takes BitTracker::RegisterRef which appears to be unsigned&
MachineVerifier.cpp - Ambiguous operator==() given MCRegister and const Register
PPCFastISel.cpp - No Register::operator-=()
PeepholeOptimizer.cpp - TargetInstrInfo::optimizeLoadInstr() takes an unsigned&
MachineTraceMetrics.cpp - MachineTraceMetrics lacks a suitable constructor
Manual fixups in:
ARMFastISel.cpp - ARMEmitLoad() now takes a Register& instead of unsigned&
HexagonSplitDouble.cpp - Ternary operator was ambiguous between unsigned/Register
HexagonConstExtenders.cpp - Has a local class named Register, used llvm::Register instead of Register.
PPCFastISel.cpp - PPCEmitLoad() now takes a Register& instead of unsigned&
Depends on D65919
Reviewers: arsenm, bogner, craig.topper, RKSimon
Reviewed By: arsenm
Subscribers: RKSimon, craig.topper, lenary, aemerson, wuzish, jholewinski, MatzeB, qcolombet, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, wdng, nhaehnle, sbc100, jgravelle-google, kristof.beyls, hiraditya, aheejin, kbarton, fedor.sergeev, javed.absar, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, rogfer01, MartinMosbeck, brucehoult, the_o, tpr, PkmX, jocewei, jsji, Petar.Avramovic, asbirlea, Jim, s.egerton, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65962
llvm-svn: 369041
2019-08-16 03:22:08 +08:00
|
|
|
Register Reg = OI->getReg();
|
2019-08-02 07:27:28 +08:00
|
|
|
if (Register::isPhysicalRegister(Reg) ||
|
2016-07-01 09:51:32 +08:00
|
|
|
LV->getVarInfo(Reg).removeKill(*MI)) {
|
2011-05-30 04:10:28 +08:00
|
|
|
KilledRegs.push_back(Reg);
|
2018-05-14 20:53:11 +08:00
|
|
|
LLVM_DEBUG(dbgs() << "Removing terminator kill: " << *MI);
|
2011-05-30 04:10:28 +08:00
|
|
|
OI->setIsKill(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-08 22:40:26 +08:00
|
|
|
SmallVector<Register, 4> UsedRegs;
|
2013-02-17 08:10:44 +08:00
|
|
|
if (LIS) {
|
|
|
|
for (instr_iterator I = getFirstInstrTerminator(), E = instr_end();
|
|
|
|
I != E; ++I) {
|
2015-10-10 03:23:20 +08:00
|
|
|
MachineInstr *MI = &*I;
|
2013-02-17 08:10:44 +08:00
|
|
|
|
|
|
|
for (MachineInstr::mop_iterator OI = MI->operands_begin(),
|
|
|
|
OE = MI->operands_end(); OI != OE; ++OI) {
|
|
|
|
if (!OI->isReg() || OI->getReg() == 0)
|
|
|
|
continue;
|
|
|
|
|
Apply llvm-prefer-register-over-unsigned from clang-tidy to LLVM
Summary:
This clang-tidy check is looking for unsigned integer variables whose initializer
starts with an implicit cast from llvm::Register and changes the type of the
variable to llvm::Register (dropping the llvm:: where possible).
Partial reverts in:
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
X86FixupLEAs.cpp - Some functions return unsigned and arguably should be MCRegister
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
HexagonBitSimplify.cpp - Function takes BitTracker::RegisterRef which appears to be unsigned&
MachineVerifier.cpp - Ambiguous operator==() given MCRegister and const Register
PPCFastISel.cpp - No Register::operator-=()
PeepholeOptimizer.cpp - TargetInstrInfo::optimizeLoadInstr() takes an unsigned&
MachineTraceMetrics.cpp - MachineTraceMetrics lacks a suitable constructor
Manual fixups in:
ARMFastISel.cpp - ARMEmitLoad() now takes a Register& instead of unsigned&
HexagonSplitDouble.cpp - Ternary operator was ambiguous between unsigned/Register
HexagonConstExtenders.cpp - Has a local class named Register, used llvm::Register instead of Register.
PPCFastISel.cpp - PPCEmitLoad() now takes a Register& instead of unsigned&
Depends on D65919
Reviewers: arsenm, bogner, craig.topper, RKSimon
Reviewed By: arsenm
Subscribers: RKSimon, craig.topper, lenary, aemerson, wuzish, jholewinski, MatzeB, qcolombet, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, wdng, nhaehnle, sbc100, jgravelle-google, kristof.beyls, hiraditya, aheejin, kbarton, fedor.sergeev, javed.absar, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, rogfer01, MartinMosbeck, brucehoult, the_o, tpr, PkmX, jocewei, jsji, Petar.Avramovic, asbirlea, Jim, s.egerton, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65962
llvm-svn: 369041
2019-08-16 03:22:08 +08:00
|
|
|
Register Reg = OI->getReg();
|
2016-08-12 06:21:41 +08:00
|
|
|
if (!is_contained(UsedRegs, Reg))
|
2013-02-17 08:10:44 +08:00
|
|
|
UsedRegs.push_back(Reg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-23 01:25:57 +08:00
|
|
|
ReplaceUsesOfBlockWith(Succ, NMBB);
|
2013-02-11 17:24:45 +08:00
|
|
|
|
|
|
|
// If updateTerminator() removes instructions, we need to remove them from
|
|
|
|
// SlotIndexes.
|
|
|
|
SmallVector<MachineInstr*, 4> Terminators;
|
|
|
|
if (Indexes) {
|
|
|
|
for (instr_iterator I = getFirstInstrTerminator(), E = instr_end();
|
|
|
|
I != E; ++I)
|
2015-10-10 03:23:20 +08:00
|
|
|
Terminators.push_back(&*I);
|
2013-02-11 17:24:45 +08:00
|
|
|
}
|
|
|
|
|
2010-06-23 01:25:57 +08:00
|
|
|
updateTerminator();
|
|
|
|
|
2013-02-11 17:24:45 +08:00
|
|
|
if (Indexes) {
|
|
|
|
SmallVector<MachineInstr*, 4> NewTerminators;
|
|
|
|
for (instr_iterator I = getFirstInstrTerminator(), E = instr_end();
|
|
|
|
I != E; ++I)
|
2015-10-10 03:23:20 +08:00
|
|
|
NewTerminators.push_back(&*I);
|
2013-02-11 17:24:45 +08:00
|
|
|
|
|
|
|
for (SmallVectorImpl<MachineInstr*>::iterator I = Terminators.begin(),
|
|
|
|
E = Terminators.end(); I != E; ++I) {
|
2016-08-12 06:21:41 +08:00
|
|
|
if (!is_contained(NewTerminators, *I))
|
|
|
|
Indexes->removeMachineInstrFromMaps(**I);
|
2013-02-11 17:24:45 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-23 01:25:57 +08:00
|
|
|
// Insert unconditional "jump Succ" instruction in NMBB if necessary.
|
|
|
|
NMBB->addSuccessor(Succ);
|
|
|
|
if (!NMBB->isLayoutSuccessor(Succ)) {
|
2016-04-22 04:46:27 +08:00
|
|
|
SmallVector<MachineOperand, 4> Cond;
|
|
|
|
const TargetInstrInfo *TII = getParent()->getSubtarget().getInstrInfo();
|
2016-09-15 01:24:15 +08:00
|
|
|
TII->insertBranch(*NMBB, Succ, nullptr, Cond, DL);
|
2013-02-11 07:29:54 +08:00
|
|
|
|
|
|
|
if (Indexes) {
|
2016-02-27 14:40:41 +08:00
|
|
|
for (MachineInstr &MI : NMBB->instrs()) {
|
2013-02-11 07:29:54 +08:00
|
|
|
// Some instructions may have been moved to NMBB by updateTerminator(),
|
|
|
|
// so we first remove any instruction that already has an index.
|
2016-02-27 14:40:41 +08:00
|
|
|
if (Indexes->hasIndex(MI))
|
|
|
|
Indexes->removeMachineInstrFromMaps(MI);
|
|
|
|
Indexes->insertMachineInstrInMaps(MI);
|
2013-02-11 07:29:54 +08:00
|
|
|
}
|
|
|
|
}
|
2010-06-23 01:25:57 +08:00
|
|
|
}
|
|
|
|
|
2019-08-30 19:23:10 +08:00
|
|
|
// Fix PHI nodes in Succ so they refer to NMBB instead of this.
|
|
|
|
Succ->replacePhiUsesWith(this, NMBB);
|
2010-06-23 01:25:57 +08:00
|
|
|
|
2011-10-15 01:25:46 +08:00
|
|
|
// Inherit live-ins from the successor
|
2015-09-10 02:08:03 +08:00
|
|
|
for (const auto &LI : Succ->liveins())
|
2015-08-25 06:59:52 +08:00
|
|
|
NMBB->addLiveIn(LI);
|
2011-10-15 01:25:46 +08:00
|
|
|
|
2011-05-30 04:10:28 +08:00
|
|
|
// Update LiveVariables.
|
2014-08-05 10:39:49 +08:00
|
|
|
const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
|
2011-05-30 04:10:28 +08:00
|
|
|
if (LV) {
|
|
|
|
// Restore kills of virtual registers that were killed by the terminators.
|
|
|
|
while (!KilledRegs.empty()) {
|
2020-04-08 22:40:26 +08:00
|
|
|
Register Reg = KilledRegs.pop_back_val();
|
2011-12-14 10:11:42 +08:00
|
|
|
for (instr_iterator I = instr_end(), E = instr_begin(); I != E;) {
|
2019-07-16 12:46:31 +08:00
|
|
|
if (!(--I)->addRegisterKilled(Reg, TRI, /* AddIfNotFound= */ false))
|
2011-05-30 04:10:28 +08:00
|
|
|
continue;
|
2019-08-02 07:27:28 +08:00
|
|
|
if (Register::isVirtualRegister(Reg))
|
2015-10-10 03:23:20 +08:00
|
|
|
LV->getVarInfo(Reg).Kills.push_back(&*I);
|
2018-05-14 20:53:11 +08:00
|
|
|
LLVM_DEBUG(dbgs() << "Restored terminator kill: " << *I);
|
2011-05-30 04:10:28 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Update relevant live-through information.
|
2020-01-21 04:56:09 +08:00
|
|
|
if (LiveInSets != nullptr)
|
|
|
|
LV->addNewBlock(NMBB, this, Succ, *LiveInSets);
|
|
|
|
else
|
|
|
|
LV->addNewBlock(NMBB, this, Succ);
|
2011-05-30 04:10:28 +08:00
|
|
|
}
|
2010-06-23 01:25:57 +08:00
|
|
|
|
2013-02-12 11:49:20 +08:00
|
|
|
if (LIS) {
|
2013-02-11 17:24:47 +08:00
|
|
|
// After splitting the edge and updating SlotIndexes, live intervals may be
|
|
|
|
// in one of two situations, depending on whether this block was the last in
|
2015-08-11 06:27:10 +08:00
|
|
|
// the function. If the original block was the last in the function, all
|
|
|
|
// live intervals will end prior to the beginning of the new split block. If
|
|
|
|
// the original block was not at the end of the function, all live intervals
|
|
|
|
// will extend to the end of the new split block.
|
2013-02-11 17:24:47 +08:00
|
|
|
|
|
|
|
bool isLastMBB =
|
2014-03-02 20:27:27 +08:00
|
|
|
std::next(MachineFunction::iterator(NMBB)) == getParent()->end();
|
2013-02-11 17:24:47 +08:00
|
|
|
|
|
|
|
SlotIndex StartIndex = Indexes->getMBBEndIdx(this);
|
|
|
|
SlotIndex PrevIndex = StartIndex.getPrevSlot();
|
|
|
|
SlotIndex EndIndex = Indexes->getMBBEndIdx(NMBB);
|
|
|
|
|
|
|
|
// Find the registers used from NMBB in PHIs in Succ.
|
2020-04-08 22:40:26 +08:00
|
|
|
SmallSet<Register, 8> PHISrcRegs;
|
2013-02-11 17:24:47 +08:00
|
|
|
for (MachineBasicBlock::instr_iterator
|
|
|
|
I = Succ->instr_begin(), E = Succ->instr_end();
|
|
|
|
I != E && I->isPHI(); ++I) {
|
|
|
|
for (unsigned ni = 1, ne = I->getNumOperands(); ni != ne; ni += 2) {
|
|
|
|
if (I->getOperand(ni+1).getMBB() == NMBB) {
|
|
|
|
MachineOperand &MO = I->getOperand(ni);
|
Apply llvm-prefer-register-over-unsigned from clang-tidy to LLVM
Summary:
This clang-tidy check is looking for unsigned integer variables whose initializer
starts with an implicit cast from llvm::Register and changes the type of the
variable to llvm::Register (dropping the llvm:: where possible).
Partial reverts in:
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
X86FixupLEAs.cpp - Some functions return unsigned and arguably should be MCRegister
X86FrameLowering.cpp - Some functions return unsigned and arguably should be MCRegister
HexagonBitSimplify.cpp - Function takes BitTracker::RegisterRef which appears to be unsigned&
MachineVerifier.cpp - Ambiguous operator==() given MCRegister and const Register
PPCFastISel.cpp - No Register::operator-=()
PeepholeOptimizer.cpp - TargetInstrInfo::optimizeLoadInstr() takes an unsigned&
MachineTraceMetrics.cpp - MachineTraceMetrics lacks a suitable constructor
Manual fixups in:
ARMFastISel.cpp - ARMEmitLoad() now takes a Register& instead of unsigned&
HexagonSplitDouble.cpp - Ternary operator was ambiguous between unsigned/Register
HexagonConstExtenders.cpp - Has a local class named Register, used llvm::Register instead of Register.
PPCFastISel.cpp - PPCEmitLoad() now takes a Register& instead of unsigned&
Depends on D65919
Reviewers: arsenm, bogner, craig.topper, RKSimon
Reviewed By: arsenm
Subscribers: RKSimon, craig.topper, lenary, aemerson, wuzish, jholewinski, MatzeB, qcolombet, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, wdng, nhaehnle, sbc100, jgravelle-google, kristof.beyls, hiraditya, aheejin, kbarton, fedor.sergeev, javed.absar, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, rogfer01, MartinMosbeck, brucehoult, the_o, tpr, PkmX, jocewei, jsji, Petar.Avramovic, asbirlea, Jim, s.egerton, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65962
llvm-svn: 369041
2019-08-16 03:22:08 +08:00
|
|
|
Register Reg = MO.getReg();
|
2013-02-11 17:24:47 +08:00
|
|
|
PHISrcRegs.insert(Reg);
|
2013-02-12 11:49:17 +08:00
|
|
|
if (MO.isUndef())
|
|
|
|
continue;
|
2013-02-11 17:24:47 +08:00
|
|
|
|
|
|
|
LiveInterval &LI = LIS->getInterval(Reg);
|
|
|
|
VNInfo *VNI = LI.getVNInfoAt(PrevIndex);
|
2015-08-11 06:27:10 +08:00
|
|
|
assert(VNI &&
|
|
|
|
"PHI sources should be live out of their predecessors.");
|
2013-10-11 05:28:43 +08:00
|
|
|
LI.addSegment(LiveInterval::Segment(StartIndex, EndIndex, VNI));
|
2013-02-11 17:24:47 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MachineRegisterInfo *MRI = &getParent()->getRegInfo();
|
|
|
|
for (unsigned i = 0, e = MRI->getNumVirtRegs(); i != e; ++i) {
|
2020-04-08 22:40:26 +08:00
|
|
|
Register Reg = Register::index2VirtReg(i);
|
2013-02-11 17:24:47 +08:00
|
|
|
if (PHISrcRegs.count(Reg) || !LIS->hasInterval(Reg))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
LiveInterval &LI = LIS->getInterval(Reg);
|
|
|
|
if (!LI.liveAt(PrevIndex))
|
|
|
|
continue;
|
|
|
|
|
2013-02-12 11:49:17 +08:00
|
|
|
bool isLiveOut = LI.liveAt(LIS->getMBBStartIdx(Succ));
|
2013-02-11 17:24:47 +08:00
|
|
|
if (isLiveOut && isLastMBB) {
|
|
|
|
VNInfo *VNI = LI.getVNInfoAt(PrevIndex);
|
|
|
|
assert(VNI && "LiveInterval should have VNInfo where it is live.");
|
2013-10-11 05:28:43 +08:00
|
|
|
LI.addSegment(LiveInterval::Segment(StartIndex, EndIndex, VNI));
|
2013-02-11 17:24:47 +08:00
|
|
|
} else if (!isLiveOut && !isLastMBB) {
|
2013-10-11 05:28:43 +08:00
|
|
|
LI.removeSegment(StartIndex, EndIndex);
|
2013-02-11 17:24:47 +08:00
|
|
|
}
|
|
|
|
}
|
2013-02-17 08:10:44 +08:00
|
|
|
|
|
|
|
// Update all intervals for registers whose uses may have been modified by
|
|
|
|
// updateTerminator().
|
2013-02-17 19:09:00 +08:00
|
|
|
LIS->repairIntervalsInRange(this, getFirstTerminator(), end(), UsedRegs);
|
2013-02-11 17:24:47 +08:00
|
|
|
}
|
|
|
|
|
2010-06-23 01:25:57 +08:00
|
|
|
if (MachineDominatorTree *MDT =
|
2016-04-22 05:01:13 +08:00
|
|
|
P.getAnalysisIfAvailable<MachineDominatorTree>())
|
[MachineDominatorTree] Provide a method to inform a MachineDominatorTree that a
critical edge has been split. The MachineDominatorTree will when lazy update the
underlying dominance properties when require.
** Context **
This is a follow-up of r215410.
Each time a critical edge is split this invalidates the dominator tree
information. Thus, subsequent queries of that interface will be slow until the
underlying information is actually recomputed (costly).
** Problem **
Prior to this patch, splitting a critical edge needed to query the dominator
tree to update the dominator information.
Therefore, splitting a bunch of critical edges will likely produce poor
performance as each query to the dominator tree will use the slow query path.
This happens a lot in passes like MachineSink and PHIElimination.
** Proposed Solution **
Splitting a critical edge is a local modification of the CFG. Moreover, as soon
as a critical edge is split, it is not critical anymore and thus cannot be a
candidate for critical edge splitting anymore. In other words, the predecessor
and successor of a basic block inserted on a critical edge cannot be inserted by
critical edge splitting.
Using these observations, we can pile up the splitting of critical edge and
apply then at once before updating the DT information.
The core of this patch moves the update of the MachineDominatorTree information
from MachineBasicBlock::SplitCriticalEdge to a lazy MachineDominatorTree.
** Performance **
Thanks to this patch, the motivating example compiles in 4- minutes instead of
6+ minutes. No test case added as the motivating example as nothing special but
being huge!
The binaries are strictly identical for all the llvm test-suite + SPECs with and
without this patch for both Os and O3.
Regarding compile time, I observed only noise, although on average I saw a
small improvement.
<rdar://problem/17894619>
llvm-svn: 215576
2014-08-14 05:00:07 +08:00
|
|
|
MDT->recordSplitCriticalEdge(this, Succ, NMBB);
|
2010-06-23 01:25:57 +08:00
|
|
|
|
2016-04-22 05:01:13 +08:00
|
|
|
if (MachineLoopInfo *MLI = P.getAnalysisIfAvailable<MachineLoopInfo>())
|
2010-06-23 01:25:57 +08:00
|
|
|
if (MachineLoop *TIL = MLI->getLoopFor(this)) {
|
|
|
|
// If one or the other blocks were not in a loop, the new block is not
|
|
|
|
// either, and thus LI doesn't need to be updated.
|
|
|
|
if (MachineLoop *DestLoop = MLI->getLoopFor(Succ)) {
|
|
|
|
if (TIL == DestLoop) {
|
|
|
|
// Both in the same loop, the NMBB joins loop.
|
|
|
|
DestLoop->addBasicBlockToLoop(NMBB, MLI->getBase());
|
|
|
|
} else if (TIL->contains(DestLoop)) {
|
|
|
|
// Edge from an outer loop to an inner loop. Add to the outer loop.
|
|
|
|
TIL->addBasicBlockToLoop(NMBB, MLI->getBase());
|
|
|
|
} else if (DestLoop->contains(TIL)) {
|
|
|
|
// Edge from an inner loop to an outer loop. Add to the outer loop.
|
|
|
|
DestLoop->addBasicBlockToLoop(NMBB, MLI->getBase());
|
|
|
|
} else {
|
|
|
|
// Edge from two loops with no containment relation. Because these
|
|
|
|
// are natural loops, we know that the destination block must be the
|
|
|
|
// header of its loop (adding a branch into a loop elsewhere would
|
|
|
|
// create an irreducible loop).
|
|
|
|
assert(DestLoop->getHeader() == Succ &&
|
|
|
|
"Should not create irreducible loops!");
|
|
|
|
if (MachineLoop *P = DestLoop->getParentLoop())
|
|
|
|
P->addBasicBlockToLoop(NMBB, MLI->getBase());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NMBB;
|
|
|
|
}
|
|
|
|
|
2016-04-22 04:46:27 +08:00
|
|
|
bool MachineBasicBlock::canSplitCriticalEdge(
|
|
|
|
const MachineBasicBlock *Succ) const {
|
|
|
|
// Splitting the critical edge to a landing pad block is non-trivial. Don't do
|
|
|
|
// it in this generic function.
|
|
|
|
if (Succ->isEHPad())
|
|
|
|
return false;
|
|
|
|
|
Allow "callbr" to return non-void values
Summary:
Terminators in LLVM aren't prohibited from returning values. This means that
the "callbr" instruction, which is used for "asm goto", can support "asm goto
with outputs."
This patch removes all restrictions against "callbr" returning values. The
heavy lifting is done by the code generator. The "INLINEASM_BR" instruction's
a terminator, and the code generator doesn't allow non-terminator instructions
after a terminator. In order to correctly model the feature, we need to copy
outputs from "INLINEASM_BR" into virtual registers. Of course, those copies
aren't terminators.
To get around this issue, we split the block containing the "INLINEASM_BR"
right before the "COPY" instructions. This results in two cheats:
- Any physical registers defined by "INLINEASM_BR" need to be marked as
live-in into the block with the "COPY" instructions. This violates an
assumption that physical registers aren't marked as "live-in" until after
register allocation. But it seems as if the live-in information only
needs to be correct after register allocation. So we're able to get away
with this.
- The indirect branches from the "INLINEASM_BR" are moved to the "COPY"
block. This is to satisfy PHI nodes.
I've been told that MLIR can support this handily, but until we're able to
use it, we'll have to stick with the above.
Reviewers: jyknight, nickdesaulniers, hfinkel, MaskRay, lattner
Reviewed By: nickdesaulniers, MaskRay, lattner
Subscribers: rriddle, qcolombet, jdoerfert, MatzeB, echristo, MaskRay, xbolva00, aaron.ballman, cfe-commits, JonChesterfield, hiraditya, llvm-commits, rnk, craig.topper
Tags: #llvm, #clang
Differential Revision: https://reviews.llvm.org/D69868
2020-02-25 10:28:32 +08:00
|
|
|
// Splitting the critical edge to a callbr's indirect block isn't advised.
|
|
|
|
// Don't do it in this generic function.
|
|
|
|
if (isInlineAsmBrIndirectTarget(Succ))
|
|
|
|
return false;
|
2016-04-22 04:46:27 +08:00
|
|
|
|
Allow "callbr" to return non-void values
Summary:
Terminators in LLVM aren't prohibited from returning values. This means that
the "callbr" instruction, which is used for "asm goto", can support "asm goto
with outputs."
This patch removes all restrictions against "callbr" returning values. The
heavy lifting is done by the code generator. The "INLINEASM_BR" instruction's
a terminator, and the code generator doesn't allow non-terminator instructions
after a terminator. In order to correctly model the feature, we need to copy
outputs from "INLINEASM_BR" into virtual registers. Of course, those copies
aren't terminators.
To get around this issue, we split the block containing the "INLINEASM_BR"
right before the "COPY" instructions. This results in two cheats:
- Any physical registers defined by "INLINEASM_BR" need to be marked as
live-in into the block with the "COPY" instructions. This violates an
assumption that physical registers aren't marked as "live-in" until after
register allocation. But it seems as if the live-in information only
needs to be correct after register allocation. So we're able to get away
with this.
- The indirect branches from the "INLINEASM_BR" are moved to the "COPY"
block. This is to satisfy PHI nodes.
I've been told that MLIR can support this handily, but until we're able to
use it, we'll have to stick with the above.
Reviewers: jyknight, nickdesaulniers, hfinkel, MaskRay, lattner
Reviewed By: nickdesaulniers, MaskRay, lattner
Subscribers: rriddle, qcolombet, jdoerfert, MatzeB, echristo, MaskRay, xbolva00, aaron.ballman, cfe-commits, JonChesterfield, hiraditya, llvm-commits, rnk, craig.topper
Tags: #llvm, #clang
Differential Revision: https://reviews.llvm.org/D69868
2020-02-25 10:28:32 +08:00
|
|
|
const MachineFunction *MF = getParent();
|
2016-04-22 04:46:27 +08:00
|
|
|
// Performance might be harmed on HW that implements branching using exec mask
|
|
|
|
// where both sides of the branches are always executed.
|
|
|
|
if (MF->getTarget().requiresStructuredCFG())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// We may need to update this's terminator, but we can't do that if
|
2020-01-21 23:47:35 +08:00
|
|
|
// analyzeBranch fails. If this uses a jump table, we won't touch it.
|
2016-04-22 04:46:27 +08:00
|
|
|
const TargetInstrInfo *TII = MF->getSubtarget().getInstrInfo();
|
|
|
|
MachineBasicBlock *TBB = nullptr, *FBB = nullptr;
|
|
|
|
SmallVector<MachineOperand, 4> Cond;
|
|
|
|
// AnalyzeBanch should modify this, since we did not allow modification.
|
2016-07-15 22:41:04 +08:00
|
|
|
if (TII->analyzeBranch(*const_cast<MachineBasicBlock *>(this), TBB, FBB, Cond,
|
2016-04-22 04:46:27 +08:00
|
|
|
/*AllowModify*/ false))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Avoid bugpoint weirdness: A block may end with a conditional branch but
|
|
|
|
// jumps to the same MBB is either case. We have duplicate CFG edges in that
|
|
|
|
// case that we can't handle. Since this never happens in properly optimized
|
|
|
|
// code, just skip those edges.
|
|
|
|
if (TBB && TBB == FBB) {
|
2018-05-14 20:53:11 +08:00
|
|
|
LLVM_DEBUG(dbgs() << "Won't split critical edge after degenerate "
|
|
|
|
<< printMBBReference(*this) << '\n');
|
2016-04-22 04:46:27 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-12-18 07:55:38 +08:00
|
|
|
/// Prepare MI to be removed from its bundle. This fixes bundle flags on MI's
|
|
|
|
/// neighboring instructions so the bundle won't be broken by removing MI.
|
|
|
|
static void unbundleSingleMI(MachineInstr *MI) {
|
|
|
|
// Removing the first instruction in a bundle.
|
|
|
|
if (MI->isBundledWithSucc() && !MI->isBundledWithPred())
|
|
|
|
MI->unbundleFromSucc();
|
|
|
|
// Removing the last instruction in a bundle.
|
|
|
|
if (MI->isBundledWithPred() && !MI->isBundledWithSucc())
|
|
|
|
MI->unbundleFromPred();
|
|
|
|
// If MI is not bundled, or if it is internal to a bundle, the neighbor flags
|
|
|
|
// are already fine.
|
|
|
|
}
|
|
|
|
|
|
|
|
MachineBasicBlock::instr_iterator
|
|
|
|
MachineBasicBlock::erase(MachineBasicBlock::instr_iterator I) {
|
2015-10-10 03:23:20 +08:00
|
|
|
unbundleSingleMI(&*I);
|
2012-12-18 07:55:38 +08:00
|
|
|
return Insts.erase(I);
|
|
|
|
}
|
|
|
|
|
|
|
|
MachineInstr *MachineBasicBlock::remove_instr(MachineInstr *MI) {
|
|
|
|
unbundleSingleMI(MI);
|
|
|
|
MI->clearFlag(MachineInstr::BundledPred);
|
|
|
|
MI->clearFlag(MachineInstr::BundledSucc);
|
|
|
|
return Insts.remove(MI);
|
2011-12-14 10:11:42 +08:00
|
|
|
}
|
|
|
|
|
2012-12-19 01:54:53 +08:00
|
|
|
MachineBasicBlock::instr_iterator
|
|
|
|
MachineBasicBlock::insert(instr_iterator I, MachineInstr *MI) {
|
|
|
|
assert(!MI->isBundledWithPred() && !MI->isBundledWithSucc() &&
|
|
|
|
"Cannot insert instruction with bundle flags");
|
|
|
|
// Set the bundle flags when inserting inside a bundle.
|
|
|
|
if (I != instr_end() && I->isBundledWithPred()) {
|
|
|
|
MI->setFlag(MachineInstr::BundledPred);
|
|
|
|
MI->setFlag(MachineInstr::BundledSucc);
|
|
|
|
}
|
|
|
|
return Insts.insert(I, MI);
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// This method unlinks 'this' from the containing function, and returns it, but
|
|
|
|
/// does not delete it.
|
2008-07-08 07:14:23 +08:00
|
|
|
MachineBasicBlock *MachineBasicBlock::removeFromParent() {
|
|
|
|
assert(getParent() && "Not embedded in a function!");
|
|
|
|
getParent()->remove(this);
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// This method unlinks 'this' from the containing function, and deletes it.
|
2008-07-08 07:14:23 +08:00
|
|
|
void MachineBasicBlock::eraseFromParent() {
|
|
|
|
assert(getParent() && "Not embedded in a function!");
|
|
|
|
getParent()->erase(this);
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// Given a machine basic block that branched to 'Old', change the code and CFG
|
|
|
|
/// so that it branches to 'New' instead.
|
2007-06-04 14:44:01 +08:00
|
|
|
void MachineBasicBlock::ReplaceUsesOfBlockWith(MachineBasicBlock *Old,
|
|
|
|
MachineBasicBlock *New) {
|
|
|
|
assert(Old != New && "Cannot replace self with self!");
|
|
|
|
|
2011-12-14 10:11:42 +08:00
|
|
|
MachineBasicBlock::instr_iterator I = instr_end();
|
|
|
|
while (I != instr_begin()) {
|
2007-06-04 14:44:01 +08:00
|
|
|
--I;
|
2011-12-07 15:15:52 +08:00
|
|
|
if (!I->isTerminator()) break;
|
2007-06-04 14:44:01 +08:00
|
|
|
|
|
|
|
// Scan the operands of this machine instruction, replacing any uses of Old
|
|
|
|
// with New.
|
|
|
|
for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
|
2008-10-03 23:45:36 +08:00
|
|
|
if (I->getOperand(i).isMBB() &&
|
2008-09-14 01:58:21 +08:00
|
|
|
I->getOperand(i).getMBB() == Old)
|
2007-12-31 07:10:15 +08:00
|
|
|
I->getOperand(i).setMBB(New);
|
2007-06-04 14:44:01 +08:00
|
|
|
}
|
|
|
|
|
2009-05-06 05:10:19 +08:00
|
|
|
// Update the successor information.
|
2011-06-17 04:22:37 +08:00
|
|
|
replaceSuccessor(Old, New);
|
2007-06-04 14:44:01 +08:00
|
|
|
}
|
|
|
|
|
2019-08-30 19:23:10 +08:00
|
|
|
void MachineBasicBlock::replacePhiUsesWith(MachineBasicBlock *Old,
|
|
|
|
MachineBasicBlock *New) {
|
|
|
|
for (MachineInstr &MI : phis())
|
|
|
|
for (unsigned i = 2, e = MI.getNumOperands() + 1; i != e; i += 2) {
|
|
|
|
MachineOperand &MO = MI.getOperand(i);
|
|
|
|
if (MO.getMBB() == Old)
|
|
|
|
MO.setMBB(New);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-13 05:18:54 +08:00
|
|
|
/// Find the next valid DebugLoc starting at MBBI, skipping any DBG_VALUE
|
|
|
|
/// instructions. Return UnknownLoc if there is none.
|
2010-01-20 08:19:24 +08:00
|
|
|
DebugLoc
|
2011-12-14 10:11:42 +08:00
|
|
|
MachineBasicBlock::findDebugLoc(instr_iterator MBBI) {
|
2011-12-07 06:12:01 +08:00
|
|
|
// Skip debug declarations, we don't want a DebugLoc from them.
|
2016-12-16 19:10:26 +08:00
|
|
|
MBBI = skipDebugInstructionsForward(MBBI, instr_end());
|
|
|
|
if (MBBI != instr_end())
|
|
|
|
return MBBI->getDebugLoc();
|
2018-03-16 06:06:51 +08:00
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Find the previous valid DebugLoc preceding MBBI, skipping and DBG_VALUE
|
|
|
|
/// instructions. Return UnknownLoc if there is none.
|
|
|
|
DebugLoc MachineBasicBlock::findPrevDebugLoc(instr_iterator MBBI) {
|
|
|
|
if (MBBI == instr_begin()) return {};
|
2020-04-16 08:54:39 +08:00
|
|
|
// Skip debug instructions, we don't want a DebugLoc from them.
|
|
|
|
MBBI = prev_nodbg(MBBI, instr_begin());
|
2018-05-09 10:42:00 +08:00
|
|
|
if (!MBBI->isDebugInstr()) return MBBI->getDebugLoc();
|
2016-12-16 19:10:26 +08:00
|
|
|
return {};
|
2010-01-20 08:19:24 +08:00
|
|
|
}
|
2010-01-21 05:36:02 +08:00
|
|
|
|
Make MachineBasicBlock::updateTerminator to update DebugLoc as well
Summary:
Currently MachineBasicBlock::updateTerminator simply drops DebugLoc for newly created branch instructions, which may cause incorrect stepping and/or imprecise sample profile data. Below is an example:
```
1 extern int bar(int x);
2
3 int foo(int *begin, int *end) {
4 int *i;
5 int ret = 0;
6 for (
7 i = begin ;
8 i != end ;
9 i++)
10 {
11 ret += bar(*i);
12 }
13 return ret;
14 }
```
Below is a bitcode of 'foo' at the end of LLVM-IR level optimizations with -O3:
```
define i32 @foo(i32* readonly %begin, i32* readnone %end) !dbg !4 {
entry:
%cmp6 = icmp eq i32* %begin, %end, !dbg !9
br i1 %cmp6, label %for.end, label %for.body.preheader, !dbg !12
for.body.preheader: ; preds = %entry
br label %for.body, !dbg !13
for.body: ; preds = %for.body.preheader, %for.body
%ret.08 = phi i32 [ %add, %for.body ], [ 0, %for.body.preheader ]
%i.07 = phi i32* [ %incdec.ptr, %for.body ], [ %begin, %for.body.preheader ]
%0 = load i32, i32* %i.07, align 4, !dbg !13, !tbaa !15
%call = tail call i32 @bar(i32 %0), !dbg !19
%add = add nsw i32 %call, %ret.08, !dbg !20
%incdec.ptr = getelementptr inbounds i32, i32* %i.07, i64 1, !dbg !21
%cmp = icmp eq i32* %incdec.ptr, %end, !dbg !9
br i1 %cmp, label %for.end.loopexit, label %for.body, !dbg !12, !llvm.loop !22
for.end.loopexit: ; preds = %for.body
br label %for.end, !dbg !24
for.end: ; preds = %for.end.loopexit, %entry
%ret.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.end.loopexit ]
ret i32 %ret.0.lcssa, !dbg !24
}
```
where
```
!12 = !DILocation(line: 6, column: 3, scope: !11)
```
. As you can see, the terminator of 'entry' block, which is a loop control branch, has a DebugLoc of line 6, column 3. Howerver, after the execution of 'MachineBlock::updateTerminator' function, which is triggered by MachineSinking pass, the DebugLoc info is dropped as below (see there's no debug-location for JNE_1):
```
bb.0.entry:
successors: %bb.4(0x30000000), %bb.1.for.body.preheader(0x50000000)
liveins: %rdi, %rsi
%6 = COPY %rsi
%5 = COPY %rdi
%8 = SUB64rr %5, %6, implicit-def %eflags, debug-location !9
JNE_1 %bb.1.for.body.preheader, implicit %eflags
```
This patch addresses this issue and make newly created branch instructions to keep debug-location info.
Reviewers: aprantl, MatzeB, craig.topper, qcolombet
Reviewed By: qcolombet
Subscribers: qcolombet, llvm-commits
Differential Revision: https://reviews.llvm.org/D29596
llvm-svn: 294976
2017-02-14 02:15:31 +08:00
|
|
|
/// Find and return the merged DebugLoc of the branch instructions of the block.
|
|
|
|
/// Return UnknownLoc if there is none.
|
|
|
|
DebugLoc
|
|
|
|
MachineBasicBlock::findBranchDebugLoc() {
|
2017-02-14 05:12:27 +08:00
|
|
|
DebugLoc DL;
|
Make MachineBasicBlock::updateTerminator to update DebugLoc as well
Summary:
Currently MachineBasicBlock::updateTerminator simply drops DebugLoc for newly created branch instructions, which may cause incorrect stepping and/or imprecise sample profile data. Below is an example:
```
1 extern int bar(int x);
2
3 int foo(int *begin, int *end) {
4 int *i;
5 int ret = 0;
6 for (
7 i = begin ;
8 i != end ;
9 i++)
10 {
11 ret += bar(*i);
12 }
13 return ret;
14 }
```
Below is a bitcode of 'foo' at the end of LLVM-IR level optimizations with -O3:
```
define i32 @foo(i32* readonly %begin, i32* readnone %end) !dbg !4 {
entry:
%cmp6 = icmp eq i32* %begin, %end, !dbg !9
br i1 %cmp6, label %for.end, label %for.body.preheader, !dbg !12
for.body.preheader: ; preds = %entry
br label %for.body, !dbg !13
for.body: ; preds = %for.body.preheader, %for.body
%ret.08 = phi i32 [ %add, %for.body ], [ 0, %for.body.preheader ]
%i.07 = phi i32* [ %incdec.ptr, %for.body ], [ %begin, %for.body.preheader ]
%0 = load i32, i32* %i.07, align 4, !dbg !13, !tbaa !15
%call = tail call i32 @bar(i32 %0), !dbg !19
%add = add nsw i32 %call, %ret.08, !dbg !20
%incdec.ptr = getelementptr inbounds i32, i32* %i.07, i64 1, !dbg !21
%cmp = icmp eq i32* %incdec.ptr, %end, !dbg !9
br i1 %cmp, label %for.end.loopexit, label %for.body, !dbg !12, !llvm.loop !22
for.end.loopexit: ; preds = %for.body
br label %for.end, !dbg !24
for.end: ; preds = %for.end.loopexit, %entry
%ret.0.lcssa = phi i32 [ 0, %entry ], [ %add, %for.end.loopexit ]
ret i32 %ret.0.lcssa, !dbg !24
}
```
where
```
!12 = !DILocation(line: 6, column: 3, scope: !11)
```
. As you can see, the terminator of 'entry' block, which is a loop control branch, has a DebugLoc of line 6, column 3. Howerver, after the execution of 'MachineBlock::updateTerminator' function, which is triggered by MachineSinking pass, the DebugLoc info is dropped as below (see there's no debug-location for JNE_1):
```
bb.0.entry:
successors: %bb.4(0x30000000), %bb.1.for.body.preheader(0x50000000)
liveins: %rdi, %rsi
%6 = COPY %rsi
%5 = COPY %rdi
%8 = SUB64rr %5, %6, implicit-def %eflags, debug-location !9
JNE_1 %bb.1.for.body.preheader, implicit %eflags
```
This patch addresses this issue and make newly created branch instructions to keep debug-location info.
Reviewers: aprantl, MatzeB, craig.topper, qcolombet
Reviewed By: qcolombet
Subscribers: qcolombet, llvm-commits
Differential Revision: https://reviews.llvm.org/D29596
llvm-svn: 294976
2017-02-14 02:15:31 +08:00
|
|
|
auto TI = getFirstTerminator();
|
|
|
|
while (TI != end() && !TI->isBranch())
|
|
|
|
++TI;
|
|
|
|
|
|
|
|
if (TI != end()) {
|
|
|
|
DL = TI->getDebugLoc();
|
|
|
|
for (++TI ; TI != end() ; ++TI)
|
|
|
|
if (TI->isBranch())
|
|
|
|
DL = DILocation::getMergedLocation(DL, TI->getDebugLoc());
|
|
|
|
}
|
|
|
|
return DL;
|
|
|
|
}
|
|
|
|
|
2015-12-01 13:29:22 +08:00
|
|
|
/// Return probability of the edge from this block to MBB.
|
2015-11-05 05:37:58 +08:00
|
|
|
BranchProbability
|
|
|
|
MachineBasicBlock::getSuccProbability(const_succ_iterator Succ) const {
|
2015-12-01 19:05:39 +08:00
|
|
|
if (Probs.empty())
|
2015-11-05 05:37:58 +08:00
|
|
|
return BranchProbability(1, succ_size());
|
|
|
|
|
2015-12-01 19:05:39 +08:00
|
|
|
const auto &Prob = *getProbabilityIterator(Succ);
|
|
|
|
if (Prob.isUnknown()) {
|
|
|
|
// For unknown probabilities, collect the sum of all known ones, and evenly
|
|
|
|
// ditribute the complemental of the sum to each unknown probability.
|
|
|
|
unsigned KnownProbNum = 0;
|
|
|
|
auto Sum = BranchProbability::getZero();
|
|
|
|
for (auto &P : Probs) {
|
|
|
|
if (!P.isUnknown()) {
|
|
|
|
Sum += P;
|
|
|
|
KnownProbNum++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Sum.getCompl() / (Probs.size() - KnownProbNum);
|
|
|
|
} else
|
|
|
|
return Prob;
|
2014-01-30 07:18:47 +08:00
|
|
|
}
|
|
|
|
|
2015-11-05 05:37:58 +08:00
|
|
|
/// Set successor probability of a given iterator.
|
|
|
|
void MachineBasicBlock::setSuccProbability(succ_iterator I,
|
|
|
|
BranchProbability Prob) {
|
|
|
|
assert(!Prob.isUnknown());
|
2015-12-01 13:29:22 +08:00
|
|
|
if (Probs.empty())
|
2015-11-05 05:37:58 +08:00
|
|
|
return;
|
|
|
|
*getProbabilityIterator(I) = Prob;
|
2015-12-01 11:49:42 +08:00
|
|
|
}
|
|
|
|
|
2015-12-01 13:29:22 +08:00
|
|
|
/// Return probability iterator corresonding to the I successor iterator
|
|
|
|
MachineBasicBlock::const_probability_iterator
|
|
|
|
MachineBasicBlock::getProbabilityIterator(
|
|
|
|
MachineBasicBlock::const_succ_iterator I) const {
|
2015-11-05 05:37:58 +08:00
|
|
|
assert(Probs.size() == Successors.size() && "Async probability list!");
|
|
|
|
const size_t index = std::distance(Successors.begin(), I);
|
|
|
|
assert(index < Probs.size() && "Not a current successor!");
|
|
|
|
return Probs.begin() + index;
|
|
|
|
}
|
|
|
|
|
2015-12-01 13:29:22 +08:00
|
|
|
/// Return probability iterator corresonding to the I successor iterator.
|
|
|
|
MachineBasicBlock::probability_iterator
|
|
|
|
MachineBasicBlock::getProbabilityIterator(MachineBasicBlock::succ_iterator I) {
|
2015-12-01 11:49:42 +08:00
|
|
|
assert(Probs.size() == Successors.size() && "Async probability list!");
|
|
|
|
const size_t index = std::distance(Successors.begin(), I);
|
|
|
|
assert(index < Probs.size() && "Not a current successor!");
|
|
|
|
return Probs.begin() + index;
|
|
|
|
}
|
|
|
|
|
2012-09-12 18:18:23 +08:00
|
|
|
/// Return whether (physical) register "Reg" has been <def>ined and not <kill>ed
|
|
|
|
/// as of just before "MI".
|
2016-01-07 18:26:32 +08:00
|
|
|
///
|
2012-09-12 18:18:23 +08:00
|
|
|
/// Search is localised to a neighborhood of
|
|
|
|
/// Neighborhood instructions before (searching for defs or kills) and N
|
|
|
|
/// instructions after (searching just for defs) MI.
|
|
|
|
MachineBasicBlock::LivenessQueryResult
|
|
|
|
MachineBasicBlock::computeRegisterLiveness(const TargetRegisterInfo *TRI,
|
2020-04-08 22:40:26 +08:00
|
|
|
MCRegister Reg, const_iterator Before,
|
2015-05-27 13:12:39 +08:00
|
|
|
unsigned Neighborhood) const {
|
2012-09-12 18:18:23 +08:00
|
|
|
unsigned N = Neighborhood;
|
|
|
|
|
2018-08-30 15:18:10 +08:00
|
|
|
// Try searching forwards from Before, looking for reads or defs.
|
2015-05-27 13:12:39 +08:00
|
|
|
const_iterator I(Before);
|
2018-11-14 08:39:29 +08:00
|
|
|
for (; I != end() && N > 0; ++I) {
|
2019-07-05 20:30:45 +08:00
|
|
|
if (I->isDebugInstr())
|
2018-11-14 08:39:29 +08:00
|
|
|
continue;
|
2018-08-30 15:18:19 +08:00
|
|
|
|
2018-11-14 08:39:29 +08:00
|
|
|
--N;
|
2018-08-30 15:18:19 +08:00
|
|
|
|
2019-12-03 04:00:56 +08:00
|
|
|
PhysRegInfo Info = AnalyzePhysRegInBundle(*I, Reg, TRI);
|
2018-08-30 15:18:10 +08:00
|
|
|
|
2018-11-14 08:39:29 +08:00
|
|
|
// Register is live when we read it here.
|
|
|
|
if (Info.Read)
|
|
|
|
return LQR_Live;
|
|
|
|
// Register is dead if we can fully overwrite or clobber it here.
|
|
|
|
if (Info.FullyDefined || Info.Clobbered)
|
|
|
|
return LQR_Dead;
|
2018-08-30 15:18:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// If we reached the end, it is safe to clobber Reg at the end of a block of
|
|
|
|
// no successor has it live in.
|
|
|
|
if (I == end()) {
|
|
|
|
for (MachineBasicBlock *S : successors()) {
|
2018-09-25 14:10:04 +08:00
|
|
|
for (const MachineBasicBlock::RegisterMaskPair &LI : S->liveins()) {
|
|
|
|
if (TRI->regsOverlap(LI.PhysReg, Reg))
|
2018-08-30 15:18:10 +08:00
|
|
|
return LQR_Live;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return LQR_Dead;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
N = Neighborhood;
|
|
|
|
|
|
|
|
// Start by searching backwards from Before, looking for kills, reads or defs.
|
|
|
|
I = const_iterator(Before);
|
2012-09-12 18:18:23 +08:00
|
|
|
// If this is the first insn in the block, don't search backwards.
|
2015-05-27 13:12:39 +08:00
|
|
|
if (I != begin()) {
|
2012-09-12 18:18:23 +08:00
|
|
|
do {
|
|
|
|
--I;
|
|
|
|
|
2019-07-05 20:30:45 +08:00
|
|
|
if (I->isDebugInstr())
|
2018-08-30 15:18:19 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
--N;
|
|
|
|
|
2019-12-03 04:00:56 +08:00
|
|
|
PhysRegInfo Info = AnalyzePhysRegInBundle(*I, Reg, TRI);
|
2012-09-12 18:18:23 +08:00
|
|
|
|
2015-12-12 03:42:09 +08:00
|
|
|
// Defs happen after uses so they take precedence if both are present.
|
2012-11-20 17:56:11 +08:00
|
|
|
|
2015-12-12 03:42:09 +08:00
|
|
|
// Register is dead after a dead def of the full register.
|
|
|
|
if (Info.DeadDef)
|
2012-09-12 18:18:23 +08:00
|
|
|
return LQR_Dead;
|
2015-12-12 03:42:09 +08:00
|
|
|
// Register is (at least partially) live after a def.
|
2016-04-27 07:14:29 +08:00
|
|
|
if (Info.Defined) {
|
|
|
|
if (!Info.PartialDeadDef)
|
|
|
|
return LQR_Live;
|
|
|
|
// As soon as we saw a partial definition (dead or not),
|
|
|
|
// we cannot tell if the value is partial live without
|
|
|
|
// tracking the lanemasks. We are not going to do this,
|
|
|
|
// so fall back on the remaining of the analysis.
|
|
|
|
break;
|
|
|
|
}
|
2015-12-12 03:42:09 +08:00
|
|
|
// Register is dead after a full kill or clobber and no def.
|
|
|
|
if (Info.Killed || Info.Clobbered)
|
|
|
|
return LQR_Dead;
|
|
|
|
// Register must be live if we read it.
|
|
|
|
if (Info.Read)
|
|
|
|
return LQR_Live;
|
2018-08-30 15:18:19 +08:00
|
|
|
|
|
|
|
} while (I != begin() && N > 0);
|
2012-09-12 18:18:23 +08:00
|
|
|
}
|
|
|
|
|
2019-11-02 05:06:52 +08:00
|
|
|
// If all the instructions before this in the block are debug instructions,
|
|
|
|
// skip over them.
|
|
|
|
while (I != begin() && std::prev(I)->isDebugInstr())
|
|
|
|
--I;
|
|
|
|
|
2012-09-12 18:18:23 +08:00
|
|
|
// Did we get to the start of the block?
|
2015-05-27 13:12:39 +08:00
|
|
|
if (I == begin()) {
|
2012-09-12 18:18:23 +08:00
|
|
|
// If so, the register's state is definitely defined by the live-in state.
|
2018-09-25 14:10:04 +08:00
|
|
|
for (const MachineBasicBlock::RegisterMaskPair &LI : liveins())
|
|
|
|
if (TRI->regsOverlap(LI.PhysReg, Reg))
|
2015-12-12 03:42:09 +08:00
|
|
|
return LQR_Live;
|
2012-09-12 18:18:23 +08:00
|
|
|
|
|
|
|
return LQR_Dead;
|
|
|
|
}
|
|
|
|
|
|
|
|
// At this point we have no idea of the liveness of the register.
|
|
|
|
return LQR_Unknown;
|
|
|
|
}
|
2015-11-07 01:06:38 +08:00
|
|
|
|
|
|
|
const uint32_t *
|
|
|
|
MachineBasicBlock::getBeginClobberMask(const TargetRegisterInfo *TRI) const {
|
|
|
|
// EH funclet entry does not preserve any registers.
|
|
|
|
return isEHFuncletEntry() ? TRI->getNoPreservedMask() : nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint32_t *
|
|
|
|
MachineBasicBlock::getEndClobberMask(const TargetRegisterInfo *TRI) const {
|
|
|
|
// If we see a return block with successors, this must be a funclet return,
|
|
|
|
// which does not preserve any registers. If there are no successors, we don't
|
|
|
|
// care what kind of return it is, putting a mask after it is a no-op.
|
|
|
|
return isReturnBlock() && !succ_empty() ? TRI->getNoPreservedMask() : nullptr;
|
|
|
|
}
|
2016-12-17 07:55:37 +08:00
|
|
|
|
|
|
|
void MachineBasicBlock::clearLiveIns() {
|
|
|
|
LiveIns.clear();
|
|
|
|
}
|
2017-01-06 04:01:19 +08:00
|
|
|
|
|
|
|
MachineBasicBlock::livein_iterator MachineBasicBlock::livein_begin() const {
|
|
|
|
assert(getParent()->getProperties().hasProperty(
|
|
|
|
MachineFunctionProperties::Property::TracksLiveness) &&
|
|
|
|
"Liveness information is accurate");
|
|
|
|
return LiveIns.begin();
|
|
|
|
}
|
2020-04-14 03:14:42 +08:00
|
|
|
|
|
|
|
const MBBSectionID MBBSectionID::ColdSectionID(MBBSectionID::SectionType::Cold);
|
|
|
|
const MBBSectionID
|
|
|
|
MBBSectionID::ExceptionSectionID(MBBSectionID::SectionType::Exception);
|