Use a simple SmallVector

GPUOpen-Drivers · Dec 3, 2024 · deaefdb · deaefdb
1 parent d838ec7
commit deaefdb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/TableGen/Operations.cpp b/lib/TableGen/Operations.cpp
@@ -21,7 +21,6 @@
 #include "llvm-dialects/TableGen/Format.h"
 
 #include "llvm/TableGen/Record.h"
-#include <map>
 
 using namespace llvm;
 using namespace llvm_dialects;
@@ -160,7 +159,8 @@ unsigned OperationBase::getNumFullArguments() const {
 
 void OperationBase::emitArgumentAccessorDeclarations(llvm::raw_ostream &out,
                                                      FmtContext &fmt) const {
-  std::map<std::string, uint32_t> argIndexMap;
+  llvm::SmallVector<std::string> argNames;
+
   unsigned numSuperclassArgs = 0;
   if (m_superclass)
     numSuperclassArgs = m_superclass->getNumFullArguments();
@@ -172,7 +172,7 @@ void OperationBase::emitArgumentAccessorDeclarations(llvm::raw_ostream &out,
     const bool isVarArg = arg.type->isVarArgList();
 
     if (!isVarArg)
-      argIndexMap[capitalizedArgName] = numSuperclassArgs + index;
+      argNames.push_back(capitalizedArgName);
 
     std::string defaultDeclaration = "$0 get$1() $2;";
 
@@ -194,10 +194,10 @@ void OperationBase::emitArgumentAccessorDeclarations(llvm::raw_ostream &out,
                  capitalizedArgName, !isVarArg ? "const" : "", arg.name);
   }
 
-  if (!argIndexMap.empty()) {
+  if (!argNames.empty()) {
     out << "enum class ArgumentIndex: uint32_t {\n";
-    for (auto &[argName, index] : argIndexMap)
-      out << tgfmt("$0 = $1,\n", &fmt, argName, index);
+    for (const auto &[index, argName] : llvm::enumerate(argNames))
+      out << tgfmt("$0 = $1,\n", &fmt, argName, numSuperclassArgs + index);
     out << "};";
   }
 }

diff --git a/test/example/generated/ExampleDialect.h.inc b/test/example/generated/ExampleDialect.h.inc
@@ -105,9 +105,9 @@ uint32_t getNumElements() const;
         ::llvm::Value * getInitial() const;
           void setInitial(::llvm::Value * initial);
         enum class ArgumentIndex: uint32_t {
+Ptr = 0,
 Count = 1,
 Initial = 2,
-Ptr = 0,
 };
       };
 
@@ -133,9 +133,9 @@ bool verifier(::llvm::raw_ostream &errs);
         uint32_t getExtra() const;
           void setExtra(uint32_t extra);
         enum class ArgumentIndex: uint32_t {
-Extra = 2,
 Lhs = 0,
 Rhs = 1,
+Extra = 2,
 };
 ::llvm::Value * getResult();
 
@@ -190,8 +190,8 @@ bool verifier(::llvm::raw_ostream &errs);
         ::llvm::Value * getIndex() const;
           void setIndex(::llvm::Value * index);
         enum class ArgumentIndex: uint32_t {
-Index = 1,
 Vector = 0,
+Index = 1,
 };
 ::llvm::Value * getResult();
 
@@ -338,9 +338,9 @@ bool verifier(::llvm::raw_ostream &errs);
         ::llvm::Value * getIndex() const;
           void setIndex(::llvm::Value * index);
         enum class ArgumentIndex: uint32_t {
-Index = 2,
-Value = 1,
 Vector = 0,
+Value = 1,
+Index = 2,
 };
 ::llvm::Value * getResult();