Skip to content

[GISel] Add more FP opcodes to CSE #123949

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
hanhanW merged 2 commits into from
Jan 23, 2025
Merged

[GISel] Add more FP opcodes to CSE #123949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd8c115
[GISel] Add more FP opcodes to CSE (#123624)
lialan Jan 22, 2025
6df665a
update tests
lialan Jan 23, 2025
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
10 changes: 10 additions & 0 deletions llvm/lib/CodeGen/GlobalISel/CSEInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ bool CSEConfigFull::shouldCSEOpc(unsigned Opc) {
case TargetOpcode::G_BUILD_VECTOR:
case TargetOpcode::G_BUILD_VECTOR_TRUNC:
case TargetOpcode::G_SEXT_INREG:
case TargetOpcode::G_FADD:
case TargetOpcode::G_FSUB:
case TargetOpcode::G_FMUL:
case TargetOpcode::G_FDIV:
case TargetOpcode::G_FABS:
// TODO: support G_FNEG.
case TargetOpcode::G_FMAXNUM:
case TargetOpcode::G_FMINNUM:
case TargetOpcode::G_FMAXNUM_IEEE:
case TargetOpcode::G_FMINNUM_IEEE:
return true;
}
return false;
Expand Down
132 changes: 132 additions & 0 deletions llvm/unittests/CodeGen/GlobalISel/CSETest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,138 @@ TEST_F(AArch64GISelMITest, TestCSE) {
auto MIBUnmerge2 = CSEB.buildUnmerge({s32, s32}, Copies[0]);
EXPECT_TRUE(&*MIBUnmerge == &*MIBUnmerge2);

// Check G_FADD
Copy link
Contributor

@arsenm arsenm Jan 23, 2025

Choose a reason for hiding this comment

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

In a cleanup you could use buildInstr and loop over the opcodes, these are all going to behave the same way

{
auto MIBFAdd = CSEB.buildFAdd(s32, Copies[0], Copies[1]);
auto MIBFAdd2 = CSEB.buildFAdd(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFAdd == &*MIBFAdd2);

auto MIBFAdd3 =
CSEB.buildFAdd(s32, Copies[0], Copies[1], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFAdd == &*MIBFAdd3);

MIBFAdd2->setFlag(MachineInstr::FmNsz);
MIBFAdd2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFAdd == &*MIBFAdd2);
}

// Check G_FSUB
{
auto MIBFSub = CSEB.buildFSub(s32, Copies[0], Copies[1]);
auto MIBFSub2 = CSEB.buildFSub(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFSub == &*MIBFSub2);

auto MIBFSub3 =
CSEB.buildFSub(s32, Copies[0], Copies[1], MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFSub == &*MIBFSub3);

MIBFSub2->setFlag(MachineInstr::FmNoNans);
MIBFSub2->clearFlag(MachineInstr::FmNoNans);
EXPECT_TRUE(&*MIBFSub == &*MIBFSub2);
}

// Check G_FMUL
{
auto MIBFMul = CSEB.buildFMul(s32, Copies[0], Copies[1]);
auto MIBFMul2 = CSEB.buildFMul(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFMul == &*MIBFMul2);

auto MIBFMul3 =
CSEB.buildFMul(s32, Copies[0], Copies[1], MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFMul == &*MIBFMul3);

MIBFMul2->setFlag(MachineInstr::FmNoNans);
MIBFMul2->clearFlag(MachineInstr::FmNoNans);
EXPECT_TRUE(&*MIBFMul == &*MIBFMul2);
}

// Check G_FDIV
{
auto MIBFDiv = CSEB.buildFDiv(s32, Copies[0], Copies[1]);
auto MIBFDiv2 = CSEB.buildFDiv(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFDiv == &*MIBFDiv2);

auto MIBFDiv3 =
CSEB.buildFDiv(s32, Copies[0], Copies[1], MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFDiv == &*MIBFDiv3);

MIBFDiv2->setFlag(MachineInstr::FmNoNans);
MIBFDiv2->clearFlag(MachineInstr::FmNoNans);
EXPECT_TRUE(&*MIBFDiv == &*MIBFDiv2);
}

// Check G_FABS
{
auto MIBFAbs = CSEB.buildFAbs(s32, Copies[0]);
auto MIBFAbs2 = CSEB.buildFAbs(s32, Copies[0]);
EXPECT_TRUE(&*MIBFAbs == &*MIBFAbs2);

auto MIBFAbs3 = CSEB.buildFAbs(s32, Copies[0], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFAbs == &*MIBFAbs3);

MIBFAbs2->setFlag(MachineInstr::FmNsz);
MIBFAbs2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFAbs == &*MIBFAbs2);
}

// Check G_FMINNUM/F_MAXNUM:
{
auto MIBFMinNum = CSEB.buildFMinNum(s32, Copies[0], Copies[1]);
auto MIBFMinNum2 = CSEB.buildFMinNum(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFMinNum == &*MIBFMinNum2);

auto MIBFMinNum3 =
CSEB.buildFMinNum(s32, Copies[0], Copies[1], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMinNum == &*MIBFMinNum3);

MIBFMinNum2->setFlag(MachineInstr::FmNsz);
MIBFMinNum2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFMinNum == &*MIBFMinNum2);
}

{
auto MIBFMaxNum = CSEB.buildFMaxNum(s32, Copies[0], Copies[1]);
auto MIBFMaxNum2 = CSEB.buildFMaxNum(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFMaxNum == &*MIBFMaxNum2);

auto MIBFMaxNum3 =
CSEB.buildFMaxNum(s32, Copies[0], Copies[1], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMaxNum == &*MIBFMaxNum3);

MIBFMaxNum2->setFlag(MachineInstr::FmNsz);
MIBFMaxNum2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFMaxNum == &*MIBFMaxNum2);
}

// Check G_FMINNUM_IEEE/F_MAXNUM_IEEE:
{
auto MIBFMinNumIEEE = CSEB.buildFMinNumIEEE(s32, Copies[0], Copies[1]);
auto MIBFMinNumIEEE2 = CSEB.buildFMinNumIEEE(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFMinNumIEEE == &*MIBFMinNumIEEE2);

auto MIBFMinNumIEEE3 =
CSEB.buildFMinNumIEEE(s32, Copies[0], Copies[1], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMinNumIEEE == &*MIBFMinNumIEEE3);

MIBFMinNumIEEE2->setFlag(MachineInstr::FmNsz);
MIBFMinNumIEEE2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFMinNumIEEE == &*MIBFMinNumIEEE2);
}

{
auto MIBFMaxNumIEEE = CSEB.buildFMaxNumIEEE(s32, Copies[0], Copies[1]);
auto MIBFMaxNumIEEE2 = CSEB.buildFMaxNumIEEE(s32, Copies[0], Copies[1]);
EXPECT_TRUE(&*MIBFMaxNumIEEE == &*MIBFMaxNumIEEE2);

auto MIBFMaxNumIEEE3 =
CSEB.buildFMaxNumIEEE(s32, Copies[0], Copies[1], MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMaxNumIEEE == &*MIBFMaxNumIEEE3);

MIBFMaxNumIEEE2->setFlag(MachineInstr::FmNsz);
MIBFMaxNumIEEE2->clearFlag(MachineInstr::FmNsz);
EXPECT_TRUE(&*MIBFMaxNumIEEE == &*MIBFMaxNumIEEE2);
}

// Check G_BUILD_VECTOR
Register Reg1 = MRI->createGenericVirtualRegister(s32);
Register Reg2 = MRI->createGenericVirtualRegister(s32);
Expand Down
Loading