merge + fix trim to use correct bits operands

6 files changed, 72 insertions, 72 deletions

diff --git a/test/passes/lower-to-ground/accessor.fir b/test/passes/lower-to-ground/accessor.fir
index 14b55c63..8fe1bc52 100644
--- a/test/passes/lower-to-ground/accessor.fir
+++ b/test/passes/lower-to-ground/accessor.fir
@@ -7,22 +7,22 @@ circuit top :
       wire j : UInt<32>
 
       wire a : UInt<32>[4]
-      ; CHECK: wire a_0 : UInt<32>
-      ; CHECK: wire a_1 : UInt<32>
-      ; CHECK: wire a_2 : UInt<32>
-      ; CHECK: wire a_3 : UInt<32>
+      ; CHECK: wire a$0 : UInt<32>
+      ; CHECK: wire a$1 : UInt<32>
+      ; CHECK: wire a$2 : UInt<32>
+      ; CHECK: wire a$3 : UInt<32>
 
       accessor b = a[i]
       ; CHECK: wire b : UInt<32>
-      ; CHECK: b := (a_0 a_1 a_2 a_3)[i]
+      ; CHECK: b := (a$0 a$1 a$2 a$3)[i]
       j := b
 
       accessor c = a[i]
       ; CHECK: wire c : UInt<32>
-      ; CHECK: (a_0 a_1 a_2 a_3)[i] := c
+      ; CHECK: (a$0 a$1 a$2 a$3)[i] := c
       c := j
       
-      mem p : UInt<32>[4]
+      cmem p : UInt<32>[4]
       accessor t = p[i]
       ; CHECK: accessor t = p[i]
       j := t
diff --git a/test/passes/lower-to-ground/bundle-vecs.fir b/test/passes/lower-to-ground/bundle-vecs.fir
index 069314a3..0b9d9799 100644
--- a/test/passes/lower-to-ground/bundle-vecs.fir
+++ b/test/passes/lower-to-ground/bundle-vecs.fir
@@ -7,23 +7,23 @@ circuit top :
       wire j : { x : UInt<32>, flip y : UInt<32> }
 
       wire a : { x : UInt<32>, flip y : UInt<32> }[2]
-      ; CHECK: wire a_0_x : UInt<32>
-      ; CHECK: wire a_0_y : UInt<32>
-      ; CHECK: wire a_1_x : UInt<32>
-      ; CHECK: wire a_1_y : UInt<32>
+      ; CHECK: wire a$0$x : UInt<32>
+      ; CHECK: wire a$0$y : UInt<32>
+      ; CHECK: wire a$1$x : UInt<32>
+      ; CHECK: wire a$1$y : UInt<32>
 
       accessor b = a[i]
-      ; CHECK: wire b_x : UInt<32>
-      ; CHECK: wire b_y : UInt<32>
-      ; CHECK: b_x := (a_0_x a_1_x)[i]
-      ; CHECK: (a_0_y a_1_y)[i] := b_y
+      ; CHECK: wire b$x : UInt<32>
+      ; CHECK: wire b$y : UInt<32>
+      ; CHECK: b$x := (a$0$x a$1$x)[i]
+      ; CHECK: (a$0$y a$1$y)[i] := b$y
       j := b
       
       accessor c = a[i]
-      ; CHECK: wire c_x : UInt<32>
-      ; CHECK: wire c_y : UInt<32>
-      ; CHECK: (a_0_x a_1_x)[i] := c_x
-      ; CHECK: c_y := (a_0_y a_1_y)[i]
+      ; CHECK: wire c$x : UInt<32>
+      ; CHECK: wire c$y : UInt<32>
+      ; CHECK: (a$0$x a$1$x)[i] := c$x
+      ; CHECK: c$y := (a$0$y a$1$y)[i]
       c := j
 
 
diff --git a/test/passes/lower-to-ground/bundle.fir b/test/passes/lower-to-ground/bundle.fir
index e758acaf..c0acfecd 100644
--- a/test/passes/lower-to-ground/bundle.fir
+++ b/test/passes/lower-to-ground/bundle.fir
@@ -17,37 +17,37 @@ circuit top :
 ;CHECK: Lower To Ground
 ;CHECK: circuit top :
 ;CHECK:    module m :
