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)
 
 }