[mlir] Fix printing of dialect resources

[Mogball]

Summary

It was forgetting commas.

mlir/lib/IR/AsmPrinter.cpp

void OperationPrinter::printFileMetadataDictionary(Operation *op) {
   if (sawMetadataEntry)
     os << newLine << "#-}" << newLine;
 }
 
 void OperationPrinter::printResourceFileMetadata(
     function_ref<void()> checkAddMetadataDict, Operation *op) {
   // Functor used to add data entries to the file metadata dictionary.
   bool hadResource = false;
+  bool needResourceComma = false;
+  bool needEntryComma = false;
   auto processProvider = [&](StringRef dictName, StringRef name, auto &provider,
                              auto &&...providerArgs) {
     bool hadEntry = false;
     auto printFn = [&](StringRef key, ResourceBuilder::ValueFn valueFn) {
       checkAddMetadataDict();
 
       // Emit the top-level resource entry if we haven't yet.
-      if (!std::exchange(hadResource, true))
+      if (!std::exchange(hadResource, true)) {
+        if (needResourceComma)
+          os << "," << newLine;
         os << "  " << dictName << "_resources: {" << newLine;
+      }
       // Emit the parent resource entry if we haven't yet.
-      if (!std::exchange(hadEntry, true))
+      if (!std::exchange(hadEntry, true)) {
+        if (needEntryComma)
+          os << "," << newLine;
         os << "    " << name << ": {" << newLine;
-      else
+      } else {
         os << "," << newLine;
+      }
 
       os << "      " << key << ": ";
       valueFn(os);
     };
     ResourceBuilder entryBuilder(*this, printFn);
     provider.buildResources(op, providerArgs..., entryBuilder);
 
+    needEntryComma = hadEntry;
     if (hadEntry)
       os << newLine << "    }";
   };
 
   // Print the `dialect_resources` section if we have any dialects with
   // resources.
   for (const OpAsmDialectInterface &interface : state.getDialectInterfaces()) {
     auto &dialectResources = state.getDialectResources();
     StringRef name = interface.getDialect()->getNamespace();
     auto it = dialectResources.find(interface.getDialect());
     if (it != dialectResources.end())
       processProvider("dialect", name, interface, it->second);
     else
       processProvider("dialect", name, interface,
                       SetVector<AsmDialectResourceHandle>());
   }
   if (hadResource)
     os << newLine << "  }";
 
   // Print the `external_resources` section if we have any external clients with
   // resources.
+  needEntryComma = false;
+  needResourceComma = hadResource;
   hadResource = false;
   for (const auto &printer : state.getResourcePrinters())
     processProvider("external", printer.getName(), printer);
   if (hadResource)
     os << newLine << "  }";
 }
 
 /// Print a block argument in the usual format of:

mlir/test/IR/file-metadata-resources.mlir

-// RUN: mlir-opt %s -split-input-file | FileCheck %s
+// RUN: mlir-opt %s | mlir-opt | FileCheck %s
 
 // Check that we only preserve the blob that got referenced.
-// CHECK:      test: {
-// CHECK-NEXT:   blob1: "0x08000000010000000000000002000000000000000300000000000000"
-// CHECK-NEXT: }
+// CHECK:      {-#
+// CHECK-NEXT:   dialect_resources: {
+// CHECK-NEXT:     test: {
+// CHECK-NEXT:       blob1: "0x08000000010000000000000002000000000000000300000000000000"
+// CHECK-NEXT:     }
+// CHECK-NEXT:   },
 
 // Check that we properly preserve unknown external resources.
-// CHECK:      external: {
-// CHECK-NEXT:   blob: "0x08000000010000000000000002000000000000000300000000000000"
-// CHECK-NEXT:   bool: true
-// CHECK-NEXT:   string: "string"
-// CHECK-NEXT: }
+// CHECK-NEXT:   external_resources: {
+// CHECK-NEXT:     external: {
+// CHECK-NEXT:       blob: "0x08000000010000000000000002000000000000000300000000000000"
+// CHECK-NEXT:       bool: true
+// CHECK-NEXT:       string: "string"
+// CHECK-NEXT:     },
+// CHECK-NEXT:     other_stuff: {
+// CHECK-NEXT:       bool: true
+// CHECK-NEXT:     }
+// CHECK-NEXT:   }
+// CHECK-NEXT: #-}
 
 module attributes { test.blob_ref = #test.e1di64_elements<blob1> : tensor<*xi1>} {}
 
 {-#
   dialect_resources: {
     test: {
       blob1: "0x08000000010000000000000002000000000000000300000000000000",
       blob2: "0x08000000040000000000000005000000000000000600000000000000"
     }
   },
   external_resources: {
     external: {
       blob: "0x08000000010000000000000002000000000000000300000000000000",
       bool: true,
       string: "string"
+    },
+    other_stuff: {
+      bool: true
     }
   }
 #-}