Skip to content

Commit 62a16ca

Browse files
nickdesaulnierststellar
nickdesaulniers
authored and
tstellar
committed
Merging r373655:
------------------------------------------------------------------------ r373655 | nickdesaulniers | 2019-10-03 13:10:02 -0700 (Thu, 03 Oct 2019) | 16 lines [AArch64InstPrinter] prefer bfi to bfc for < armv8.2-a Summary: Fixes pr/42576. Link: ClangBuiltLinux/linux#697 Reviewers: t.p.northover Reviewed By: t.p.northover Subscribers: kristof.beyls, hiraditya, llvm-commits, srhines Tags: #llvm Differential Revision: https://reviews.llvm.org/D68356 ------------------------------------------------------------------------
1 parent 293a245 commit 62a16ca

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ void AArch64InstPrinter::printInst(const MCInst *MI, raw_ostream &O,
172172
int ImmS = MI->getOperand(4).getImm();
173173

174174
if ((Op2.getReg() == AArch64::WZR || Op2.getReg() == AArch64::XZR) &&
175-
(ImmR == 0 || ImmS < ImmR)) {
175+
(ImmR == 0 || ImmS < ImmR) &&
176+
STI.getFeatureBits()[AArch64::HasV8_2aOps]) {
176177
// BFC takes precedence over its entire range, sligtly differently to BFI.
177178
int BitWidth = Opcode == AArch64::BFMXri ? 64 : 32;
178179
int LSB = (BitWidth - ImmR) % BitWidth;

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s | FileCheck %s --check-prefix=BFI
2+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.1a | FileCheck %s --check-prefix=BFI
3+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=-v8.2a | FileCheck %s --check-prefix=BFI
4+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.2a | FileCheck %s --check-prefix=BFC
5+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.3a | FileCheck %s --check-prefix=BFC
6+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.4a | FileCheck %s --check-prefix=BFC
7+
// RUN: llvm-mc -triple aarch64-linux-gnu -o - %s -mattr=+v8.5a | FileCheck %s --check-prefix=BFC
8+
bfc w0, #1, #5
9+
10+
// BFI: bfi w0, wzr, #1, #5
11+
// BFC: bfc w0, #1, #5

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ _func:
978978
bfm x5, x6, #12, #63
979979
// CHECK: bfi x4, x5, #52, #11 // encoding: [0xa4,0x28,0x4c,0xb3]
980980
// CHECK: bfxil xzr, x4, #0, #1 // encoding: [0x9f,0x00,0x40,0xb3]
981-
// CHECK: bfc x4, #1, #6 // encoding: [0xe4,0x17,0x7f,0xb3]
981+
// CHECK: bfi x4, xzr, #1, #6 // encoding: [0xe4,0x17,0x7f,0xb3]
982982
// CHECK: bfxil x5, x6, #12, #52 // encoding: [0xc5,0xfc,0x4c,0xb3]
983983

984984
sxtb w1, w2
@@ -1078,7 +1078,7 @@ _func:
10781078
// CHECK: bfxil w9, w10, #0, #32 // encoding: [0x49,0x7d,0x00,0x33]
10791079
// CHECK: bfi w11, w12, #31, #1 // encoding: [0x8b,0x01,0x01,0x33]
10801080
// CHECK: bfi w13, w14, #29, #3 // encoding: [0xcd,0x09,0x03,0x33]
1081-
// CHECK: bfc xzr, #10, #11 // encoding: [0xff,0x2b,0x76,0xb3]
1081+
// CHECK: bfi xzr, xzr, #10, #11 // encoding: [0xff,0x2b,0x76,0xb3]
10821082

10831083
bfxil w9, w10, #0, #1
10841084
bfxil x2, x3, #63, #1
@@ -1137,10 +1137,10 @@ _func:
11371137
bfc wzr, #31, #1
11381138
bfc x0, #5, #9
11391139
bfc xzr, #63, #1
1140-
// CHECK: bfc w3, #0, #32 // encoding: [0xe3,0x7f,0x00,0x33]
1141-
// CHECK: bfc wzr, #31, #1 // encoding: [0xff,0x03,0x01,0x33]
1142-
// CHECK: bfc x0, #5, #9 // encoding: [0xe0,0x23,0x7b,0xb3]
1143-
// CHECK: bfc xzr, #63, #1 // encoding: [0xff,0x03,0x41,0xb3]
1140+
// CHECK: bfxil w3, wzr, #0, #32 // encoding: [0xe3,0x7f,0x00,0x33]
1141+
// CHECK: bfi wzr, wzr, #31, #1 // encoding: [0xff,0x03,0x01,0x33]
1142+
// CHECK: bfi x0, xzr, #5, #9 // encoding: [0xe0,0x23,0x7b,0xb3]
1143+
// CHECK: bfi xzr, xzr, #63, #1 // encoding: [0xff,0x03,0x41,0xb3]
11441144

11451145
//------------------------------------------------------------------------------
11461146
// Compare & branch (immediate)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# RUN: llvm-mc -triple=aarch64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
22
# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
33
# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8,+fullfp16 -disassemble < %s | FileCheck %s --check-prefix=CHECK --check-prefix=FP16
4+
# RUN: llvm-mc -triple=arm64 -mattr=+v8.2a -disassemble < %s | FileCheck %s --check-prefix=CHECK-V82
45
# RUN: llvm-mc -triple=arm64 -mattr=+v8.3a -disassemble < %s | FileCheck %s --check-prefix=CHECK-V83
56

67
#------------------------------------------------------------------------------
@@ -624,7 +625,8 @@
624625

625626
# CHECK: bfi x4, x5, #52, #11
626627
# CHECK: bfxil xzr, x4, #0, #1
627-
# CHECK: bfc x4, #1, #6
628+
# CHECK: bfi x4, xzr, #1, #6
629+
# CHECK-V82: bfc x4, #1, #6
628630
# CHECK: bfxil x5, x6, #12, #52
629631
0xa4 0x28 0x4c 0xb3
630632
0x9f 0x0 0x40 0xb3
@@ -717,7 +719,8 @@
717719
# CHECK: bfxil w9, w10, #0, #32
718720
# CHECK: bfi w11, w12, #31, #1
719721
# CHECK: bfi w13, w14, #29, #3
720-
# CHECK: bfc xzr, #10, #11
722+
# CHECK-V82: bfc xzr, #10, #11
723+
# CHECK: bfi xzr, xzr, #10, #11
721724
0x49 0x1 0x0 0x33
722725
0x62 0x0 0x41 0xb3
723726
0x93 0xfe 0x40 0xb3

0 commit comments

Comments
 (0)