This is an archive of the discontinued LLVM Phabricator instance.

Differential D68356

[AArch64InstPrinter] prefer bfi to bfc for < armv8.2-a
ClosedPublic

Authored by nickdesaulniers on Oct 2 2019, 1:37 PM.

Details

Reviewers
t.p.northover
Commits
rG62a16ca77d68: Merging r373655:
rGede784ff5a60: [AArch64InstPrinter] prefer bfi to bfc for < armv8.2-a
rL373655: [AArch64InstPrinter] prefer bfi to bfc for < armv8.2-a
Summary

Fixes pr/42576.

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

Diff Detail

Repository
rL LLVM

Event Timeline

nickdesaulniers created this revision.Oct 2 2019, 1:37 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 2 2019, 1:38 PM
Herald added subscribers: llvm-commits, hiraditya, kristof.beyls. · View Herald Transcript
nickdesaulniers updated this revision to Diff 222902.Oct 2 2019, 1:38 PM
  • git-clang-format HEAD~
Harbormaster completed remote builds in B38908: Diff 222901.Oct 2 2019, 1:39 PM
Harbormaster completed remote builds in B38909: Diff 222902.
t.p.northover accepted this revision.Oct 3 2019, 1:03 AM

Looks reasonable to me.

This revision is now accepted and ready to land.Oct 3 2019, 1:03 AM
nickdesaulniers edited the summary of this revision. (Show Details)Oct 3 2019, 8:58 AM
nickdesaulniers added a comment.Oct 3 2019, 9:45 AM

Sorry, this breaks:

Failing Tests (2):

LLVM :: MC/AArch64/basic-a64-instructions.s
LLVM :: MC/Disassembler/AArch64/basic-a64-instructions.txt

Let me fix those up then ask for re-review.

nickdesaulniers updated this revision to Diff 223045.Oct 3 2019, 10:00 AM
  • fix two unit tests that needed updating
Harbormaster completed remote builds in B38948: Diff 223045.Oct 3 2019, 10:01 AM
t.p.northover accepted this revision.Oct 3 2019, 10:33 AM

Fair enough. Still fine I think.

Closed by commit rL373655: [AArch64InstPrinter] prefer bfi to bfc for < armv8.2-a (authored by nickdesaulniers). · Explain WhyOct 3 2019, 1:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
AArch64/
MCTargetDesc/
3 lines
test/
MC/
AArch64/
11 lines
12 lines
Disassembler/
AArch64/
7 lines

Diff 223079

llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64InstPrinter.cpp

