From dbd072172f6312893e1922e48ed768ae0fab9a89 Mon Sep 17 00:00:00 2001
From: ducky
Date: Fri, 11 Dec 2015 14:25:42 -0800
Subject: Refactor tests to use stop() and assert() instead of io.error/io.done

Gate assert, printf, stop by reset
Fix testbenches that never worked
Change simulation prints to display cycle at which test was signaled to end, not when simulator stops
Better documentation for Counter
---
 src/test/scala/chiselTests/BitwiseOps.scala | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/test/scala/chiselTests/BitwiseOps.scala')

diff --git a/src/test/scala/chiselTests/BitwiseOps.scala b/src/test/scala/chiselTests/BitwiseOps.scala
index d180c11e..31feaada 100644
--- a/src/test/scala/chiselTests/BitwiseOps.scala
+++ b/src/test/scala/chiselTests/BitwiseOps.scala
@@ -8,18 +8,17 @@ import org.scalatest.prop._
 import Chisel.testers.BasicTester
 
 class BitwiseOpsTester(w: Int, _a: Int, _b: Int) extends BasicTester {
-  io.done := Bool(true)
   val mask = (1 << w) - 1
-  val a = UInt(_a)
-  val b = UInt(_b)
-  when(~a != UInt(mask & ~_a)) { io.error := UInt(1) }
-  when((a & b) != UInt(mask & (_a & _b))) { io.error := UInt(2) }
-  when((a | b)  != UInt(mask & (_a | _b))) { io.error := UInt(3) }
-  when((a ^ b) != UInt(mask & (_a ^ _b))) { io.error := UInt(4) }
+  val a = UInt(_a, w)
+  val b = UInt(_b, w)
+  assert(~a === UInt(mask & ~_a))
+  assert((a & b) === UInt(_a & _b))
+  assert((a | b) === UInt(_a | _b))
+  assert((a ^ b) === UInt(_a ^ _b))
+  stop()
 }
 
 class BitwiseOpsSpec extends ChiselPropSpec {
-
   property("All bit-wise ops should return the correct result") {
     forAll(safeUIntPair) { case(w: Int, a: Int, b: Int) =>
       assert(execute{ new BitwiseOpsTester(w, a, b) })
-- 
cgit v1.2.3