From 40bf74bfdf4d07f0d7171b77ae34004eb9c1fa11 Mon Sep 17 00:00:00 2001
From: azidar
Date: Tue, 25 Aug 2015 15:37:53 -0700
Subject: Fixed bug in split expression that leaked connect statements out of a
 conditional assignment

---
 test/errors/init/Output.fir             | 10 ++++++++++
 test/passes/split-exp/primop.fir        |  1 -
 test/passes/split-exp/split-in-when.fir | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 test/errors/init/Output.fir
 create mode 100644 test/passes/split-exp/split-in-when.fir

(limited to 'test')

diff --git a/test/errors/init/Output.fir b/test/errors/init/Output.fir
new file mode 100644
index 00000000..f28d1e0b
--- /dev/null
+++ b/test/errors/init/Output.fir
@@ -0,0 +1,10 @@
+; RUN: firrtl -i %s -o %s.v -X verilog -p c 2>&1 | tee %s.out | FileCheck %s
+; CHECK: Reference y is not fully initialized.
+
+circuit Top : 
+  module Top : 
+    input clk : Clock
+    wire y : UInt<1>
+
+    when UInt(0) : 
+      y := UInt(1)
diff --git a/test/passes/split-exp/primop.fir b/test/passes/split-exp/primop.fir
index 3b120217..b2f0af82 100644
--- a/test/passes/split-exp/primop.fir
+++ b/test/passes/split-exp/primop.fir
@@ -4,7 +4,6 @@
 circuit Top :
    module Top :
       output out : UInt<1>
-      output out2 : UInt<1>
 
       wire m : UInt<1>[3]
       m[0] := UInt(0)
diff --git a/test/passes/split-exp/split-in-when.fir b/test/passes/split-exp/split-in-when.fir
new file mode 100644
index 00000000..ddf6a155
--- /dev/null
+++ b/test/passes/split-exp/split-in-when.fir
@@ -0,0 +1,23 @@
+; RUN: firrtl -i %s -o %s.v -X verilog -p c 2>&1 | tee %s.out | FileCheck %s
+
+;CHECK: Split Expressions
+circuit Top :
+   module Top :
+      input p : UInt<1>
+      input clk : Clock
+      input a : UInt<10>
+      input b : UInt<10>
+      input c : UInt<10>
+      
+      reg out : UInt<10>,clk,p
+
+      when bit(subw(a,c),3) : out := mux(eqv(bits(UInt(32),4,0),UInt(13)),addw(a,addw(b,c)),subw(c,b))
+
+;CHECK: node T = subw(a, c)
+;CHECK: node out_1 = eqv(UInt("h0"), UInt("hd"))
+;CHECK: node out_3 = addw(b, c)
+;CHECK: node out_2 = addw(a, out_3)
+;CHECK: node out_4 = subw(c, b)
+;CHECK: when bit(T, 3) : out := mux(out_1, out_2, out_4)   
+
+;CHECK: Finished Split Expressions
-- 
cgit v1.2.3