Merge pull request #35 from ucb-bar/fixcheckunstable

ucbjrl · ucbjrl · commit 451a321b1541 · 2015-08-06T16:39:58.000-07:00
Fixcheckunstable
diff --git a/sbt/check b/sbt/check
@@ -16,10 +16,10 @@ def main(args, junit_file):
             test_status = 'FAILED'
             test_time = 0
             for line in outfile.readlines():
-                look = re.match('(PASSED|FAILED)', line)
+                look = re.match(r'RAN \d+ CYCLES (PASSED)|(FAILED)', line)
                 if look:
                     test_status = look.group(1)
-                look = re.match('.*Total time: (\S+) s,', line)
+                look = re.match(r'.*Total time: (\S+) s,', line)
                 if look:
                     test_time = int(look.group(1))
             if test_status != 'PASSED':
diff --git a/solutions/VecShiftRegister.scala b/solutions/VecShiftRegister.scala
@@ -27,6 +27,12 @@ class VecShiftRegister extends Module {
 class VecShiftRegisterTests(c: VecShiftRegister) extends Tester(c) { 
   val reg     = Array.fill(4){ 0 }
   val ins     = Array.fill(4){ 0 }
+  // Initialize the delays.
+  for (i <- 0 until 4)
+    poke(c.io.ins(i), 0)
+  poke(c.io.load, 1)
+  step(1)
+
   for (t <- 0 until 16) {
     for (i <- 0 until 4)
       ins(i) = rnd.nextInt(16)
