Merge branch 'master' into release; update to 3.1.0 release.

Author: ucbjrl

README.md

@@ -1,4 +1,4 @@
-Chisel Tutorials (Release branch)
+Chisel Tutorials (Development branch)
 ================
 
 These are the tutorials for [Chisel](https://github.com/ucb-bar/chisel3).
@@ -14,7 +14,7 @@ Getting the Repo
     $ git clone https://github.com/ucb-bar/chisel-tutorial.git
     $ cd chisel-tutorial
     $ git fetch origin
-    $ git checkout release
+    $ git checkout master
 
 
 Executing Chisel

build.sbt

@@ -4,7 +4,7 @@ def scalacOptionsVersion(scalaVersion: String): Seq[String] = {
     //  switch to support our anonymous Bundle definitions:
     //  https://github.com/scala/bug/issues/10047
     CrossVersion.partialVersion(scalaVersion) match {
-      case Some((2, scalaMajor: Int)) if scalaMajor < 12 => Seq()
+      case Some((2, scalaMajor: Long)) if scalaMajor < 12 => Seq()
       case _ => Seq("-Xsource:2.11")
     }
   }
@@ -16,7 +16,7 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
     //  Java 7 compatible code for Scala 2.11
     //  for compatibility with old clients.
     CrossVersion.partialVersion(scalaVersion) match {
-      case Some((2, scalaMajor: Int)) if scalaMajor < 12 =>
+      case Some((2, scalaMajor: Long)) if scalaMajor < 12 =>
         Seq("-source", "1.7", "-target", "1.7")
       case _ =>
         Seq("-source", "1.8", "-target", "1.8")
@@ -26,21 +26,21 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = {
 
 organization := "edu.berkeley.cs"
 
-version := "3.0.0"
+version := "3.1.0"
 
 name := "chisel-tutorial"
 
-scalaVersion := "2.11.11"
+scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.11.11", "2.12.3")
+crossScalaVersions := Seq("2.11.12", "2.12.4")
 
 scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-language:reflectiveCalls")
 
 // Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
-// The following are the default development versions, not the "release" versions.
+// The following are the current "release" versions.
 val defaultVersions = Map(
-  "chisel3" -> "3.0.+",
-  "chisel-iotesters" -> "1.1.+"
+  "chisel3" -> "3.1.+",
+  "chisel-iotesters" -> "1.2.+"
   )
 
 libraryDependencies ++= (Seq("chisel3","chisel-iotesters").map {

project/build.properties

@@ -1 +1 @@
-sbt.version = 0.13.16
+sbt.version = 1.1.1

run-examples.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 args=$@
-sbt -v "test:run-main examples.Launcher $args"
+sbt -v "test:runMain examples.Launcher $args"

run-problem.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 args=$@
-sbt "test:run-main problems.Launcher $args"
+sbt "test:runMain problems.Launcher $args"

run-solution.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 args=$@
-sbt "test:run-main solutions.Launcher $args"
+sbt "test:runMain solutions.Launcher $args"

src/main/scala/examples/Router.scala

@@ -32,7 +32,7 @@ class Packet extends Bundle {
   *
   * @param n is the number of fanned outputs for the routed packet
   */
-class RouterIO(n: Int) extends Bundle {
+class RouterIO(val n: Int) extends Bundle {
   val read_routing_table_request   = DeqIO(new ReadCmd())
   val read_routing_table_response  = EnqIO(UInt(Router.addressWidth.W))
   val load_routing_table_request   = DeqIO(new WriteCmd())

src/main/scala/examples/Stack.scala

@@ -4,10 +4,6 @@ package examples
 import chisel3._
 import chisel3.util.log2Ceil
 
-import scala.collection.mutable.HashMap
-import scala.collection.mutable.{Stack => ScalaStack}
-import scala.util.Random
-
 class Stack(val depth: Int) extends Module {
   val io = IO(new Bundle {
     val push    = Input(Bool())

src/main/scala/problems/VecShiftRegisterSimple.scala

@@ -15,7 +15,7 @@ class VecShiftRegisterSimple extends Module {
   })
 
   val initValues = Seq.fill(4) { 0.U(8.W) }
-  val delays = RegInit(Vec(initValues))
+  val delays = RegInit(VecInit(initValues))
 
   // Implement below ----------
 

src/main/scala/solutions/Mul.scala

@@ -21,7 +21,7 @@ class Mul extends Module {
   for (i <- 0 until 16)
     for (j <- 0 until 16)
       mulsValues += (i * j).asUInt(8.W)
-  val tbl = Vec(mulsValues)
+  val tbl = VecInit(mulsValues)
   io.z := tbl((io.x << 4.U) | io.y)
 
 }

src/main/scala/solutions/VecShiftRegisterParam.scala

@@ -16,7 +16,7 @@ class VecShiftRegisterParam(val n: Int, val w: Int) extends Module {
   })
 
   val initValues = Seq.fill(n) { 0.U(w.W) }
-  val delays = RegInit(Vec(initValues))
+  val delays = RegInit(VecInit(initValues))
 
   for (i <- n-1 to 1 by -1) {
     delays(i) := delays(i - 1)

src/main/scala/solutions/VecShiftRegisterSimple.scala

@@ -15,7 +15,7 @@ class VecShiftRegisterSimple extends Module {
   })
 
   val initValues = Seq.fill(4) { 0.U(8.W) }
-  val delays = RegInit(Vec(initValues))
+  val delays = RegInit(VecInit(initValues))
 
   delays(0) := io.in
   delays(1) := delays(0)

src/test/scala/examples/Adder4Tests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class Adder4Tests(c: Adder4) extends PeekPokeTester(c) {

src/test/scala/examples/AdderTests.scala

@@ -4,19 +4,20 @@ package examples
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class AdderTests(c: Adder) extends PeekPokeTester(c) {
-  for (t <- 0 until 4) {
-    val rnd0 = rnd.nextInt(c.n)
-    val rnd1 = rnd.nextInt(c.n)
-    val rnd2 = rnd.nextInt(1)
+  for (t <- 0 until (1 << (c.n + 1))) {
+    val rnd0 = rnd.nextInt(1 << c.n)
+    val rnd1 = rnd.nextInt(1 << c.n)
+    val rnd2 = rnd.nextInt(2)
 
     poke(c.io.A, rnd0)
     poke(c.io.B, rnd1)
     poke(c.io.Cin, rnd2)
     step(1)
     val rsum = rnd0 + rnd1 + rnd2
     val mask = BigInt("1"*c.n, 2)
+
     expect(c.io.Sum, rsum &  mask)
-    expect(c.io.Cout, rsum % 1)
+    expect(c.io.Cout,  ((1 << c.n) & rsum) >> c.n)
   }
 }
 

src/test/scala/examples/ByteSelectorTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class ByteSelectorTests(c: ByteSelector) extends PeekPokeTester(c) {

src/test/scala/examples/CombinationalTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class CombinationalTests(c: Combinational) extends PeekPokeTester(c) {

src/test/scala/examples/DarkenTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class DarkenTests(c: Darken, infile: java.io.InputStream, outfilename: String) extends PeekPokeTester(c) {

src/test/scala/examples/EnableShiftRegisterTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class EnableShiftRegisterTests(c: EnableShiftRegister) extends PeekPokeTester(c) {

src/test/scala/examples/FullAdderTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class FullAdderTests(c: FullAdder) extends PeekPokeTester(c) {

src/test/scala/examples/FunctionalityTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class FunctionalityTests(c: Functionality) extends PeekPokeTester(c) {

src/test/scala/examples/GCDTests.scala

@@ -1,5 +1,4 @@
 // See LICENSE.txt for license details.
-
 package examples
 
 import chisel3.iotesters.{ChiselFlatSpec, Driver, PeekPokeTester}

src/test/scala/examples/HiLoMultiplierTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class HiLoMultiplierTests(c: HiLoMultiplier) extends PeekPokeTester(c) {

src/test/scala/examples/Image.scala

@@ -1,8 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
-import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 import scala.io.Source
 import java.io.{File, FileOutputStream, InputStream}
 

src/test/scala/examples/LifeTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{Driver, PeekPokeTester}
 import org.scalatest.FreeSpec
 

src/test/scala/examples/LogShifterTests.scala

@@ -1,8 +1,7 @@
 // See LICENSE.txt for license details.
 package examples
 
-
-import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
+import chisel3.iotesters.PeekPokeTester
 
 class LogShifterTests(c: LogShifter) extends PeekPokeTester(c) {
 }

src/test/scala/examples/ParityTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class ParityTests(c: Parity) extends PeekPokeTester(c) {

src/test/scala/examples/ResetShiftRegisterTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class ResetShiftRegisterTests(c: ResetShiftRegister) extends PeekPokeTester(c) {

src/test/scala/examples/RouterTests.scala

@@ -1,5 +1,4 @@
 // See LICENSE for license details.
-
 package examples
 
 import chisel3._

src/test/scala/examples/ShiftRegisterTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class ShiftRegisterTests(c: ShiftRegister) extends PeekPokeTester(c) {

src/test/scala/examples/SimpleALUTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class SimpleALUTests(c: SimpleALU) extends PeekPokeTester(c) {

src/test/scala/examples/StackTests.scala

@@ -1,18 +1,16 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
-import scala.collection.mutable.HashMap
-import scala.collection.mutable.{Stack => ScalaStack}
-import scala.util.Random
+import scala.collection.mutable.{ArrayStack => ScalaStack}
 
-class StackTests(c: Stack) extends PeekPokeTester(c) {
+class StackTestsOrig(c: Stack) extends PeekPokeTester(c) {
   var nxtDataOut = 0
   var dataOut = 0
   val stack = new ScalaStack[Int]()
 
   for (t <- 0 until 16) {
+    println(s"Tick $t")
     val enable  = rnd.nextInt(2)
     val push    = rnd.nextInt(2)
     val pop     = rnd.nextInt(2)
@@ -38,6 +36,48 @@ class StackTests(c: Stack) extends PeekPokeTester(c) {
     expect(c.io.dataOut, dataOut)
   }
 }
+class StackTests(c: Stack) extends PeekPokeTester(c) {
+  var nxtDataOut = 0
+  var dataOut = 0
+  val stack = new ScalaStack[Int]()
+
+  poke(c.io.push,   0)
+  poke(c.io.pop,    1)
+  poke(c.io.dataIn, 232)
+  poke(c.io.en,     1)
+
+  step(1)
+
+  println(s"dataOut ${peek(c.io.dataOut)}")
+
+  poke(c.io.push,   1)
+  poke(c.io.pop,    1)
+  poke(c.io.dataIn, 90)
+  poke(c.io.en,     1)
+
+  step(1)
+  step(1)
+
+  println(s"dataOut ${peek(c.io.dataOut)}")
+
+  poke(c.io.push,   1)
+  poke(c.io.pop,    1)
+  poke(c.io.dataIn, 33)
+  poke(c.io.en,     1)
+
+  step(1)
+  step(1)
+
+  println(s"dataOut ${peek(c.io.dataOut)}")
+
+  poke(c.io.push,   0)
+  poke(c.io.pop,    1)
+  poke(c.io.dataIn, 22)
+  poke(c.io.en,     1)
+
+  println(s"dataOut ${peek(c.io.dataOut)}")
+  // expect(c.io.dataOut, dataOut)
+}
 
 class StackTester extends ChiselFlatSpec {
   behavior of "Stack"

src/test/scala/examples/TblTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class TblTests(c: Tbl) extends PeekPokeTester(c) {

src/test/scala/examples/VecSearchTests.scala

@@ -1,7 +1,6 @@
 // See LICENSE.txt for license details.
 package examples
 
-
 import chisel3.iotesters.{PeekPokeTester, Driver, ChiselFlatSpec}
 
 class VecSearchTests(c: VecSearch) extends PeekPokeTester(c) {

src/test/scala/utils/TutorialRunner.scala

@@ -1,5 +1,4 @@
 // See LICENSE.txt for license details.
-
 package utils
 
 import scala.collection.mutable.ArrayBuffer