@@ -264,7 +264,7 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
264
264
MachineInstr &MI = *MBBI;
265
265
unsigned Opcode = MI.getOpcode ();
266
266
const DebugLoc &DL = MBBI->getDebugLoc ();
267
- bool HasEGPR = STI->hasEGPR ();
267
+ # define GET_EGPR_IF_ENABLED ( OPC ) ( STI->hasEGPR () ? OPC##_EVEX : OPC)
268
268
switch (Opcode) {
269
269
default :
270
270
return false ;
@@ -468,12 +468,10 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
468
468
Register Reg1 = TRI->getSubReg (Reg, X86::sub_mask_1);
469
469
470
470
auto MIBLo =
471
- BuildMI (MBB, MBBI, DL,
472
- TII->get (HasEGPR ? X86::KMOVWkm_EVEX : X86::KMOVWkm))
471
+ BuildMI (MBB, MBBI, DL, TII->get (GET_EGPR_IF_ENABLED (X86::KMOVWkm)))
473
472
.addReg (Reg0, RegState::Define | getDeadRegState (DstIsDead));
474
473
auto MIBHi =
475
- BuildMI (MBB, MBBI, DL,
476
- TII->get (HasEGPR ? X86::KMOVWkm_EVEX : X86::KMOVWkm))
474
+ BuildMI (MBB, MBBI, DL, TII->get (GET_EGPR_IF_ENABLED (X86::KMOVWkm)))
477
475
.addReg (Reg1, RegState::Define | getDeadRegState (DstIsDead));
478
476
479
477
for (int i = 0 ; i < X86::AddrNumOperands; ++i) {
@@ -505,10 +503,10 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
505
503
Register Reg0 = TRI->getSubReg (Reg, X86::sub_mask_0);
506
504
Register Reg1 = TRI->getSubReg (Reg, X86::sub_mask_1);
507
505
508
- auto MIBLo = BuildMI (MBB, MBBI, DL,
509
- TII->get (HasEGPR ? X86::KMOVWmk_EVEX : X86:: KMOVWmk));
510
- auto MIBHi = BuildMI (MBB, MBBI, DL,
511
- TII->get (HasEGPR ? X86::KMOVWmk_EVEX : X86:: KMOVWmk));
506
+ auto MIBLo =
507
+ BuildMI (MBB, MBBI, DL, TII->get (GET_EGPR_IF_ENABLED ( X86::KMOVWmk) ));
508
+ auto MIBHi =
509
+ BuildMI (MBB, MBBI, DL, TII->get (GET_EGPR_IF_ENABLED ( X86::KMOVWmk) ));
512
510
513
511
for (int i = 0 ; i < X86::AddrNumOperands; ++i) {
514
512
MIBLo.add (MBBI->getOperand (i));
@@ -556,7 +554,6 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
556
554
case TargetOpcode::ICALL_BRANCH_FUNNEL:
557
555
ExpandICallBranchFunnel (&MBB, MBBI);
558
556
return true ;
559
- #define GET_EGPR_IF_ENABLED (OPC ) (STI->hasEGPR () ? OPC##_EVEX : OPC)
560
557
case X86::PLDTILECFGV: {
561
558
MI.setDesc (TII->get (GET_EGPR_IF_ENABLED (X86::LDTILECFG)));
562
559
return true ;
0 commit comments