From e810157dc69c6f1bda9a99532c06fd3b1720d1ae Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Fri, 11 Apr 2025 19:22:08 -0700 Subject: [PATCH] [TableGen] More accurately calculate where the source variable ops start in PseudoLoweringEmitter::emitLoweringEmitter. The code was using the number or source operands plus one. The plus one seems to be an ARM specific value accounting for one of the source operands having 2 sub operands. No other target in tree uses PseudLowering with variadic instructions so this worked. This patch replaces it with a proper count of the number of sub operands of all operands. While there I update the loop to use MIOperandNo so we don't need to count up the sub operands as we go. --- llvm/utils/TableGen/PseudoLoweringEmitter.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/llvm/utils/TableGen/PseudoLoweringEmitter.cpp b/llvm/utils/TableGen/PseudoLoweringEmitter.cpp index 6d39d1496c09e..2c8f2f08f0536 100644 --- a/llvm/utils/TableGen/PseudoLoweringEmitter.cpp +++ b/llvm/utils/TableGen/PseudoLoweringEmitter.cpp @@ -247,9 +247,9 @@ void PseudoLoweringEmitter::emitLoweringEmitter(raw_ostream &o) { // FIXME: Instruction operands with defaults values (predicates and cc_out // in ARM, for example shouldn't need explicit values in the // expansion DAG. - unsigned MIOpNo = 0; for (const auto &DestOperand : Dest.Operands) { o << " // Operand: " << DestOperand.Name << "\n"; + unsigned MIOpNo = DestOperand.MIOperandNo; for (unsigned i = 0, e = DestOperand.MINumOperands; i != e; ++i) { switch (Expansion.OperandMap[MIOpNo + i].Kind) { case OpData::Operand: @@ -277,12 +277,13 @@ void PseudoLoweringEmitter::emitLoweringEmitter(raw_ostream &o) { } } } - MIOpNo += DestOperand.MINumOperands; } if (Dest.Operands.isVariadic) { - MIOpNo = Source.Operands.size() + 1; + unsigned LastOpNo = 0; + for (const auto &Op : Source.Operands) + LastOpNo += Op.MINumOperands; o << " // variable_ops\n"; - o << " for (unsigned i = " << MIOpNo + o << " for (unsigned i = " << LastOpNo << ", e = MI->getNumOperands(); i != e; ++i)\n" << " if (lowerOperand(MI->getOperand(i), MCOp))\n" << " Inst.addOperand(MCOp);\n";