Skip to content

Commit 05cb476

Browse files
jiang1997jiang1997
committed
[X86] Remove LOW32_ADDR_ACCESS_RBP RegisterClass
This removes the LOW32_ADDR_ACCESS_RBP RegisterClass and refreshes all affected codegen tests Fixes #155430
1 parent fb87708 commit 05cb476

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1793
-1408
lines changed

‎llvm/lib/Target/X86/X86ISelLowering.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61664,8 +61664,7 @@ static bool isGRClass(const TargetRegisterClass &RC) {
6166461664
return RC.hasSuperClassEq(&X86::GR8RegClass) ||
6166561665
RC.hasSuperClassEq(&X86::GR16RegClass) ||
6166661666
RC.hasSuperClassEq(&X86::GR32RegClass) ||
61667-
RC.hasSuperClassEq(&X86::GR64RegClass) ||
61668-
RC.hasSuperClassEq(&X86::LOW32_ADDR_ACCESS_RBPRegClass);
61667+
RC.hasSuperClassEq(&X86::GR64RegClass);
6166961668
}
6167061669

6167161670
/// Check if \p RC is a vector register class.

‎llvm/lib/Target/X86/X86RegisterInfo.td‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -716,10 +716,6 @@ def GR64_NOREX2_NOSP : RegisterClass<"X86", [i64], 64,
716716
// which we do not have right now.
717717
def LOW32_ADDR_ACCESS : RegisterClass<"X86", [i32], 32, (add GR32, RIP)>;
718718

719-
// FIXME: This is unused, but deleting it results in codegen changes
720-
def LOW32_ADDR_ACCESS_RBP : RegisterClass<"X86", [i32], 32,
721-
(add LOW32_ADDR_ACCESS, RBP)>;
722-
723719
// A class to support the 'A' assembler constraint: [ER]AX then [ER]DX.
724720
def GR32_AD : RegisterClass<"X86", [i32], 32, (add EAX, EDX)>;
725721
def GR64_AD : RegisterClass<"X86", [i64], 64, (add RAX, RDX)>;

‎llvm/test/CodeGen/MIR/X86/inline-asm-registers.mir‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ body: |
2828
liveins: $rdi, $rsi
2929
3030
; CHECK-LABEL: name: test
31-
; CHECK: INLINEASM &foo, 0 /* attdialect */, 4784138 /* regdef:GR64 */, def $rsi, 4784138 /* regdef:GR64 */, def dead $rdi,
32-
INLINEASM &foo, 0, 4784138, def $rsi, 4784138, def dead $rdi, 2147549193, killed $rdi, 2147483657, killed $rsi, 12, implicit-def dead early-clobber $eflags
31+
; CHECK: INLINEASM &foo, 0 /* attdialect */, 4390922 /* regdef:GR64 */, def $rsi, 4390922 /* regdef:GR64 */, def dead $rdi,
32+
INLINEASM &foo, 0, 4390922, def $rsi, 4390922, def dead $rdi, 2147549193, killed $rdi, 2147483657, killed $rsi, 12, implicit-def dead early-clobber $eflags
3333
$rax = MOV64rr killed $rsi
3434
RET64 killed $rax
3535
...
@@ -45,8 +45,8 @@ body: |
4545
4646
; Verify that the register ties are preserved.
4747
; CHECK-LABEL: name: test2
48-
; CHECK: INLINEASM &foo, 0 /* attdialect */, 4784138 /* regdef:GR64 */, def $rsi, 4784138 /* regdef:GR64 */, def dead $rdi, 2147549193 /* reguse tiedto:$1 */, killed $rdi(tied-def 5), 2147483657 /* reguse tiedto:$0 */, killed $rsi(tied-def 3), 12 /* clobber */, implicit-def dead early-clobber $eflags
49-
INLINEASM &foo, 0, 4784138, def $rsi, 4784138, def dead $rdi, 2147549193, killed $rdi(tied-def 5), 2147483657, killed $rsi(tied-def 3), 12, implicit-def dead early-clobber $eflags
48+
; CHECK: INLINEASM &foo, 0 /* attdialect */, 4390922 /* regdef:GR64 */, def $rsi, 4390922 /* regdef:GR64 */, def dead $rdi, 2147549193 /* reguse tiedto:$1 */, killed $rdi(tied-def 5), 2147483657 /* reguse tiedto:$0 */, killed $rsi(tied-def 3), 12 /* clobber */, implicit-def dead early-clobber $eflags
49+
INLINEASM &foo, 0, 4390922, def $rsi, 4390922, def dead $rdi, 2147549193, killed $rdi(tied-def 5), 2147483657, killed $rsi(tied-def 3), 12, implicit-def dead early-clobber $eflags
5050
$rax = MOV64rr killed $rsi
5151
RET64 killed $rax
5252
...

