maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ARM] additionally check for ARM::INLINEASM_BR w/ ARM::INLINEASM 

Summary:
We were observing failures for arm32 allyesconfigs of the Linux kernel
with the asm goto Clang patch, where ldr's were being generated to
offsets too far away to encode in imm12.

It looks like since INLINEASM_BR was created off of INLINEASM, a few
checks for INLINEASM needed to be updated to check for either case.

pr/41999

Link: https://github.com/ClangBuiltLinux/linux/issues/490

Reviewers: peter.smith, kristof.beyls, ostannard, rengolin, t.p.northover

Reviewed By: peter.smith

Subscribers: jyu2, javed.absar, hiraditya, llvm-commits, nathanchance, craig.topper, kees, srhines

Tags: #llvm

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

llvm-svn: 361659
This commit is contained in:
Nick Desaulniers 2019-05-24 18:58:21 +00:00
parent 93d2c8a646
commit 9f7bd71cf5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
View File

@ -706,15 +706,7 @@ unsigned ARMBaseInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
if (MCID.getSize())
return MCID.getSize();
// If this machine instr is an inline asm, measure it.
if (MI.getOpcode() == ARM::INLINEASM) {
unsigned Size = getInlineAsmLength(MI.getOperand(0).getSymbolName(), *MAI);
if (!MF->getInfo<ARMFunctionInfo>()->isThumbFunction())
Size = alignTo(Size, 4);
return Size;
}
unsigned Opc = MI.getOpcode();
switch (Opc) {
switch (MI.getOpcode()) {
default:
// pseudo-instruction sizes are zero.
return 0;
@ -751,6 +743,14 @@ unsigned ARMBaseInstrInfo::getInstSizeInBytes(const MachineInstr &MI) const {
return 12;
case ARM::SPACE:
return MI.getOperand(1).getImm();
case ARM::INLINEASM:
case ARM::INLINEASM_BR: {
// If this machine instr is an inline asm, measure it.
unsigned Size = getInlineAsmLength(MI.getOperand(0).getSymbolName(), *MAI);
if (!MF->getInfo<ARMFunctionInfo>()->isThumbFunction())
Size = alignTo(Size, 4);
return Size;
}
}
}
@ -2392,7 +2392,7 @@ bool llvm::rewriteARMFrameIndex(MachineInstr &MI, unsigned FrameRegIdx,
bool isSub = false;
// Memory operands in inline assembly always use AddrMode2.
if (Opcode == ARM::INLINEASM)
if (Opcode == ARM::INLINEASM || Opcode == ARM::INLINEASM_BR)
AddrMode = ARMII::AddrMode2;
if (Opcode == ARM::ADDri) {

2
llvm/lib/Target/ARM/Thumb2InstrInfo.cpp
View File

@ -477,7 +477,7 @@ bool llvm::rewriteT2FrameIndex(MachineInstr &MI, unsigned FrameRegIdx,
bool isSub = false;
// Memory operands in inline assembly always use AddrModeT2_i12.
if (Opcode == ARM::INLINEASM)
if (Opcode == ARM::INLINEASM || Opcode == ARM::INLINEASM_BR)
AddrMode = ARMII::AddrModeT2_i12; // FIXME. mode for thumb2?
if (Opcode == ARM::t2ADDri || Opcode == ARM::t2ADDri12) {