Show First 20 Lines • Show All 166 Lines • ▼ Show 20 Linesvoid AArch64InstPrinter::printInst(const MCInst *MI, raw_ostream &O,
if (Opcode == AArch64::BFMXri || Opcode == AArch64::BFMWri) { if (Opcode == AArch64::BFMXri || Opcode == AArch64::BFMWri) {
const MCOperand &Op0 = MI->getOperand(0); // Op1 == Op0 const MCOperand &Op0 = MI->getOperand(0); // Op1 == Op0
const MCOperand &Op2 = MI->getOperand(2); const MCOperand &Op2 = MI->getOperand(2);
int ImmR = MI->getOperand(3).getImm(); int ImmR = MI->getOperand(3).getImm();
int ImmS = MI->getOperand(4).getImm(); int ImmS = MI->getOperand(4).getImm();
if ((Op2.getReg() == AArch64::WZR || Op2.getReg() == AArch64::XZR) && if ((Op2.getReg() == AArch64::WZR || Op2.getReg() == AArch64::XZR) &&
(ImmR == 0 || ImmS < ImmR)) { (ImmR == 0 || ImmS < ImmR) &&
STI.getFeatureBits()[AArch64::HasV8_2aOps]) {
// BFC takes precedence over its entire range, sligtly differently to BFI. // BFC takes precedence over its entire range, sligtly differently to BFI.
int BitWidth = Opcode == AArch64::BFMXri ? 64 : 32; int BitWidth = Opcode == AArch64::BFMXri ? 64 : 32;
int LSB = (BitWidth - ImmR) % BitWidth; int LSB = (BitWidth - ImmR) % BitWidth;
int Width = ImmS + 1; int Width = ImmS + 1;
O << "\tbfc\t" << getRegisterName(Op0.getReg()) O << "\tbfc\t" << getRegisterName(Op0.getReg())
<< ", #" << LSB << ", #" << Width; << ", #" << LSB << ", #" << Width;
printAnnotation(O, Annot); printAnnotation(O, Annot);
▲ Show 20 Lines • Show All 1,404 Lines • Show Last 20 Lines

llvm/trunk/test/MC/AArch64/armv8.2a-bfc.s

// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s | FileCheck %s --check-prefix=BFI
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.1a | FileCheck %s --check-prefix=BFI
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=-v8.2a | FileCheck %s --check-prefix=BFI
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.2a | FileCheck %s --check-prefix=BFC
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.3a | FileCheck %s --check-prefix=BFC
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.4a | FileCheck %s --check-prefix=BFC
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.5a | FileCheck %s --check-prefix=BFC
bfc w0, #1, #5
// BFI: bfi w0, wzr, #1, #5
// BFC: bfc w0, #1, #5

llvm/trunk/test/MC/AArch64/basic-a64-instructions.s

Show First 20 Lines • Show All 972 Lines • ▼ Show 20 Lines
// CHECK: lsr x5, x6, #12 // encoding: [0xc5,0xfc,0x4c,0xd3] // CHECK: lsr x5, x6, #12 // encoding: [0xc5,0xfc,0x4c,0xd3]
bfm x4, x5, #12, #10 bfm x4, x5, #12, #10
bfm xzr, x4, #0, #0 bfm xzr, x4, #0, #0
bfm x4, xzr, #63, #5 bfm x4, xzr, #63, #5
bfm x5, x6, #12, #63 bfm x5, x6, #12, #63
// CHECK: bfi x4, x5, #52, #11 // encoding: [0xa4,0x28,0x4c,0xb3] // CHECK: bfi x4, x5, #52, #11 // encoding: [0xa4,0x28,0x4c,0xb3]
// CHECK: bfxil xzr, x4, #0, #1 // encoding: [0x9f,0x00,0x40,0xb3] // CHECK: bfxil xzr, x4, #0, #1 // encoding: [0x9f,0x00,0x40,0xb3]
// CHECK: bfc x4, #1, #6 // encoding: [0xe4,0x17,0x7f,0xb3] // CHECK: bfi x4, xzr, #1, #6 // encoding: [0xe4,0x17,0x7f,0xb3]
// CHECK: bfxil x5, x6, #12, #52 // encoding: [0xc5,0xfc,0x4c,0xb3] // CHECK: bfxil x5, x6, #12, #52 // encoding: [0xc5,0xfc,0x4c,0xb3]
sxtb w1, w2 sxtb w1, w2
sxtb xzr, w3 sxtb xzr, w3
sxth w9, w10 sxth w9, w10
sxth x0, w1 sxth x0, w1
sxtw x3, w30 sxtw x3, w30
// CHECK: sxtb w1, w2 // encoding: [0x41,0x1c,0x00,0x13] // CHECK: sxtb w1, w2 // encoding: [0x41,0x1c,0x00,0x13]
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
// CHECK: bfxil w9, w10, #0, #1 // encoding: [0x49,0x01,0x00,0x33] // CHECK: bfxil w9, w10, #0, #1 // encoding: [0x49,0x01,0x00,0x33]
// CHECK: bfi x2, x3, #63, #1 // encoding: [0x62,0x00,0x41,0xb3] // CHECK: bfi x2, x3, #63, #1 // encoding: [0x62,0x00,0x41,0xb3]
// CHECK: bfxil x19, x20, #0, #64 // encoding: [0x93,0xfe,0x40,0xb3] // CHECK: bfxil x19, x20, #0, #64 // encoding: [0x93,0xfe,0x40,0xb3]
// CHECK: bfi x9, x10, #5, #59 // encoding: [0x49,0xe9,0x7b,0xb3] // CHECK: bfi x9, x10, #5, #59 // encoding: [0x49,0xe9,0x7b,0xb3]
// CHECK: bfxil w9, w10, #0, #32 // encoding: [0x49,0x7d,0x00,0x33] // CHECK: bfxil w9, w10, #0, #32 // encoding: [0x49,0x7d,0x00,0x33]
// CHECK: bfi w11, w12, #31, #1 // encoding: [0x8b,0x01,0x01,0x33] // CHECK: bfi w11, w12, #31, #1 // encoding: [0x8b,0x01,0x01,0x33]
// CHECK: bfi w13, w14, #29, #3 // encoding: [0xcd,0x09,0x03,0x33] // CHECK: bfi w13, w14, #29, #3 // encoding: [0xcd,0x09,0x03,0x33]
// CHECK: bfc xzr, #10, #11 // encoding: [0xff,0x2b,0x76,0xb3] // CHECK: bfi xzr, xzr, #10, #11 // encoding: [0xff,0x2b,0x76,0xb3]
bfxil w9, w10, #0, #1 bfxil w9, w10, #0, #1
bfxil x2, x3, #63, #1 bfxil x2, x3, #63, #1
bfxil x19, x20, #0, #64 bfxil x19, x20, #0, #64
bfxil x9, x10, #5, #59 bfxil x9, x10, #5, #59
bfxil w9, w10, #0, #32 bfxil w9, w10, #0, #32
bfxil w11, w12, #31, #1 bfxil w11, w12, #31, #1
bfxil w13, w14, #29, #3 bfxil w13, w14, #29, #3
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
// CHECK: lsr w11, w12, #31 // encoding: [0x8b,0x7d,0x1f,0x53] // CHECK: lsr w11, w12, #31 // encoding: [0x8b,0x7d,0x1f,0x53]
// CHECK: lsr w13, w14, #29 // encoding: [0xcd,0x7d,0x1d,0x53] // CHECK: lsr w13, w14, #29 // encoding: [0xcd,0x7d,0x1d,0x53]
// CHECK: ubfx xzr, xzr, #10, #11 // encoding: [0xff,0x53,0x4a,0xd3] // CHECK: ubfx xzr, xzr, #10, #11 // encoding: [0xff,0x53,0x4a,0xd3]
bfc w3, #0, #32 bfc w3, #0, #32
bfc wzr, #31, #1 bfc wzr, #31, #1
bfc x0, #5, #9 bfc x0, #5, #9
bfc xzr, #63, #1 bfc xzr, #63, #1
// CHECK: bfc w3, #0, #32 // encoding: [0xe3,0x7f,0x00,0x33] // CHECK: bfxil w3, wzr, #0, #32 // encoding: [0xe3,0x7f,0x00,0x33]
// CHECK: bfc wzr, #31, #1 // encoding: [0xff,0x03,0x01,0x33] // CHECK: bfi wzr, wzr, #31, #1 // encoding: [0xff,0x03,0x01,0x33]
// CHECK: bfc x0, #5, #9 // encoding: [0xe0,0x23,0x7b,0xb3] // CHECK: bfi x0, xzr, #5, #9 // encoding: [0xe0,0x23,0x7b,0xb3]
// CHECK: bfc xzr, #63, #1 // encoding: [0xff,0x03,0x41,0xb3] // CHECK: bfi xzr, xzr, #63, #1 // encoding: [0xff,0x03,0x41,0xb3]
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Compare & branch (immediate) // Compare & branch (immediate)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
cbz w5, lbl cbz w5, lbl
cbz x5, lbl cbz x5, lbl
cbnz x2, lbl cbnz x2, lbl
▲ Show 20 Lines • Show All 3,726 Lines • Show Last 20 Lines

llvm/trunk/test/MC/Disassembler/AArch64/basic-a64-instructions.txt

# RUN: llvm-mc -triple=aarch64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s # RUN: llvm-mc -triple=aarch64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s # RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8,+fullfp16 -disassemble < %s | FileCheck %s --check-prefix=CHECK --check-prefix=FP16 # RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8,+fullfp16 -disassemble < %s | FileCheck %s --check-prefix=CHECK --check-prefix=FP16
# RUN: llvm-mc -triple=arm64 -mattr=+v8.2a -disassemble < %s | FileCheck %s --check-prefix=CHECK-V82
# RUN: llvm-mc -triple=arm64 -mattr=+v8.3a -disassemble < %s | FileCheck %s --check-prefix=CHECK-V83 # RUN: llvm-mc -triple=arm64 -mattr=+v8.3a -disassemble < %s | FileCheck %s --check-prefix=CHECK-V83
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Add/sub (immediate) # Add/sub (immediate)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# CHECK: add w4, w5, #0 # CHECK: add w4, w5, #0
# CHECK: add w2, w3, #4095 # CHECK: add w2, w3, #4095
# CHECK: add w30, w29, #1, lsl #12 # CHECK: add w30, w29, #1, lsl #12
▲ Show 20 Lines • Show All 607 Lines • ▼ Show 20 Lines
# CHECK: lsr x5, x6, #12 # CHECK: lsr x5, x6, #12
0xa4 0x28 0x4c 0xd3 0xa4 0x28 0x4c 0xd3
0x9f 0x0 0x40 0xd3 0x9f 0x0 0x40 0xd3
0xe4 0x17 0x7f 0xd3 0xe4 0x17 0x7f 0xd3
0xc5 0xfc 0x4c 0xd3 0xc5 0xfc 0x4c 0xd3
# CHECK: bfi x4, x5, #52, #11 # CHECK: bfi x4, x5, #52, #11
# CHECK: bfxil xzr, x4, #0, #1 # CHECK: bfxil xzr, x4, #0, #1
# CHECK: bfc x4, #1, #6 # CHECK: bfi x4, xzr, #1, #6
# CHECK-V82: bfc x4, #1, #6
# CHECK: bfxil x5, x6, #12, #52 # CHECK: bfxil x5, x6, #12, #52
0xa4 0x28 0x4c 0xb3 0xa4 0x28 0x4c 0xb3
0x9f 0x0 0x40 0xb3 0x9f 0x0 0x40 0xb3
0xe4 0x17 0x7f 0xb3 0xe4 0x17 0x7f 0xb3
0xc5 0xfc 0x4c 0xb3 0xc5 0xfc 0x4c 0xb3
# CHECK: sxtb w1, w2 # CHECK: sxtb w1, w2
# CHECK: sxtb xzr, w3 # CHECK: sxtb xzr, w3
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Lines
# CHECK: bfxil w9, w10, #0, #1 # CHECK: bfxil w9, w10, #0, #1
# CHECK: bfi x2, x3, #63, #1 # CHECK: bfi x2, x3, #63, #1
# CHECK: bfxil x19, x20, #0, #64 # CHECK: bfxil x19, x20, #0, #64
# CHECK: bfi x9, x10, #5, #59 # CHECK: bfi x9, x10, #5, #59
# CHECK: bfxil w9, w10, #0, #32 # CHECK: bfxil w9, w10, #0, #32
# CHECK: bfi w11, w12, #31, #1 # CHECK: bfi w11, w12, #31, #1
# CHECK: bfi w13, w14, #29, #3 # CHECK: bfi w13, w14, #29, #3
# CHECK: bfc xzr, #10, #11 # CHECK-V82: bfc xzr, #10, #11
# CHECK: bfi xzr, xzr, #10, #11
0x49 0x1 0x0 0x33 0x49 0x1 0x0 0x33
0x62 0x0 0x41 0xb3 0x62 0x0 0x41 0xb3
0x93 0xfe 0x40 0xb3 0x93 0xfe 0x40 0xb3
0x49 0xe9 0x7b 0xb3 0x49 0xe9 0x7b 0xb3
0x49 0x7d 0x0 0x33 0x49 0x7d 0x0 0x33
0x8b 0x1 0x1 0x33 0x8b 0x1 0x1 0x33
0xcd 0x9 0x3 0x33 0xcd 0x9 0x3 0x33
0xff 0x2b 0x76 0xb3 0xff 0x2b 0x76 0xb3
▲ Show 20 Lines • Show All 3,595 Lines • Show Last 20 Lines