aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorazidar2015-05-02 12:20:41 -0700
committerazidar2015-05-02 12:20:41 -0700
commit93ba0196dc2ba88e4e34346e5fbc105743a8eaa0 (patch)
tree37faf9619e8c201910390cef5079914b8a137cc5 /test
parent5c63bea388663b82eb1ea43464dfea055b10a79b (diff)
Now when expanding ConnectFrom/ToIndex, create a node for the index so it isn't duplicated for all the whens
Diffstat (limited to 'test')
-rw-r--r--test/chisel3/Mul.fir11
-rw-r--r--test/passes/expand-connect-indexed/bundle-vecs.fir10
2 files changed, 10 insertions, 11 deletions
diff --git a/test/chisel3/Mul.fir b/test/chisel3/Mul.fir
index ec991197..46a8c9b9 100644
--- a/test/chisel3/Mul.fir
+++ b/test/chisel3/Mul.fir
@@ -1,12 +1,10 @@
; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s
; CHECK: Done!
-
circuit Mul :
module Mul :
input x : UInt<2>
- output z : UInt<4>
- output a : UInt<4>
input y : UInt<2>
+ output z : UInt<4>
wire tbl : UInt<4>[16]
tbl[0] := UInt<4>(0)
@@ -25,8 +23,7 @@ circuit Mul :
tbl[13] := UInt<4>(3)
tbl[14] := UInt<4>(6)
tbl[15] := UInt<4>(9)
- node T_43 = shl(x, 2)
- node ad = bit-or(Pad(T_43,?), Pad(y,?))
- a := Pad(ad,?)
- accessor T_44 = tbl[ad]
+ node T_42 = shl(x, 2)
+ node T_43 = bit-or(Pad(T_42,?), Pad(y,?))
+ accessor T_44 = tbl[T_43]
z := Pad(T_44,?)
diff --git a/test/passes/expand-connect-indexed/bundle-vecs.fir b/test/passes/expand-connect-indexed/bundle-vecs.fir
index 35b45b6c..c8235ade 100644
--- a/test/passes/expand-connect-indexed/bundle-vecs.fir
+++ b/test/passes/expand-connect-indexed/bundle-vecs.fir
@@ -16,11 +16,13 @@ circuit top :
; CHECK: wire b$x : UInt<32>
; CHECK: wire b$y : UInt<32>
; CHECK: b$x := a$0$x
- ; CHECK: when eq-uu(i, UInt(1)) :
- ; CHECK: b$x := a$1$x
+ ; CHECK: node b$x#0 = i
+ ; CHECK: when eq-uu(b$x#0, UInt(1)) :
+ ; CHECK: b$x := a$1$x
; CHECK: a$0$y := b$y
- ; CHECK: when eq-uu(i, UInt(1)) :
- ; CHECK: a$1$y := b$y
+ ; CHECK: node b$y#0 = i
+ ; CHECK: when eq-uu(b$y#0, UInt(1)) :
+ ; CHECK: a$1$y := b$y
j := b
; CHECK: Finished Expand Indexed Connects