-;CHECK:       input a_x : UInt<5>
-;CHECK:       output a_y : SInt<5>
-;CHECK:       output b_x : UInt<5>
-;CHECK:       input b_y : SInt<5>
+;CHECK:       input a$x : UInt<5>
+;CHECK:       output a$y : SInt<5>
+;CHECK:       output b$x : UInt<5>
+;CHECK:       input b$y : SInt<5>
 ;CHECK:       input reset : UInt<1>
 ;CHECK:    module top :
-;CHECK:       input c_x_0 : UInt<5>
-;CHECK:       input c_x_1 : UInt<5>
-;CHECK:       input c_x_2 : UInt<5>
-;CHECK:       input c_x_3 : UInt<5>
-;CHECK:       input c_x_4 : UInt<5>
-;CHECK:       output c_y_x_0 : UInt<5>
-;CHECK:       output c_y_x_1 : UInt<5>
-;CHECK:       output c_y_x_2 : UInt<5>
-;CHECK:       input c_y_y : SInt<5>
+;CHECK:       input c$x$0 : UInt<5>
+;CHECK:       input c$x$1 : UInt<5>
+;CHECK:       input c$x$2 : UInt<5>
+;CHECK:       input c$x$3 : UInt<5>
+;CHECK:       input c$x$4 : UInt<5>
+;CHECK:       output c$y$x$0 : UInt<5>
+;CHECK:       output c$y$x$1 : UInt<5>
+;CHECK:       output c$y$x$2 : UInt<5>
+;CHECK:       input c$y$y : SInt<5>
 ;CHECK:       input reset : UInt<1>
-;CHECK:       wire a_x : UInt<5>
-;CHECK:       wire a_y : SInt<5>
-;CHECK:       wire b_x : UInt<5>
-;CHECK:       wire b_y : SInt<5>
-;CHECK:       a_x := b_x
-;CHECK:       b_y := a_y
+;CHECK:       wire a$x : UInt<5>
+;CHECK:       wire a$y : SInt<5>
+;CHECK:       wire b$x : UInt<5>
+;CHECK:       wire b$y : SInt<5>
+;CHECK:       a$x := b$x
+;CHECK:       b$y := a$y
 ;CHECK:       inst i of m
 ;CHECK:       i.reset := reset
-;CHECK:       i.a_x := a_x
-;CHECK:       a_y := i.a_y
-;CHECK:       b_x := i.b_x
-;CHECK:       i.b_y := b_y
-;CHECK:       wire d_0 : UInt<5>
-;CHECK:       wire d_1 : UInt<5>
-;CHECK:       wire d_2 : UInt<5>
-;CHECK:       wire d_3 : UInt<5>
-;CHECK:       wire d_4 : UInt<5>
+;CHECK:       i.a$x := a$x
+;CHECK:       a$y := i.a$y
+;CHECK:       b$x := i.b$x
+;CHECK:       i.b$y := b$y
+;CHECK:       wire d$0 : UInt<5>
+;CHECK:       wire d$1 : UInt<5>
+;CHECK:       wire d$2 : UInt<5>
+;CHECK:       wire d$3 : UInt<5>
+;CHECK:       wire d$4 : UInt<5>
 ;CHECK: Finished Lower To Ground
diff --git a/test/passes/lower-to-ground/instance.fir b/test/passes/lower-to-ground/instance.fir
index 57c68398..420c3c7c 100644
--- a/test/passes/lower-to-ground/instance.fir
+++ b/test/passes/lower-to-ground/instance.fir
@@ -27,9 +27,9 @@ circuit top :
 
 ; CHECK: Lower To Ground
 
