Skip to content

Commit f823e74

Browse files
committed
[GIsel][AArch64] Add missing RegOperand to LeafOperand name changes
1 parent eea6251 commit f823e74

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

llvm/include/llvm/CodeGen/GlobalISel/GIMatchTableExecutor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ enum {
161161
/// - Pred(2) - The predicate to test
162162
GIM_CheckImmOperandPredicate,
163163

164-
/// Check a register predicate on the specified instruction.
164+
/// Check a leaf predicate on the specified instruction.
165165
/// - InsnID(ULEB128) - Instruction ID
166166
/// - OpIdx(ULEB128) - Operand index
167167
/// - Pred(2) - The predicate to test
168-
GIM_CheckRegOperandPredicate,
168+
GIM_CheckLeafOperandPredicate,
169169

170170
/// Check a memory operation has the specified atomic ordering.
171171
/// - InsnID(ULEB128) - Instruction ID

llvm/include/llvm/CodeGen/GlobalISel/GIMatchTableExecutorImpl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,13 +410,13 @@ bool GIMatchTableExecutor::executeMatchTable(
410410
return false;
411411
break;
412412
}
413-
case GIM_CheckRegOperandPredicate: {
413+
case GIM_CheckLeafOperandPredicate: {
414414
uint64_t InsnID = readULEB();
415415
uint64_t OpIdx = readULEB();
416416
uint16_t Predicate = readU16();
417417
DEBUG_WITH_TYPE(TgtExecutor::getName(),
418418
dbgs()
419-
<< CurrentIdx << ": GIM_CheckRegOperandPredicate(MIs["
419+
<< CurrentIdx << ": GIM_CheckLeafOperandPredicate(MIs["
420420
<< InsnID << "]->getOperand(" << OpIdx
421421
<< "), Predicate=" << Predicate << ")\n");
422422
assert(State.MIs[InsnID] != nullptr && "Used insn before defined");

llvm/test/TableGen/GlobalISelEmitter/GlobalISelEmitter.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,10 @@ def MULADD : I<(outs GPR32:$dst), (ins GPR32:$src1, GPR32:$src2, GPR32:$src3),
867867
// NOOPT-NEXT: /* 897 */ GIM_RootCheckRegBankForClass, /*Op*/0, /*RC*/GIMT_Encode2(MyTarget::GPR32RegClassID),
868868
// NOOPT-NEXT: /* 901 */ // MIs[0] src1
869869
// NOOPT-NEXT: /* 901 */ GIM_RootCheckType, /*Op*/1, /*Type*/GILLT_s32,
870-
// NOOPT-NEXT: /* 904 */ GIM_CheckRegOperandPredicate, /*MI*/0, /*MO*/1, /*Predicate*/GIMT_Encode2(GICXXPred_MO_Predicate_leaf),
870+
// NOOPT-NEXT: /* 904 */ GIM_CheckLeafOperandPredicate, /*MI*/0, /*MO*/1, /*Predicate*/GIMT_Encode2(GICXXPred_MO_Predicate_leaf),
871871
// NOOPT-NEXT: /* 909 */ // MIs[0] src2
872872
// NOOPT-NEXT: /* 909 */ GIM_RootCheckType, /*Op*/2, /*Type*/GILLT_s32,
873-
// NOOPT-NEXT: /* 912 */ GIM_CheckRegOperandPredicate, /*MI*/0, /*MO*/2, /*Predicate*/GIMT_Encode2(GICXXPred_MO_Predicate_leaf),
873+
// NOOPT-NEXT: /* 912 */ GIM_CheckLeafOperandPredicate, /*MI*/0, /*MO*/2, /*Predicate*/GIMT_Encode2(GICXXPred_MO_Predicate_leaf),
874874
// NOOPT-NEXT: /* 917 */ // (sub:{ *:[i32] } GPR32:{ *:[i32] }<<P:Predicate_leaf>>:$src1, GPR32:{ *:[i32] }<<P:Predicate_leaf>>:$src2) => (INSN5:{ *:[i32] } GPR32:{ *:[i32] }:$src1, GPR32:{ *:[i32] }:$src2)
875875
// NOOPT-NEXT: /* 917 */ GIR_MutateOpcode, /*InsnID*/0, /*RecycleInsnID*/0, /*Opcode*/GIMT_Encode2(MyTarget::INSN5),
876876
// NOOPT-NEXT: /* 922 */ GIR_RootConstrainSelectedInstOperands,

llvm/utils/TableGen/Common/GlobalISel/GlobalISelMatchTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ void OperandImmPredicateMatcher::emitPredicateOpcodes(MatchTable &Table,
13331333

13341334
void OperandLeafPredicateMatcher::emitPredicateOpcodes(
13351335
MatchTable &Table, RuleMatcher &Rule) const {
1336-
Table << MatchTable::Opcode("GIM_CheckRegOperandPredicate")
1336+
Table << MatchTable::Opcode("GIM_CheckLeafOperandPredicate")
13371337
<< MatchTable::Comment("MI") << MatchTable::ULEB128Value(InsnVarID)
13381338
<< MatchTable::Comment("MO") << MatchTable::ULEB128Value(OpIdx)
13391339
<< MatchTable::Comment("Predicate")

0 commit comments

Comments
 (0)