Precompute InstAlias operand mapping to result instruction operand indices.
There should be no functional change from this, but I think it's simpler this
way.
llvm-svn: 123931
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index be1cd70..78840fe 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -1213,7 +1213,7 @@
CGA.ResultOperands[i].getName() == OperandName) {
// It's safe to go with the first one we find, because CodeGenInstAlias
// validates that all operands with the same name have the same record.
- unsigned ResultIdx =CGA.getResultInstOperandIndexForResultOperandIndex(i);
+ unsigned ResultIdx = CGA.ResultInstOperandIndex[i];
Op.Class = getOperandClass(CGA.ResultInst->Operands[ResultIdx]);
Op.SrcOpName = OperandName;
return;
diff --git a/llvm/utils/TableGen/CodeGenInstruction.cpp b/llvm/utils/TableGen/CodeGenInstruction.cpp
index 08005fb..6b1fc6e 100644
--- a/llvm/utils/TableGen/CodeGenInstruction.cpp
+++ b/llvm/utils/TableGen/CodeGenInstruction.cpp
@@ -439,6 +439,7 @@
// Now that it is validated, add it.
ResultOperands.push_back(ResultOperand(ADI->getDef()));
+ ResultInstOperandIndex.push_back(i);
++AliasOpNo;
continue;
}
@@ -454,6 +455,7 @@
// Now that it is validated, add it.
ResultOperands.push_back(ResultOperand(static_cast<Record*>(0)));
+ ResultInstOperandIndex.push_back(i);
++AliasOpNo;
continue;
}
@@ -485,6 +487,7 @@
// Now that it is validated, add it.
ResultOperands.push_back(ResultOperand(Result->getArgName(AliasOpNo),
ADI->getDef()));
+ ResultInstOperandIndex.push_back(i);
++AliasOpNo;
continue;
}
@@ -500,6 +503,7 @@
ResultOpRec->getName() +
" for integer result operand!");
ResultOperands.push_back(ResultOperand(II->getValue()));
+ ResultInstOperandIndex.push_back(i);
++AliasOpNo;
continue;
}
@@ -513,21 +517,3 @@
" instruction expects " + utostr(ResultInst->Operands.size())+
" operands!");
}
-
-/// getResultInstOperandIndexForResultOperandIndex - Given an index into the
-/// ResultOperands array, translate it to a valid index in ResultInst's
-/// operand list.
-unsigned CodeGenInstAlias::
-getResultInstOperandIndexForResultOperandIndex(unsigned OpNo) const {
- unsigned OpIdx = 0;
-
- for (unsigned i = 0;; ++i) {
- assert(i != ResultInst->Operands.size() && "Didn't find entry");
- if (ResultInst->Operands[i].getTiedRegister() != -1)
- continue;
-
- if (OpIdx == OpNo) return i;
-
- ++OpIdx;
- }
-}
diff --git a/llvm/utils/TableGen/CodeGenInstruction.h b/llvm/utils/TableGen/CodeGenInstruction.h
index d58bfb1..fb0e50c 100644
--- a/llvm/utils/TableGen/CodeGenInstruction.h
+++ b/llvm/utils/TableGen/CodeGenInstruction.h
@@ -296,13 +296,12 @@
/// ResultOperands - The decoded operands for the result instruction.
std::vector<ResultOperand> ResultOperands;
+
+ /// ResultInstOperandIndex - For each operand, this vector holds the
+ /// corresponding index of an operand in the result instruction.
+ std::vector<unsigned> ResultInstOperandIndex;
CodeGenInstAlias(Record *R, CodeGenTarget &T);
-
- /// getResultInstOperandIndexForResultOperandIndex - Given an index into the
- /// ResultOperands array, translate it to a valid index in ResultInst's
- /// operand list.
- unsigned getResultInstOperandIndexForResultOperandIndex(unsigned i) const;
};
}