-; CHECK: connect_data@<g:f> := src@<g:m>.data@<g:m>
-; CHECK: src@<g:m>.ready@<g:f> := connect_ready@<g:m>
-; CHECK: snk@<g:m>.data@<g:f> := connect2_data@<g:m>
-; CHECK: connect2_ready@<g:f> := snk@<g:m>.ready@<g:m>
+; CHECK: connect$data@<g:f> := src@<g:m>.data@<g:m>
+; CHECK: src@<g:m>.ready@<g:f> := connect$ready@<g:m>
+; CHECK: snk@<g:m>.data@<g:f> := connect2$data@<g:m>
+; CHECK: connect2$ready@<g:f> := snk@<g:m>.ready@<g:m>
 
 ; CHECK: Finished Lower To Ground
diff --git a/test/passes/lower-to-ground/nested-vec.fir b/test/passes/lower-to-ground/nested-vec.fir
index 1a6ba2e8..c39850f4 100644
--- a/test/passes/lower-to-ground/nested-vec.fir
+++ b/test/passes/lower-to-ground/nested-vec.fir
@@ -8,29 +8,29 @@ circuit top :
       wire k : { x : UInt<32>, y : UInt<32> }
 
       wire a : { x : UInt<32>, flip y : UInt<32> }[2]
-      ; CHECK: wire a_0_x : UInt<32>
-      ; CHECK: wire a_0_y : UInt<32>
-      ; CHECK: wire a_1_x : UInt<32>
-      ; CHECK: wire a_1_y : UInt<32>
+      ; CHECK: wire a$0$x : UInt<32>
+      ; CHECK: wire a$0$y : UInt<32>
+      ; CHECK: wire a$1$x : UInt<32>
+      ; CHECK: wire a$1$y : UInt<32>
 
       accessor b = a[i]
-      ; CHECK: wire b_x : UInt<32>
-      ; CHECK: wire b_y : UInt<32>
-      ; CHECK: b_x := (a_0_x a_1_x)[i]
-      ; CHECK: (a_0_y a_1_y)[i] := b_y
+      ; CHECK: wire b$x : UInt<32>
+      ; CHECK: wire b$y : UInt<32>
+      ; CHECK: b$x := (a$0$x a$1$x)[i]
+      ; CHECK: (a$0$y a$1$y)[i] := b$y
       j := b
 
-      mem m : { x : UInt<32>, y : UInt<32> }[2]
-      ; CHECK: mem m_x : UInt<32>[2]
-      ; CHECK: mem m_y : UInt<32>[2]
+      cmem m : { x : UInt<32>, y : UInt<32> }[2]
+      ; CHECK: cmem m$x : UInt<32>[2]
+      ; CHECK: cmem m$y : UInt<32>[2]
 
       accessor c = m[i] ; MALE
-      ; CHECK: accessor c_x = m_x[i]
-      ; CHECK: accessor c_y = m_y[i]
+      ; CHECK: accessor c$x = m$x[i]
+      ; CHECK: accessor c$y = m$y[i]
 
       c := k
-      ; CHECK: c_x := k_x
-      ; CHECK: c_y := k_y
+      ; CHECK: c$x := k$x
+      ; CHECK: c$y := k$y
 
 ; CHECK: Finished Lower To Ground
 
diff --git a/test/passes/lower-to-ground/register.fir b/test/passes/lower-to-ground/register.fir
index 449204a3..a3c4f0ae 100644
--- a/test/passes/lower-to-ground/register.fir
+++ b/test/passes/lower-to-ground/register.fir
@@ -11,11 +11,11 @@
                wire q : { x : UInt, flip y : SInt }
                on-reset r1 := q    
 
-      ; CHECK: reg r1_x : UInt
-      ; CHECK: reg r1_y : SInt
-      ; CHECK: wire q_x : UInt
-      ; CHECK: wire q_y : SInt
-      ; CHECK: on-reset r1_x := q_x
-      ; CHECK: on-reset q_y := r1_y   
+      ; CHECK: reg r1$x : UInt
+      ; CHECK: reg r1$y : SInt
+      ; CHECK: wire q$x : UInt
+      ; CHECK: wire q$y : SInt
+      ; CHECK: on-reset r1$x := q$x
+      ; CHECK: on-reset q$y := r1$y   
 
 ; CHECK: Finished Lower To Ground