shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[X86][NFC] Remove dead code for "_REV" instructions"

Browse Source 
This reverts commit 85f3d81fabb9381ce5bc0112d029a7c684b01006.

Affects BOLT macro-fusion and not NFC.
This commit is contained in:
Amir Ayupov 2024-01-09 17:14:55 -08:00
parent 46944210eb
commit ea3c7b3397
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
View File

@ -148,21 +148,25 @@ classifyFirstOpcodeInMacroFusion(unsigned Opcode) {
case X86::AND16ri8: case X86::AND16ri8:
case X86::AND16rm: case X86::AND16rm:
case X86::AND16rr: case X86::AND16rr:
case X86::AND16rr_REV:
case X86::AND32i32: case X86::AND32i32:
case X86::AND32ri: case X86::AND32ri:
case X86::AND32ri8: case X86::AND32ri8:
case X86::AND32rm: case X86::AND32rm:
case X86::AND32rr: case X86::AND32rr:
case X86::AND32rr_REV:
case X86::AND64i32: case X86::AND64i32:
case X86::AND64ri32: case X86::AND64ri32:
case X86::AND64ri8: case X86::AND64ri8:
case X86::AND64rm: case X86::AND64rm:
case X86::AND64rr: case X86::AND64rr:
case X86::AND64rr_REV:
case X86::AND8i8: case X86::AND8i8:
case X86::AND8ri: case X86::AND8ri:
case X86::AND8ri8: case X86::AND8ri8:
case X86::AND8rm: case X86::AND8rm:
case X86::AND8rr: case X86::AND8rr:
case X86::AND8rr_REV:
return FirstMacroFusionInstKind::And; return FirstMacroFusionInstKind::And;
// CMP // CMP
case X86::CMP16i16: case X86::CMP16i16:
@ -171,24 +175,28 @@ classifyFirstOpcodeInMacroFusion(unsigned Opcode) {
case X86::CMP16ri8: case X86::CMP16ri8:
case X86::CMP16rm: case X86::CMP16rm:
case X86::CMP16rr: case X86::CMP16rr:
case X86::CMP16rr_REV:
case X86::CMP32i32: case X86::CMP32i32:
case X86::CMP32mr: case X86::CMP32mr:
case X86::CMP32ri: case X86::CMP32ri:
case X86::CMP32ri8: case X86::CMP32ri8:
case X86::CMP32rm: case X86::CMP32rm:
case X86::CMP32rr: case X86::CMP32rr:
case X86::CMP32rr_REV:
case X86::CMP64i32: case X86::CMP64i32:
case X86::CMP64mr: case X86::CMP64mr:
case X86::CMP64ri32: case X86::CMP64ri32:
case X86::CMP64ri8: case X86::CMP64ri8:
case X86::CMP64rm: case X86::CMP64rm:
case X86::CMP64rr: case X86::CMP64rr:
case X86::CMP64rr_REV:
case X86::CMP8i8: case X86::CMP8i8:
case X86::CMP8mr: case X86::CMP8mr:
case X86::CMP8ri: case X86::CMP8ri:
case X86::CMP8ri8: case X86::CMP8ri8:
case X86::CMP8rm: case X86::CMP8rm:
case X86::CMP8rr: case X86::CMP8rr:
case X86::CMP8rr_REV:
return FirstMacroFusionInstKind::Cmp; return FirstMacroFusionInstKind::Cmp;
// ADD // ADD
case X86::ADD16i16: case X86::ADD16i16:
@ -196,42 +204,50 @@ classifyFirstOpcodeInMacroFusion(unsigned Opcode) {
case X86::ADD16ri8: case X86::ADD16ri8:
case X86::ADD16rm: case X86::ADD16rm:
case X86::ADD16rr: case X86::ADD16rr:
case X86::ADD16rr_REV:
case X86::ADD32i32: case X86::ADD32i32:
case X86::ADD32ri: case X86::ADD32ri:
case X86::ADD32ri8: case X86::ADD32ri8:
case X86::ADD32rm: case X86::ADD32rm:
case X86::ADD32rr: case X86::ADD32rr:
case X86::ADD32rr_REV:
case X86::ADD64i32: case X86::ADD64i32:
case X86::ADD64ri32: case X86::ADD64ri32:
case X86::ADD64ri8: case X86::ADD64ri8:
case X86::ADD64rm: case X86::ADD64rm:
case X86::ADD64rr: case X86::ADD64rr:
case X86::ADD64rr_REV:
case X86::ADD8i8: case X86::ADD8i8:
case X86::ADD8ri: case X86::ADD8ri:
case X86::ADD8ri8: case X86::ADD8ri8:
case X86::ADD8rm: case X86::ADD8rm:
case X86::ADD8rr: case X86::ADD8rr:
case X86::ADD8rr_REV:
// SUB // SUB
case X86::SUB16i16: case X86::SUB16i16:
case X86::SUB16ri: case X86::SUB16ri:
case X86::SUB16ri8: case X86::SUB16ri8:
case X86::SUB16rm: case X86::SUB16rm:
case X86::SUB16rr: case X86::SUB16rr:
case X86::SUB16rr_REV:
case X86::SUB32i32: case X86::SUB32i32:
case X86::SUB32ri: case X86::SUB32ri:
case X86::SUB32ri8: case X86::SUB32ri8:
case X86::SUB32rm: case X86::SUB32rm:
case X86::SUB32rr: case X86::SUB32rr:
case X86::SUB32rr_REV:
case X86::SUB64i32: case X86::SUB64i32:
case X86::SUB64ri32: case X86::SUB64ri32:
case X86::SUB64ri8: case X86::SUB64ri8:
case X86::SUB64rm: case X86::SUB64rm:
case X86::SUB64rr: case X86::SUB64rr:
case X86::SUB64rr_REV:
case X86::SUB8i8: case X86::SUB8i8:
case X86::SUB8ri: case X86::SUB8ri:
case X86::SUB8ri8: case X86::SUB8ri8:
case X86::SUB8rm: case X86::SUB8rm:
case X86::SUB8rr: case X86::SUB8rr:
case X86::SUB8rr_REV:
return FirstMacroFusionInstKind::AddSub; return FirstMacroFusionInstKind::AddSub;
// INC // INC
case X86::INC16r: case X86::INC16r:

1
llvm/lib/Target/X86/X86FlagsCopyLowering.cpp
View File

@ -173,6 +173,7 @@ static FlagArithMnemonic getMnemonicFromOpcode(unsigned Opcode) {
#define LLVM_EXPAND_ADC_SBB_INSTR(MNEMONIC) \ #define LLVM_EXPAND_ADC_SBB_INSTR(MNEMONIC) \
LLVM_EXPAND_INSTR_SIZES(MNEMONIC, rr) \ LLVM_EXPAND_INSTR_SIZES(MNEMONIC, rr) \
LLVM_EXPAND_INSTR_SIZES(MNEMONIC, rr_REV) \
LLVM_EXPAND_INSTR_SIZES(MNEMONIC, rm) \ LLVM_EXPAND_INSTR_SIZES(MNEMONIC, rm) \
LLVM_EXPAND_INSTR_SIZES(MNEMONIC, mr) \ LLVM_EXPAND_INSTR_SIZES(MNEMONIC, mr) \
case X86::MNEMONIC##8ri: \ case X86::MNEMONIC##8ri: \