Fix tests

Author: rwy7

test/Dialect/FIRRTL/infer-domains-errors.mlir

@@ -136,22 +136,26 @@ firrtl.circuit "DoubleExportOfDomain" {
 
 // -----
 
-// Domain exported multiple times, this time with one input and one output. Which do we choose?
+// Domain exported multiple times, this time with two outputs.
 
 firrtl.circuit "DoubleExportOfDomain" {
-    firrtl.domain @ClockDomain
+  firrtl.domain @ClockDomain
+
+  firrtl.extmodule @Generator(out D: !firrtl.domain of @ClockDomain)
 
   firrtl.module @DoubleExportOfDomain(
-    // expected-note @below {{candidate association "DI"}}
-    out  %DI : !firrtl.domain of @ClockDomain,
-    // expected-note @below {{candidate association "DO"}}
-    out %DO : !firrtl.domain of @ClockDomain,
-    in  %i  : !firrtl.uint<1> domains [%DO],
+    // expected-note @below {{candidate association "D1"}}
+    out %D1 : !firrtl.domain of @ClockDomain,
+    // expected-note @below {{candidate association "D2"}}
+    out %D2 : !firrtl.domain of @ClockDomain,
+    in  %i  : !firrtl.uint<1> domains [%D1],
     // expected-error @below {{ambiguous "ClockDomain" association for port "o"}}
     out %o  : !firrtl.uint<1> domains []
   ) {
+    %gen_D = firrtl.instance gen @Generator(out D: !firrtl.domain of @ClockDomain)
     // DI and DO are aliases
-    firrtl.domain.define %DO, %DI
+    firrtl.domain.define %D1, %gen_D
+    firrtl.domain.define %D2, %gen_D
 
     // o is on same domain as i
     firrtl.matchingconnect %o, %i : !firrtl.uint<1>
@@ -161,6 +165,7 @@ firrtl.circuit "DoubleExportOfDomain" {
 // -----
 
 // InstanceChoice: Each module has different domains inferred.
+// TODO: this just relies on the op-verifier for instance choice ops.
 
 firrtl.circuit "ConflictingInstanceChoiceDomains" {
     firrtl.domain @ClockDomain
@@ -176,11 +181,13 @@ firrtl.circuit "ConflictingInstanceChoiceDomains" {
   }
 
   // Bar's "out" port takes on the domains of "in2".
+  // expected-note @below {{original module declared here}}
   firrtl.module @Bar(in %in1: !firrtl.uint<1>, in %in2: !firrtl.uint<1>, out %out: !firrtl.uint<1>) {
     firrtl.connect %out, %in2 : !firrtl.uint<1>
   }
 
   firrtl.module @ConflictingInstanceChoiceDomains(in %in1: !firrtl.uint<1>, in %in2: !firrtl.uint<1>) {
+    // expected-error @below {{'firrtl.instance_choice' op domain info for "out" must be [2 : ui32], but got [0 : ui32]}}
     %inst_in1, %inst_in2, %inst_out = firrtl.instance_choice inst @Foo alternatives @Option { @X -> @Foo, @Y -> @Bar } (in in1: !firrtl.uint<1>, in in2: !firrtl.uint<1>, out out: !firrtl.uint<1>)
     firrtl.connect %inst_in1, %in1 : !firrtl.uint<1>, !firrtl.uint<1>
     firrtl.connect %inst_in2, %in2 : !firrtl.uint<1>, !firrtl.uint<1>