[llvm] de44af4 - [TableGen] Fix codgen of InstrMapping with multiple columns and values
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 25 21:03:57 PDT 2021
Author: Jyun-Yan You
Date: 2021-10-25T21:00:49-07:00
New Revision: de44af4c1db3c333d64ef7beeabd6b38193c024e
URL: https://github.com/llvm/llvm-project/commit/de44af4c1db3c333d64ef7beeabd6b38193c024e
DIFF: https://github.com/llvm/llvm-project/commit/de44af4c1db3c333d64ef7beeabd6b38193c024e.diff
LOG: [TableGen] Fix codgen of InstrMapping with multiple columns and values
This patch fixes invalid syntax of generated code for InstrMapping
that has multiple columns and values.
Reviewed By: craig.topper
Differential Revision: https://reviews.llvm.org/D111962
Added:
Modified:
llvm/utils/TableGen/CodeGenMapTable.cpp
Removed:
################################################################################
diff --git a/llvm/utils/TableGen/CodeGenMapTable.cpp b/llvm/utils/TableGen/CodeGenMapTable.cpp
index aef22c5c21ccc..38871eb8cf3cd 100644
--- a/llvm/utils/TableGen/CodeGenMapTable.cpp
+++ b/llvm/utils/TableGen/CodeGenMapTable.cpp
@@ -443,14 +443,16 @@ void MapTableEmitter::emitMapFuncBody(raw_ostream &OS,
if (ValueCols.size() > 1) {
for (unsigned i = 0, e = ValueCols.size(); i < e; i++) {
ListInit *ColumnI = ValueCols[i];
+ OS << " if (";
for (unsigned j = 0, ColSize = ColumnI->size(); j < ColSize; ++j) {
std::string ColName = ColFields->getElement(j)->getAsUnquotedString();
- OS << " if (in" << ColName;
+ OS << "in" << ColName;
OS << " == ";
OS << ColName << "_" << ColumnI->getElement(j)->getAsUnquotedString();
- if (j < ColumnI->size() - 1) OS << " && ";
- else OS << ")\n";
+ if (j < ColumnI->size() - 1)
+ OS << " && ";
}
+ OS << ")\n";
OS << " return " << InstrMapDesc.getName();
OS << "Table[mid]["<<i+1<<"];\n";
}
@@ -480,9 +482,10 @@ void MapTableEmitter::emitTablesWithFunc(raw_ostream &OS) {
if (ValueCols.size() > 1) {
for (Init *CF : ColFields->getValues()) {
std::string ColName = CF->getAsUnquotedString();
- OS << ", enum " << ColName << " in" << ColName << ") {\n";
+ OS << ", enum " << ColName << " in" << ColName;
}
- } else { OS << ") {\n"; }
+ }
+ OS << ") {\n";
// Emit map table.
unsigned TableSize = emitBinSearchTable(OS);
More information about the llvm-commits
mailing list