Use map vector to preserve field name ordering

llvm · Oct 10, 2024 · 9226a5d · 9226a5d
1 parent 65948a3
commit 9226a5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/include/circt/Dialect/OM/Evaluator/Evaluator.h b/include/circt/Dialect/OM/Evaluator/Evaluator.h
@@ -39,7 +39,7 @@ using EvaluatorValuePtr = std::shared_ptr<EvaluatorValue>;
 
 /// The fields of a composite Object, currently represented as a map. Further
 /// refinement is expected.
-using ObjectFields = SmallDenseMap<StringAttr, EvaluatorValuePtr>;
+using ObjectFields = llvm::MapVector<StringAttr, EvaluatorValuePtr>;
 
 /// Base class for evaluator runtime values.
 /// Enables the shared_from_this functionality so Evaluator Value pointers can
@@ -268,7 +268,7 @@ struct ObjectValue : EvaluatorValue {
   om::ClassOp getClassOp() const { return cls; }
   const auto &getFields() const { return fields; }
 
-  void setFields(llvm::SmallDenseMap<StringAttr, EvaluatorValuePtr> newFields) {
+  void setFields(ObjectFields newFields) {
     fields = std::move(newFields);
     markFullyEvaluated();
   }
@@ -301,7 +301,7 @@ struct ObjectValue : EvaluatorValue {
 
 private:
   om::ClassOp cls;
-  llvm::SmallDenseMap<StringAttr, EvaluatorValuePtr> fields;
+  ObjectFields fields;
 };
 
 /// Tuple values.

diff --git a/lib/Dialect/OM/Evaluator/Evaluator.cpp b/lib/Dialect/OM/Evaluator/Evaluator.cpp
@@ -749,10 +749,6 @@ ArrayAttr circt::om::Object::getFieldNames() {
   for (auto &f : fields)
     fieldNames.push_back(f.first);
 
-  llvm::sort(fieldNames, [](Attribute a, Attribute b) {
-    return cast<StringAttr>(a).getValue() < cast<StringAttr>(b).getValue();
-  });
-
   return ArrayAttr::get(cls.getContext(), fieldNames);
 }
 

diff --git a/test/CAPI/om.c b/test/CAPI/om.c
@@ -112,7 +112,7 @@ void testEvaluator(MlirContext ctx) {
   OMEvaluatorValue child = omEvaluatorObjectGetField(object, childFieldName);
 
   MlirAttribute fieldNamesO = omEvaluatorObjectGetFieldNames(object);
-  // CHECK: ["child", "field"]
+  // CHECK: ["field", "child"]
   mlirAttributeDump(fieldNamesO);
 
   // CHECK: 0
@@ -129,7 +129,7 @@ void testEvaluator(MlirContext ctx) {
 
   MlirAttribute fieldNamesC = omEvaluatorObjectGetFieldNames(child);
 
-  // CHECK: ["bar", "baz", "foo"]
+  // CHECK: ["foo", "bar", "baz"]
   mlirAttributeDump(fieldNamesC);
 
   // CHECK: child object field `foo` is primitive: 1