‎llvm/test/CodeGen/MIR2Vec/Inputs/reference_x86_vocab_print.txt‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6930,18 +6930,14 @@ Key: PhyReg_VK2PAIR: [ 0.00 0.00 ]
69306930
Key: PhyReg_VK4PAIR: [ 0.00 0.00 ]
69316931
Key: PhyReg_VK8PAIR: [ 0.00 0.00 ]
69326932
Key: PhyReg_VK1PAIR_with_sub_mask_0_in_VK1WM: [ 0.00 0.00 ]
6933-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
69346933
Key: PhyReg_LOW32_ADDR_ACCESS: [ 0.00 0.00 ]
6935-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit: [ 0.00 0.00 ]
69366934
Key: PhyReg_FR32X: [ 0.00 0.00 ]
69376935
Key: PhyReg_GR32: [ 0.50 0.50 ]
69386936
Key: PhyReg_GR32_NOSP: [ 0.00 0.00 ]
6939-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX2: [ 0.00 0.00 ]
69406937
Key: PhyReg_DEBUG_REG: [ 0.00 0.00 ]
69416938
Key: PhyReg_FR32: [ 0.00 0.00 ]
69426939
Key: PhyReg_GR32_NOREX2: [ 0.00 0.00 ]
69436940
Key: PhyReg_GR32_NOREX2_NOSP: [ 0.00 0.00 ]
6944-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX: [ 0.00 0.00 ]
69456941
Key: PhyReg_GR32_NOREX: [ 0.00 0.00 ]
69466942
Key: PhyReg_VK32: [ 0.00 0.00 ]
69476943
Key: PhyReg_GR32_NOREX_NOSP: [ 0.00 0.00 ]
@@ -6958,7 +6954,6 @@ Key: PhyReg_GR32_CB: [ 0.00 0.00 ]
69586954
Key: PhyReg_GR32_DC: [ 0.00 0.00 ]
69596955
Key: PhyReg_GR32_DIBP: [ 0.00 0.00 ]
69606956
Key: PhyReg_GR32_SIDI: [ 0.00 0.00 ]
6961-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_32bit: [ 0.00 0.00 ]
69626957
Key: PhyReg_CCR: [ 0.00 0.00 ]
69636958
Key: PhyReg_DFCCR: [ 0.00 0.00 ]
69646959
Key: PhyReg_GR32_ABCD_and_GR32_BSI: [ 0.00 0.00 ]
@@ -6968,7 +6963,6 @@ Key: PhyReg_GR32_BPSP_and_GR32_DIBP: [ 0.00 0.00 ]
69686963
Key: PhyReg_GR32_BPSP_and_GR32_TC: [ 0.00 0.00 ]
69696964
Key: PhyReg_GR32_BSI_and_GR32_SIDI: [ 0.00 0.00 ]
69706965
Key: PhyReg_GR32_DIBP_and_GR32_SIDI: [ 0.00 0.00 ]
6971-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit_with_sub_32bit: [ 0.00 0.00 ]
69726966
Key: PhyReg_LOW32_ADDR_ACCESS_with_sub_32bit: [ 0.00 0.00 ]
69736967
Key: PhyReg_RFP64: [ 0.00 0.00 ]
69746968
Key: PhyReg_GR64: [ 0.60 0.60 ]
@@ -7007,7 +7001,6 @@ Key: PhyReg_GR64_with_sub_32bit_in_GR32_TC: [ 0.00 0.00 ]
70077001
Key: PhyReg_GR64_with_sub_32bit_in_GR32_ABCD_and_GR32_TC: [ 0.00 0.00 ]
70087002
Key: PhyReg_GR64_AD: [ 0.00 0.00 ]
70097003
Key: PhyReg_GR64_ArgRef: [ 0.00 0.00 ]
7010-
Key: PhyReg_GR64_and_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
70117004
Key: PhyReg_GR64_with_sub_32bit_in_GR32_ArgRef: [ 0.00 0.00 ]
70127005
Key: PhyReg_GR64_with_sub_32bit_in_GR32_BPSP: [ 0.00 0.00 ]
70137006
Key: PhyReg_GR64_with_sub_32bit_in_GR32_BSI: [ 0.00 0.00 ]
@@ -7066,18 +7059,14 @@ Key: VirtReg_VK2PAIR: [ 0.00 0.00 ]
70667059
Key: VirtReg_VK4PAIR: [ 0.00 0.00 ]
70677060
Key: VirtReg_VK8PAIR: [ 0.00 0.00 ]
70687061
Key: VirtReg_VK1PAIR_with_sub_mask_0_in_VK1WM: [ 0.00 0.00 ]
7069-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
70707062
Key: VirtReg_LOW32_ADDR_ACCESS: [ 0.00 0.00 ]
7071-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit: [ 0.00 0.00 ]
70727063
Key: VirtReg_FR32X: [ 0.00 0.00 ]
70737064
Key: VirtReg_GR32: [ 0.80 0.80 ]
70747065
Key: VirtReg_GR32_NOSP: [ 0.00 0.00 ]
7075-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX2: [ 0.00 0.00 ]
70767066
Key: VirtReg_DEBUG_REG: [ 0.00 0.00 ]
70777067
Key: VirtReg_FR32: [ 0.00 0.00 ]
70787068
Key: VirtReg_GR32_NOREX2: [ 0.00 0.00 ]
70797069
Key: VirtReg_GR32_NOREX2_NOSP: [ 0.00 0.00 ]
7080-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX: [ 0.00 0.00 ]
70817070
Key: VirtReg_GR32_NOREX: [ 0.00 0.00 ]
70827071
Key: VirtReg_VK32: [ 0.00 0.00 ]
70837072
Key: VirtReg_GR32_NOREX_NOSP: [ 0.00 0.00 ]
@@ -7094,7 +7083,6 @@ Key: VirtReg_GR32_CB: [ 0.00 0.00 ]
70947083
Key: VirtReg_GR32_DC: [ 0.00 0.00 ]
70957084
Key: VirtReg_GR32_DIBP: [ 0.00 0.00 ]
70967085
Key: VirtReg_GR32_SIDI: [ 0.00 0.00 ]
7097-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_32bit: [ 0.00 0.00 ]
70987086
Key: VirtReg_CCR: [ 0.00 0.00 ]
70997087
Key: VirtReg_DFCCR: [ 0.00 0.00 ]
71007088
Key: VirtReg_GR32_ABCD_and_GR32_BSI: [ 0.00 0.00 ]
@@ -7104,7 +7092,6 @@ Key: VirtReg_GR32_BPSP_and_GR32_DIBP: [ 0.00 0.00 ]
71047092
Key: VirtReg_GR32_BPSP_and_GR32_TC: [ 0.00 0.00 ]
71057093
Key: VirtReg_GR32_BSI_and_GR32_SIDI: [ 0.00 0.00 ]
71067094
Key: VirtReg_GR32_DIBP_and_GR32_SIDI: [ 0.00 0.00 ]
7107-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit_with_sub_32bit: [ 0.00 0.00 ]
71087095
Key: VirtReg_LOW32_ADDR_ACCESS_with_sub_32bit: [ 0.00 0.00 ]
71097096
Key: VirtReg_RFP64: [ 0.00 0.00 ]
71107097
Key: VirtReg_GR64: [ 0.90 0.90 ]
@@ -7143,7 +7130,6 @@ Key: VirtReg_GR64_with_sub_32bit_in_GR32_TC: [ 0.00 0.00 ]
71437130
Key: VirtReg_GR64_with_sub_32bit_in_GR32_ABCD_and_GR32_TC: [ 0.00 0.00 ]
71447131
Key: VirtReg_GR64_AD: [ 0.00 0.00 ]
71457132
Key: VirtReg_GR64_ArgRef: [ 0.00 0.00 ]
7146-
Key: VirtReg_GR64_and_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
71477133
Key: VirtReg_GR64_with_sub_32bit_in_GR32_ArgRef: [ 0.00 0.00 ]
71487134
Key: VirtReg_GR64_with_sub_32bit_in_GR32_BPSP: [ 0.00 0.00 ]
71497135
Key: VirtReg_GR64_with_sub_32bit_in_GR32_BSI: [ 0.00 0.00 ]

