Skip to content

Revert "[GISel] Add more FP opcodes to CSE (#123624)" #123954

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
Jan 22, 2025
Merged

Revert "[GISel] Add more FP opcodes to CSE (#123624)" #123954

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
11 changes: 0 additions & 11 deletions llvm/lib/CodeGen/GlobalISel/CSEInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/CodeGen/TargetOpcodes.h"
#include "llvm/InitializePasses.h"
#include "llvm/Support/Error.h"

Expand Down Expand Up @@ -66,16 +65,6 @@ 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
115 changes: 0 additions & 115 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,121 +75,6 @@ TEST_F(AArch64GISelMITest, TestCSE) {
auto MIBUnmerge2 = CSEB.buildUnmerge({s32, s32}, Copies[0]);
EXPECT_TRUE(&*MIBUnmerge == &*MIBUnmerge2);

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

MIBFAdd2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFAdd == &*MIBFAdd2);

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);

MIBFSub2.setFlag(MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFSub == &*MIBFSub2);

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);

MIBFMul2.setFlag(MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFMul == &*MIBFMul2);

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);

MIBFDiv2.setFlag(MachineInstr::FmNoNans);
EXPECT_FALSE(&*MIBFDiv == &*MIBFDiv2);

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);

MIBFAbs2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFAbs == &*MIBFAbs2);

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);

MIBFMinNum2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMinNum == &*MIBFMinNum2);

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);

MIBFMaxNum2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMaxNum == &*MIBFMaxNum2);

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);

MIBFMinNumIEEE2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMinNumIEEE == &*MIBFMinNumIEEE2);

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);

MIBFMaxNumIEEE2.setFlag(MachineInstr::FmNsz);
EXPECT_FALSE(&*MIBFMaxNumIEEE == &*MIBFMaxNumIEEE2);

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