Skip to content

Commit 72b1153

Browse files
author
Thorsten Schütt
authored
[GlobalISel] Import samesign flag (#113090)
Credits: #111419
1 parent 475e736 commit 72b1153

File tree

12 files changed

+144
-11
lines changed

12 files changed

+144
-11
lines changed

llvm/include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace llvm {
2828
class GenericMachineInstr : public MachineInstr {
2929
constexpr static unsigned PoisonFlags = NoUWrap | NoSWrap | NoUSWrap |
3030
IsExact | Disjoint | NonNeg |
31-
FmNoNans | FmNoInfs;
31+
FmNoNans | FmNoInfs | SameSign;
3232

3333
public:
3434
GenericMachineInstr() = delete;

llvm/include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,8 @@ class MachineIRBuilder {
12661266
///
12671267
/// \return a MachineInstrBuilder for the newly created instruction.
12681268
MachineInstrBuilder buildICmp(CmpInst::Predicate Pred, const DstOp &Res,
1269-
const SrcOp &Op0, const SrcOp &Op1);
1269+
const SrcOp &Op0, const SrcOp &Op1,
1270+
std::optional<unsigned> Flags = std::nullopt);
12701271

12711272
/// Build and insert a \p Res = G_FCMP \p Pred\p Op0, \p Op1
12721273
///

llvm/include/llvm/CodeGen/MachineInstr.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ class MachineInstr
119119
Disjoint = 1 << 19, // Each bit is zero in at least one of the inputs.
120120
NoUSWrap = 1 << 20, // Instruction supports geps
121121
// no unsigned signed wrap.
122+
SameSign = 1 << 21 // Both operands have the same sign.
122123
};
123124

124125
private:

llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,20 +340,17 @@ bool IRTranslator::translateCompare(const User &U,
340340
Register Op1 = getOrCreateVReg(*U.getOperand(1));
341341
Register Res = getOrCreateVReg(U);
342342
CmpInst::Predicate Pred = CI->getPredicate();
343+
uint32_t Flags = MachineInstr::copyFlagsFromInstruction(*CI);
343344
if (CmpInst::isIntPredicate(Pred))
344-
MIRBuilder.buildICmp(Pred, Res, Op0, Op1);
345+
MIRBuilder.buildICmp(Pred, Res, Op0, Op1, Flags);
345346
else if (Pred == CmpInst::FCMP_FALSE)
346347
MIRBuilder.buildCopy(
347348
Res, getOrCreateVReg(*Constant::getNullValue(U.getType())));
348349
else if (Pred == CmpInst::FCMP_TRUE)
349350
MIRBuilder.buildCopy(
350351
Res, getOrCreateVReg(*Constant::getAllOnesValue(U.getType())));
351-
else {
352-
uint32_t Flags = 0;
353-
if (CI)
354-
Flags = MachineInstr::copyFlagsFromInstruction(*CI);
352+
else
355353
MIRBuilder.buildFCmp(Pred, Res, Op0, Op1, Flags);
356-
}
357354

358355
return true;
359356
}

llvm/lib/CodeGen/GlobalISel/MachineIRBuilder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -898,8 +898,9 @@ MachineIRBuilder::buildFPTrunc(const DstOp &Res, const SrcOp &Op,
898898
MachineInstrBuilder MachineIRBuilder::buildICmp(CmpInst::Predicate Pred,
899899
const DstOp &Res,
900900
const SrcOp &Op0,
901-
const SrcOp &Op1) {
902-
return buildInstr(TargetOpcode::G_ICMP, Res, {Pred, Op0, Op1});
901+
const SrcOp &Op1,
902+
std::optional<unsigned> Flags) {
903+
return buildInstr(TargetOpcode::G_ICMP, Res, {Pred, Op0, Op1}, Flags);
903904
}
904905

905906
MachineInstrBuilder MachineIRBuilder::buildFCmp(CmpInst::Predicate Pred,

llvm/lib/CodeGen/MIRParser/MILexer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ static MIToken::TokenKind getIdentifierKind(StringRef Identifier) {
216216
.Case("exact", MIToken::kw_exact)
217217
.Case("nneg", MIToken::kw_nneg)
218218
.Case("disjoint", MIToken::kw_disjoint)
219+
.Case("samesign", MIToken::kw_samesign)
219220
.Case("nofpexcept", MIToken::kw_nofpexcept)
220221
.Case("unpredictable", MIToken::kw_unpredictable)
221222
.Case("debug-location", MIToken::kw_debug_location)

llvm/lib/CodeGen/MIRParser/MILexer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ struct MIToken {
7777
kw_unpredictable,
7878
kw_nneg,
7979
kw_disjoint,
80+
kw_samesign,
8081
kw_debug_location,
8182
kw_debug_instr_number,
8283
kw_dbg_instr_ref,

llvm/lib/CodeGen/MIRParser/MIParser.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,8 @@ bool MIParser::parseInstruction(unsigned &OpCode, unsigned &Flags) {
14761476
Token.is(MIToken::kw_noconvergent) ||
14771477
Token.is(MIToken::kw_unpredictable) ||
14781478
Token.is(MIToken::kw_nneg) ||
1479-
Token.is(MIToken::kw_disjoint)) {
1479+
Token.is(MIToken::kw_disjoint) ||
1480+
Token.is(MIToken::kw_samesign)) {
14801481
// clang-format on
14811482
// Mine frame and fast math flags
14821483
if (Token.is(MIToken::kw_frame_setup))
@@ -1513,6 +1514,8 @@ bool MIParser::parseInstruction(unsigned &OpCode, unsigned &Flags) {
15131514
Flags |= MachineInstr::NonNeg;
15141515
if (Token.is(MIToken::kw_disjoint))
15151516
Flags |= MachineInstr::Disjoint;
1517+
if (Token.is(MIToken::kw_samesign))
1518+
Flags |= MachineInstr::SameSign;
15161519

15171520
lex();
15181521
}

llvm/lib/CodeGen/MIRPrinter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,8 @@ void MIPrinter::print(const MachineInstr &MI) {
837837
OS << "disjoint ";
838838
if (MI.getFlag(MachineInstr::NoUSWrap))
839839
OS << "nusw ";
840+
if (MI.getFlag(MachineInstr::SameSign))
841+
OS << "samesign ";
840842

841843
OS << TII->getName(MI.getOpcode());
842844
if (I < E)

llvm/lib/CodeGen/MachineInstr.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,11 @@ uint32_t MachineInstr::copyFlagsFromInstruction(const Instruction &I) {
596596
MIFlags |= MachineInstr::MIFlag::Disjoint;
597597
}
598598

599+
// Copy the samesign flag.
600+
if (const ICmpInst *ICmp = dyn_cast<ICmpInst>(&I))
601+
if (ICmp->hasSameSign())
602+
MIFlags |= MachineInstr::MIFlag::SameSign;
603+
599604
// Copy the exact flag.
600605
if (const PossiblyExactOperator *PE = dyn_cast<PossiblyExactOperator>(&I))
601606
if (PE->isExact())
@@ -1770,6 +1775,8 @@ void MachineInstr::print(raw_ostream &OS, ModuleSlotTracker &MST,
17701775
OS << "nneg ";
17711776
if (getFlag(MachineInstr::Disjoint))
17721777
OS << "disjoint ";
1778+
if (getFlag(MachineInstr::SameSign))
1779+
OS << "samesign ";
17731780

17741781
// Print the opcode name.
17751782
if (TII)

0 commit comments

Comments
 (0)