‎llvm/test/CodeGen/MIR2Vec/Inputs/reference_x86_vocab_wo=0.5_print.txt‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6930,18 +6930,14 @@ Key: PhyReg_VK2PAIR: [ 0.00 0.00 ]
69306930
Key: PhyReg_VK4PAIR: [ 0.00 0.00 ]
69316931
Key: PhyReg_VK8PAIR: [ 0.00 0.00 ]
69326932
Key: PhyReg_VK1PAIR_with_sub_mask_0_in_VK1WM: [ 0.00 0.00 ]
6933-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
69346933
Key: PhyReg_LOW32_ADDR_ACCESS: [ 0.00 0.00 ]
6935-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit: [ 0.00 0.00 ]
69366934
Key: PhyReg_FR32X: [ 0.00 0.00 ]
69376935
Key: PhyReg_GR32: [ 0.50 0.50 ]
69386936
Key: PhyReg_GR32_NOSP: [ 0.00 0.00 ]
6939-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX2: [ 0.00 0.00 ]
69406937
Key: PhyReg_DEBUG_REG: [ 0.00 0.00 ]
69416938
Key: PhyReg_FR32: [ 0.00 0.00 ]
69426939
Key: PhyReg_GR32_NOREX2: [ 0.00 0.00 ]
69436940
Key: PhyReg_GR32_NOREX2_NOSP: [ 0.00 0.00 ]
6944-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX: [ 0.00 0.00 ]
69456941
Key: PhyReg_GR32_NOREX: [ 0.00 0.00 ]
69466942
Key: PhyReg_VK32: [ 0.00 0.00 ]
69476943
Key: PhyReg_GR32_NOREX_NOSP: [ 0.00 0.00 ]
@@ -6958,7 +6954,6 @@ Key: PhyReg_GR32_CB: [ 0.00 0.00 ]
69586954
Key: PhyReg_GR32_DC: [ 0.00 0.00 ]
69596955
Key: PhyReg_GR32_DIBP: [ 0.00 0.00 ]
69606956
Key: PhyReg_GR32_SIDI: [ 0.00 0.00 ]
6961-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_32bit: [ 0.00 0.00 ]
69626957
Key: PhyReg_CCR: [ 0.00 0.00 ]
69636958
Key: PhyReg_DFCCR: [ 0.00 0.00 ]
69646959
Key: PhyReg_GR32_ABCD_and_GR32_BSI: [ 0.00 0.00 ]
@@ -6968,7 +6963,6 @@ Key: PhyReg_GR32_BPSP_and_GR32_DIBP: [ 0.00 0.00 ]
69686963
Key: PhyReg_GR32_BPSP_and_GR32_TC: [ 0.00 0.00 ]
69696964
Key: PhyReg_GR32_BSI_and_GR32_SIDI: [ 0.00 0.00 ]
69706965
Key: PhyReg_GR32_DIBP_and_GR32_SIDI: [ 0.00 0.00 ]
6971-
Key: PhyReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit_with_sub_32bit: [ 0.00 0.00 ]
69726966
Key: PhyReg_LOW32_ADDR_ACCESS_with_sub_32bit: [ 0.00 0.00 ]
69736967
Key: PhyReg_RFP64: [ 0.00 0.00 ]
69746968
Key: PhyReg_GR64: [ 0.60 0.60 ]
@@ -7007,7 +7001,6 @@ Key: PhyReg_GR64_with_sub_32bit_in_GR32_TC: [ 0.00 0.00 ]
70077001
Key: PhyReg_GR64_with_sub_32bit_in_GR32_ABCD_and_GR32_TC: [ 0.00 0.00 ]
70087002
Key: PhyReg_GR64_AD: [ 0.00 0.00 ]
70097003
Key: PhyReg_GR64_ArgRef: [ 0.00 0.00 ]
7010-
Key: PhyReg_GR64_and_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
70117004
Key: PhyReg_GR64_with_sub_32bit_in_GR32_ArgRef: [ 0.00 0.00 ]
70127005
Key: PhyReg_GR64_with_sub_32bit_in_GR32_BPSP: [ 0.00 0.00 ]
70137006
Key: PhyReg_GR64_with_sub_32bit_in_GR32_BSI: [ 0.00 0.00 ]
@@ -7066,18 +7059,14 @@ Key: VirtReg_VK2PAIR: [ 0.00 0.00 ]
70667059
Key: VirtReg_VK4PAIR: [ 0.00 0.00 ]
70677060
Key: VirtReg_VK8PAIR: [ 0.00 0.00 ]
70687061
Key: VirtReg_VK1PAIR_with_sub_mask_0_in_VK1WM: [ 0.00 0.00 ]
7069-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
70707062
Key: VirtReg_LOW32_ADDR_ACCESS: [ 0.00 0.00 ]
7071-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit: [ 0.00 0.00 ]
70727063
Key: VirtReg_FR32X: [ 0.00 0.00 ]
70737064
Key: VirtReg_GR32: [ 0.80 0.80 ]
70747065
Key: VirtReg_GR32_NOSP: [ 0.00 0.00 ]
7075-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX2: [ 0.00 0.00 ]
70767066
Key: VirtReg_DEBUG_REG: [ 0.00 0.00 ]
70777067
Key: VirtReg_FR32: [ 0.00 0.00 ]
70787068
Key: VirtReg_GR32_NOREX2: [ 0.00 0.00 ]
70797069
Key: VirtReg_GR32_NOREX2_NOSP: [ 0.00 0.00 ]
7080-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_16bit_in_GR16_NOREX: [ 0.00 0.00 ]
70817070
Key: VirtReg_GR32_NOREX: [ 0.00 0.00 ]
70827071
Key: VirtReg_VK32: [ 0.00 0.00 ]
70837072
Key: VirtReg_GR32_NOREX_NOSP: [ 0.00 0.00 ]
@@ -7094,7 +7083,6 @@ Key: VirtReg_GR32_CB: [ 0.00 0.00 ]
70947083
Key: VirtReg_GR32_DC: [ 0.00 0.00 ]
70957084
Key: VirtReg_GR32_DIBP: [ 0.00 0.00 ]
70967085
Key: VirtReg_GR32_SIDI: [ 0.00 0.00 ]
7097-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_32bit: [ 0.00 0.00 ]
70987086
Key: VirtReg_CCR: [ 0.00 0.00 ]
70997087
Key: VirtReg_DFCCR: [ 0.00 0.00 ]
71007088
Key: VirtReg_GR32_ABCD_and_GR32_BSI: [ 0.00 0.00 ]
@@ -7104,7 +7092,6 @@ Key: VirtReg_GR32_BPSP_and_GR32_DIBP: [ 0.00 0.00 ]
71047092
Key: VirtReg_GR32_BPSP_and_GR32_TC: [ 0.00 0.00 ]
71057093
Key: VirtReg_GR32_BSI_and_GR32_SIDI: [ 0.00 0.00 ]
71067094
Key: VirtReg_GR32_DIBP_and_GR32_SIDI: [ 0.00 0.00 ]
7107-
Key: VirtReg_LOW32_ADDR_ACCESS_RBP_with_sub_8bit_with_sub_32bit: [ 0.00 0.00 ]
71087095
Key: VirtReg_LOW32_ADDR_ACCESS_with_sub_32bit: [ 0.00 0.00 ]
71097096
Key: VirtReg_RFP64: [ 0.00 0.00 ]
71107097
Key: VirtReg_GR64: [ 0.90 0.90 ]
@@ -7143,7 +7130,6 @@ Key: VirtReg_GR64_with_sub_32bit_in_GR32_TC: [ 0.00 0.00 ]
71437130
Key: VirtReg_GR64_with_sub_32bit_in_GR32_ABCD_and_GR32_TC: [ 0.00 0.00 ]
71447131
Key: VirtReg_GR64_AD: [ 0.00 0.00 ]
71457132
Key: VirtReg_GR64_ArgRef: [ 0.00 0.00 ]
7146-
Key: VirtReg_GR64_and_LOW32_ADDR_ACCESS_RBP: [ 0.00 0.00 ]
71477133
Key: VirtReg_GR64_with_sub_32bit_in_GR32_ArgRef: [ 0.00 0.00 ]
71487134
Key: VirtReg_GR64_with_sub_32bit_in_GR32_BPSP: [ 0.00 0.00 ]
71497135
Key: VirtReg_GR64_with_sub_32bit_in_GR32_BSI: [ 0.00 0.00 ]

0 commit comments

Comments
 (0)