[TableGen] Fix codgen of InstrMapping with multiple columns and values

[jyyou.tw]

Summary

This patch fixes invalid syntax of generated code for InstrMapping
that has multiple columns and values.

[craig.topper]

LGTM. I guess no in tree targets are affected by this?

[jyyou.tw]

In D111962#3082854, @craig.topper wrote:

LGTM. I guess no in tree targets are affected by this?

Yes, no target is affected.
By the way, I have no commit access. Could you submit it?

[craig.topper]

In D111962#3083109, @jyyou.tw wrote:

In D111962#3082854, @craig.topper wrote:

LGTM. I guess no in tree targets are affected by this?

Yes, no target is affected.
By the way, I have no commit access. Could you submit it?

Sure. How do you want your name and email to appear in the git log?

[jyyou.tw]

In D111962#3083114, @craig.topper wrote:

In D111962#3083109, @jyyou.tw wrote:

In D111962#3082854, @craig.topper wrote:

LGTM. I guess no in tree targets are affected by this?

Yes, no target is affected.
By the way, I have no commit access. Could you submit it?

Sure. How do you want your name and email to appear in the git log?

Jyun-Yan You <[e-mail]>

Thanks

llvm/utils/TableGen/CodeGenMapTable.cpp

void MapTableEmitter::emitMapFuncBody(raw_ostream &OS,
   // Emit binary search algorithm to locate instructions in the
   // relation table. If found, return opcode value from the appropriate column
   // of the table.
   emitBinSearch(OS, TableSize);
 
   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";
     }
     OS << "  return -1;";
   }
   else
     OS << "  return " << InstrMapDesc.getName() << "Table[mid][1];\n";
 
void MapTableEmitter::emitTablesWithFunc(raw_ostream &OS) {
 
   ListInit *ColFields = InstrMapDesc.getColFields();
   const std::vector<ListInit*> &ValueCols = InstrMapDesc.getValueCols();
   OS << "// "<< InstrMapDesc.getName() << "\nLLVM_READONLY\n";
   OS << "int "<< InstrMapDesc.getName() << "(uint16_t Opcode";
   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);
 
   // Emit rest of the function body.
   emitMapFuncBody(OS, TableSize);
 }