Skip to content

[X86] Early exit MIR AMX passes when AMX is unused #94989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2024
+20 −15
Merged

[X86] Early exit MIR AMX passes when AMX is unused #94989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions llvm/lib/Target/X86/X86FastPreTileConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,28 +653,20 @@ bool X86FastPreTileConfig::configBasicBlock(MachineBasicBlock &MBB) {
}

bool X86FastPreTileConfig::runOnMachineFunction(MachineFunction &MFunc) {
X86FI = MFunc.getInfo<X86MachineFunctionInfo>();
// Early exit in the common case of non-AMX code.
if (X86FI->getAMXProgModel() != AMXProgModelEnum::ManagedRA)
return false;

MF = &MFunc;
MRI = &MFunc.getRegInfo();
ST = &MFunc.getSubtarget<X86Subtarget>();
TII = ST->getInstrInfo();
X86FI = MFunc.getInfo<X86MachineFunctionInfo>();
MFI = &MFunc.getFrameInfo();
TRI = ST->getRegisterInfo();
CfgSS = -1;

unsigned NumVirtRegs = MRI->getNumVirtRegs();
// Abandon early if there is no tile register to config.
bool HasVirtTileReg = false;
for (unsigned I = 0, E = NumVirtRegs; I != E; ++I) {
Register VirtReg = Register::index2VirtReg(I);
if (!MRI->reg_nodbg_empty(VirtReg) &&
MRI->getRegClass(VirtReg)->getID() == X86::TILERegClassID) {
HasVirtTileReg = true;
break;
}
}
if (!HasVirtTileReg)
return false;

StackSlotForVirtReg.resize(NumVirtRegs);
MayLiveAcrossBlocks.clear();
Expand Down
6 changes: 5 additions & 1 deletion llvm/lib/Target/X86/X86FastTileConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,16 @@ bool X86FastTileConfig::configBasicBlock(MachineBasicBlock &MBB) {
}

bool X86FastTileConfig::runOnMachineFunction(MachineFunction &MFunc) {
X86FI = MFunc.getInfo<X86MachineFunctionInfo>();
// Early exit in the common case of non-AMX code.
if (X86FI->getAMXProgModel() != AMXProgModelEnum::ManagedRA)
return false;

MF = &MFunc;
MRI = &MFunc.getRegInfo();
const TargetSubtargetInfo *ST = &MFunc.getSubtarget<X86Subtarget>();
TRI = ST->getRegisterInfo();
TII = MFunc.getSubtarget().getInstrInfo();
X86FI = MFunc.getInfo<X86MachineFunctionInfo>();
bool Change = false;

// Loop over all of the basic blocks, eliminating virtual register references
Expand Down
6 changes: 5 additions & 1 deletion llvm/lib/Target/X86/X86PreTileConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,15 @@ void X86PreTileConfig::collectShapeInfo(MachineInstr &MI) {
}

bool X86PreTileConfig::runOnMachineFunction(MachineFunction &MF) {
X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
Copy link
Contributor

@phoebewang phoebewang Jun 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just found we have set/hasVirtualTileReg interfaces. We can remove it and replace with X86FI->getAMXProgModel() == AMXProgModelEnum::ManagedRA too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, opened #95105.

// Early exit in the common case of non-AMX code.
if (X86FI->getAMXProgModel() != AMXProgModelEnum::ManagedRA)
return false;

const X86Subtarget &ST = MF.getSubtarget<X86Subtarget>();
const TargetInstrInfo *TII = ST.getInstrInfo();
const TargetRegisterInfo *TRI = ST.getRegisterInfo();
const TargetRegisterClass *RC = TRI->getRegClass(X86::TILERegClassID);
X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();

BitVector AMXRegs(TRI->getNumRegs());
for (unsigned I = 0; I < RC->getNumRegs(); I++)
Expand Down
5 changes: 5 additions & 0 deletions llvm/lib/Target/X86/X86TileConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ INITIALIZE_PASS_END(X86TileConfig, DEBUG_TYPE, "Tile Register Configure", false,
false)

bool X86TileConfig::runOnMachineFunction(MachineFunction &MF) {
X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
// Early exit in the common case of non-AMX code.
if (X86FI->getAMXProgModel() != AMXProgModelEnum::ManagedRA)
return false;

const X86Subtarget &ST = MF.getSubtarget<X86Subtarget>();
const TargetRegisterInfo *TRI = ST.getRegisterInfo();
const TargetInstrInfo *TII = ST.getInstrInfo();
Expand Down