Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/lib/Target/ARM/ARMLowOverheadLoops.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ static bool producesFalseLanesZero(MachineInstr &MI,
continue;
// Skip the lr predicate reg
int PIdx = llvm::findFirstVPTPredOperandIdx(MI);
if (PIdx != -1 && (int)MO.getOperandNo() == PIdx + 2)
if (PIdx != -1 && MO.getOperandNo() == PIdx + ARM::SUBOP_vpred_n_tp_reg)
continue;

// Check that this instruction will produce zeros in its false lanes:
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/ARM/MVETPAndVPTOptimisationsPass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ bool MVETPAndVPTOptimisations::ConvertTailPredLoop(MachineLoop *ML,
Register LR = LoopPhi->getOperand(0).getReg();
for (MachineInstr *MI : MVEInstrs) {
int Idx = findFirstVPTPredOperandIdx(*MI);
MI->getOperand(Idx + 2).setReg(LR);
MI->getOperand(Idx + ARM::SUBOP_vpred_n_tp_reg).setReg(LR);
}
}

Expand Down
17 changes: 17 additions & 0 deletions llvm/utils/TableGen/InstrInfoEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "llvm/Support/Format.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TableGen/CodeGenHelpers.h"
#include "llvm/TableGen/Error.h"
#include "llvm/TableGen/Record.h"
#include "llvm/TableGen/TGTimer.h"
Expand Down Expand Up @@ -1135,6 +1136,22 @@ void InstrInfoEmitter::run(raw_ostream &OS) {

OS << "\n};\n} // end namespace llvm\n";

{
NamespaceEmitter LlvmNS(OS, "llvm");
NamespaceEmitter TargetNS(OS, Target.getInstNamespace());
for (const Record *R : Records.getAllDerivedDefinitions("Operand")) {
if (R->isAnonymous())
continue;
if (const DagInit *D = R->getValueAsDag("MIOperandInfo")) {
for (unsigned i = 0, e = D->getNumArgs(); i < e; ++i) {
if (const StringInit *Name = D->getArgName(i))
OS << "constexpr unsigned SUBOP_" << R->getName() << "_"
<< Name->getValue() << " = " << i << ";\n";
}
}
}
}

OS << "#endif // GET_INSTRINFO_HEADER\n\n";

OS << "#ifdef GET_INSTRINFO_HELPER_DECLS\n";
Expand Down
Loading