[firrtl] Fix fprintf round trip issue

Fix a bug where the fprintf op would print in an incorrect way.  This
resulted in errors if trying to round trip it.  Add a test of round
tripping to prevent regressing.

Signed-off-by: Schuyler Eldridge <[email protected]>

Author: seldridge

lib/Dialect/FIRRTL/FIRRTLOps.cpp

@@ -6494,12 +6494,12 @@ void FPrintFOp::print(OpAsmPrinter &p) {
   }
   p << ", ";
   p.printAttributeWithoutType(getFormatStringAttr());
-  printFPrintfAttrs(p, *this, (*this)->getAttrDictionary());
   if (!getSubstitutions().empty()) {
     p << "(";
     p.printOperands(getSubstitutions());
     p << ")";
   }
+  printFPrintfAttrs(p, *this, (*this)->getAttrDictionary());
   p << " : " << getClock().getType() << ", " << getCond().getType();
   if (!getOutputFileSubstitutions().empty() || !getSubstitutions().empty()) {
     for (auto type : getOperands().drop_front(2).getTypes()) {

test/Dialect/FIRRTL/round-trip.mlir

@@ -186,4 +186,14 @@ firrtl.module @FormatString() {
 
 }
 
+// CHECK-LABEL: firrtl.module @Fprintf
+firrtl.module @Fprintf(
+  in %clock : !firrtl.clock,
+  in %reset : !firrtl.reset,
+  in %a : !firrtl.uint<1>
+) {
+  // CHECK-NEXT: firrtl.fprintf %clock, %a, "test%d.txt"(%a), "%x, %b"(%a, %reset) {name = "foo"} : !firrtl.clock, !firrtl.uint<1>, !firrtl.uint<1>, !firrtl.uint<1>, !firrtl.reset
+  firrtl.fprintf %clock, %a, "test%d.txt"(%a), "%x, %b"(%a, %reset) {name = "foo"} : !firrtl.clock, !firrtl.uint<1>, !firrtl.uint<1>, !firrtl.uint<1>, !firrtl.reset
+}
+
 }