Merge branch 'master' into 1.1.1

Author: ucbjrl

.travis.yml

@@ -14,12 +14,14 @@ env:
     INSTALL_DIR=$TRAVIS_BUILD_DIR/install
     VERILATOR_ROOT=$INSTALL_DIR
     PATH=$PATH:$VERILATOR_ROOT/bin:$TRAVIS_BUILD_DIR/utils/bin
+    CHISEL3=3.1.1
+    CHISEL_TESTERS=1.2.1
 
 install:
   # Install dependencies
   - bash .install_verilator.sh
   - verilator --version
 
 script:
-  - sbt test | sed '/info/,+1 d'
+  - set -o pipefail && sbt -Dchisel3Version=$CHISEL3 -Dchisel-iotestersVersion=$CHISEL_TESTERS test
 

README.md

@@ -180,6 +180,6 @@ Some useful typeclasses:
 
 ----------
 
-This code is maintained by [Chick](https://github.com/chick) [Angie](https://github.com/shunshou) and [Paul](https://github.com/grebe). Let us know if you have any questions/feedback!
+This code is maintained by [Chick](https://github.com/chick), [Angie](https://github.com/shunshou) and [Paul](https://github.com/grebe). Let us know if you have any questions/feedback!
 
 Copyright (c) 2015 - 2016 The Regents of the University of California. Released under the Modified (3-clause) BSD license.

build.sbt

@@ -36,7 +36,7 @@ name := "dsptools"
 
 organization := "edu.berkeley.cs"
 
-version := "1.1.0"
+version := "1.1.1"
 
 scalaVersion := "2.11.12"
 
@@ -55,8 +55,8 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-language:refle
 
 // Provide a managed dependency on X if -DXVersion="" is supplied on the command line.
 val defaultVersions = Map(
-  "chisel3" -> "3.1.0",
-  "chisel-iotesters" -> "1.2.0"
+  "chisel3" -> "3.1.1",
+  "chisel-iotesters" -> "1.2.1"
 )
 
 libraryDependencies ++= Seq(
@@ -67,7 +67,7 @@ libraryDependencies ++= Seq(
 )
 
 javacOptions ++= javacOptionsVersion(scalaVersion.value)
-    
+
 publishMavenStyle := true
 
 publishArtifact in Test := false

src/main/scala/dsptools/numbers/blackbox_compatibility/DspRealFirrtlInterpBB.scala

@@ -18,7 +18,7 @@ abstract class DspRealTwoArgumentToDouble extends BlackBoxImplementation {
 
   def outputDependencies(outputName: String): Seq[(String)] = {
     outputName match {
-      case "out" => Seq(fullName("in1"), fullName("in2"))
+      case "out" => Seq("in1", "in2")
       case _ => Seq.empty
     }
   }
@@ -44,7 +44,7 @@ abstract class DspRealOneArgumentToDouble extends BlackBoxImplementation {
 
   def outputDependencies(outputName: String): Seq[(String)] = {
     outputName match {
-      case "out" => Seq(fullName("in"))
+      case "out" => Seq("in")
       case _ => Seq.empty
     }
   }
@@ -70,7 +70,7 @@ abstract class DspRealTwoArgumentToBoolean extends BlackBoxImplementation {
 
   def outputDependencies(outputName: String): Seq[(String)] = {
     outputName match {
-      case "out" => Seq(fullName("in1"), fullName("in2"))
+      case "out" => Seq("in1", "in2")
       case _ => Seq.empty
     }
   }
@@ -220,7 +220,7 @@ class DspRealATanh(val name: String)  extends DspRealOneArgumentToDouble {
 class DspRealToInt(val name: String) extends BlackBoxImplementation {
   def outputDependencies(outputName: String): Seq[(String)] = {
     outputName match {
-      case "out" => Seq(fullName("in"))
+      case "out" => Seq("in")
       case _ => Seq.empty
     }
   }
@@ -235,7 +235,7 @@ class DspRealToInt(val name: String) extends BlackBoxImplementation {
 class DspRealFromInt(val name: String) extends BlackBoxImplementation {
   def outputDependencies(outputName: String): Seq[(String)] = {
     outputName match {
-      case "out" => Seq(fullName("in"))
+      case "out" => Seq("in")
       case _ => Seq.empty
     }
   }

src/main/scala/dsptools/numbers/chisel_types/DspRealTypeClass.scala

@@ -102,7 +102,7 @@ trait BinaryRepresentationDspReal extends BinaryRepresentation[DspReal] with has
   def shl(a: DspReal, n: UInt): DspReal = {
     require(n.widthKnown, "n Width must be known for shl with DspReal")
     val max = (1 << n.getWidth) - 1
-    val lut = Vec((0 to max).map(x => DspReal(math.pow(2, x))))
+    val lut = VecInit((0 to max).map(x => DspReal(math.pow(2, x))))
     a * lut(n)
   }
   // mul2 consistent with shl

src/main/scala/dsptools/tester/DspTester.scala

@@ -197,7 +197,7 @@ class DspTester[T <: Module](
       }
       // UInt + SInt = Bits
       case _: Bits => (bi.doubleValue, bi)
-      case _ => throw DspException("Peeked node ${getName(node)} has incorrect type ${node.getClass.getName}")
+      case _ => throw DspException(s"Peeked node ${getName(node)} has incorrect type ${node.getClass.getName}")
     }
     if (dispDsp) logger info s"  PEEK ${getName(node)} -> $dblOut, ${bitInfo(node)}"
     (dblOut, bigIntOut)

src/test/scala/dsptools/ShiftRegisterDelaySpec.scala

@@ -67,10 +67,12 @@ class CircuitWithDelaysTester[T <: Data : Signed](c: AbsCircuitWithDelays[T]) ex
     }
   }
 
-  reset()
-  poke(c.io.in, 0.0)
-  step(10)
-  oneTest()
+  updatableDspVerbose.withValue(false) {
+    reset()
+    poke(c.io.in, 0.0)
+    step(10)
+    oneTest()
+  }
 }
 
 class CeilTruncateTester(c: CeilTruncateCircuitWithDelays) extends DspTester(c) {
@@ -101,11 +103,13 @@ class CeilTruncateTester(c: CeilTruncateCircuitWithDelays) extends DspTester(c)
     }
   }
 
-  poke(c.io.inFixed, 0.0)
-  poke(c.io.inReal, 0.0)
-  reset()
-  step(10)
-  oneTest(c.io.inFixed, c.io.outFixedCeil, c.io.inReal, c.io.outRealCeil, delaySize)
+  updatableDspVerbose.withValue(false) {
+    poke(c.io.inFixed, 0.0)
+    poke(c.io.inReal, 0.0)
+    reset()
+    step(10)
+    oneTest(c.io.inFixed, c.io.outFixedCeil, c.io.inReal, c.io.outRealCeil, delaySize)
+  }
 }
 
 class ShiftRegisterDelaySpec extends FreeSpec with Matchers {

src/test/scala/dsptools/VerboseDspTesterSpec/SimpleTBwGenTypeOption.scala

@@ -79,7 +79,7 @@ case class TestParams(
 }
 
 class DataTypeBundle[R <: Data:Real](genType: R, dataWidth: Width, binaryPoint: BinaryPoint) extends Bundle {
-  val gen = genType.chiselCloneType
+  val gen = genType.cloneType
   val s = SInt(dataWidth)
   val f = FixedPoint(dataWidth, binaryPoint)
   val u = UInt(dataWidth)
@@ -338,7 +338,7 @@ object TestSetup {
       dspTesterOptions = DspTesterOptions(
           fixTolLSBs = 1,
           genVerilogTb = false,
-          isVerbose = true)
+          isVerbose = false)
       testerOptions = testerOptionsGlobal
     }
 

src/test/scala/dsptools/numbers/FixedPointSpec.scala

@@ -29,14 +29,16 @@ class FixedRing1(val width: Int, val binaryPoint: Int) extends Module {
 
 class FixedRing1Tester(c: FixedRing1) extends DspTester(c) {
   val increment: Double = if(c.binaryPoint == 0) 1.0 else 1.0 / (1 << c.binaryPoint)
-  for(i <- -2.0 to 3.0 by increment) {
-    poke(c.io.in, i)
-
-    expect(c.io.floor, breeze.numerics.floor(i), s"floor of $i should be ${breeze.numerics.floor(i)}")
-    expect(c.io.ceil, breeze.numerics.ceil(i), s"ceil of $i should be ${breeze.numerics.ceil(i)}")
-    expect(c.io.isWhole, breeze.numerics.floor(i) == i , s"isWhole of $i should be ${breeze.numerics.floor(i) == i}")
-    expect(c.io.round, breeze.numerics.round(i), s"round of $i should be ${breeze.numerics.round(i)}")
-    step(1)
+  updatableDspVerbose.withValue(false) {
+    for(i <- -2.0 to 3.0 by increment) {
+      poke(c.io.in, i)
+
+      expect(c.io.floor, breeze.numerics.floor(i), s"floor of $i should be ${breeze.numerics.floor(i)}")
+      expect(c.io.ceil, breeze.numerics.ceil(i), s"ceil of $i should be ${breeze.numerics.ceil(i)}")
+      expect(c.io.isWhole, breeze.numerics.floor(i) == i , s"isWhole of $i should be ${breeze.numerics.floor(i) == i}")
+      expect(c.io.round, breeze.numerics.round(i), s"round of $i should be ${breeze.numerics.round(i)}")
+      step(1)
+    }
   }
 }
 
@@ -95,34 +97,38 @@ class FixedPointShiftTester(c: FixedPointShifter) extends DspTester(c) {
     val z = y / factor
     z
   }
-  poke(c.io.dynamicShiftValue, 0)
+  updatableDspVerbose.withValue(false) {
 
-  private val (minSIntValue, maxSIntValue) = firrtl_interpreter.extremaOfSIntOfWidth(c.width)
+    poke(c.io.dynamicShiftValue, 0)
 
-  private val minValue = minSIntValue.toDouble * increment
-  private val maxValue = maxSIntValue.toDouble * increment
+    val (minSIntValue, maxSIntValue) = firrtl_interpreter.extremaOfSIntOfWidth(c.width)
 
-  for(value <- minValue to maxValue by increment) {
-    poke(c.io.inValue, value)
-    expect(c.io.shiftLeftResult, expectedValue(value, left = true, c.fixedShiftSize),
-      s"shift left ${c.fixedShiftSize} of $value should be ${expectedValue(value, left = true, c.fixedShiftSize)}")
-    c.io.shiftRightResult.foreach { sro =>
-      expect(sro, expectedValue(value, left = false, c.fixedShiftSize),
-        s"shift right ${c.fixedShiftSize} of $value should be ${expectedValue(value, left = false, c.fixedShiftSize)}")
-    }
+    val minValue = minSIntValue.toDouble * increment
+    val maxValue = maxSIntValue.toDouble * increment
 
-    step(1)
+    for(value <- minValue to maxValue by increment) {
+      poke(c.io.inValue, value)
+      expect(c.io.shiftLeftResult, expectedValue(value, left = true, c.fixedShiftSize),
+        s"shift left ${c.fixedShiftSize} of $value should be ${expectedValue(value, left = true, c.fixedShiftSize)}")
+      c.io.shiftRightResult.foreach { sro =>
+        expect(sro, expectedValue(value, left = false, c.fixedShiftSize),
+          s"shift right ${c.fixedShiftSize} of $value should be ${expectedValue(value, left = false, c.fixedShiftSize)}")
+      }
 
-    for(dynamicShiftValue <- 0 until c.width) {
-      poke(c.io.dynamicShiftValue, dynamicShiftValue)
       step(1)
-      expect(c.io.dynamicShiftLeftResult, expectedValue(value, left = true, dynamicShiftValue),
-        s"dynamic shift left $dynamicShiftValue of $value should " +
-          s"be ${expectedValue(value, left = true, dynamicShiftValue)}")
-      expect(c.io.dynamicShiftRightResult, expectedValue(value, left = false, dynamicShiftValue),
-        s"dynamic shift right $dynamicShiftValue of $value should" +
-          s"be ${expectedValue(value, left = false, dynamicShiftValue)}")
+
+      for(dynamicShiftValue <- 0 until c.width) {
+        poke(c.io.dynamicShiftValue, dynamicShiftValue)
+        step(1)
+        expect(c.io.dynamicShiftLeftResult, expectedValue(value, left = true, dynamicShiftValue),
+          s"dynamic shift left $dynamicShiftValue of $value should " +
+            s"be ${expectedValue(value, left = true, dynamicShiftValue)}")
+        expect(c.io.dynamicShiftRightResult, expectedValue(value, left = false, dynamicShiftValue),
+          s"dynamic shift right $dynamicShiftValue of $value should" +
+            s"be ${expectedValue(value, left = false, dynamicShiftValue)}")
+      }
     }
+
   }
 }
 
@@ -138,10 +144,12 @@ class BrokenShifter(n: Int) extends Module {
 }
 
 class BrokenShifterTester(c: BrokenShifter) extends DspTester(c) {
-  poke(c.io.i, 1.5)
-  peek(c.io.o)
-  poke(c.io.si, 6)
-  peek(c.io.so)
+  updatableDspVerbose.withValue(false) {
+    poke(c.io.i, 1.5)
+    peek(c.io.o)
+    poke(c.io.si, 6)
+    peek(c.io.so)
+  }
 }
 
 class FixedPointSpec extends FreeSpec with Matchers {

src/test/scala/dsptools/numbers/ParameterizedOpSpec.scala

@@ -50,13 +50,15 @@ class ParameterizedOpTester[T<:Data:Ring](c: ParameterizedNumberOperation[T]) ex
       case "*" => i * j
       case _ => i + j
     }
-    poke(c.io.a1, i)
-    poke(c.io.a2, j)
-    step(1)
+    updatableDspVerbose.withValue(false) {
+      poke(c.io.a1, i)
+      poke(c.io.a2, j)
+      step(1)
 
-    val result = peek(c.io.c)
+      val result = peek(c.io.c)
 
-    expect(c.io.c, expected, s"$i ${c.op} $j => $result, should have been $expected")
+      expect(c.io.c, expected, s"$i ${c.op} $j => $result, should have been $expected")
+    }
   }
 }
 
@@ -110,13 +112,15 @@ class ComplexOpTester[T<:DspComplex[_]](c: ParameterizedNumberOperation[T]) exte
       case "*" => c1 * c2
       case _ => c1 + c2
     }
-    poke(c.io.a1, c1)
-    poke(c.io.a2, c2)
-    step(1)
+    updatableDspVerbose.withValue(false) {
+      poke(c.io.a1, c1)
+      poke(c.io.a2, c2)
+      step(1)
 
-    val result = peek(c.io.c)
+      val result = peek(c.io.c)
 
-    expect(c.io.c, expected, s"$i ${c.op} $j => $result, should have been $expected")
+      expect(c.io.c, expected, s"$i ${c.op} $j => $result, should have been $expected")
+    }
   }
 }
 

src/test/scala/examples/ParameterizedAdderSpec.scala

@@ -25,17 +25,19 @@ class ParameterizedAdder[T <: Data:Ring](gen:() => T) extends Module {
 }
 
 class ParameterizedAdderTester[T<:Data:Ring](c: ParameterizedAdder[T]) extends DspTester(c) {
-  for {
-    i <- -2.0 to 1.0 by 0.25
-    j <- -2.0 to 4.0 by 0.5
-  } {
-    poke(c.io.a1, i)
-    poke(c.io.a2, j)
-    step(1)
-
-    val result = peek(c.io.c)
-
-    expect(c.io.c, i + j, s"parameterize adder tester $i + $j => $result should have been ${i + j}")
+  updatableDspVerbose.withValue(false) {
+    for {
+      i <- -2.0 to 1.0 by 0.25
+      j <- -2.0 to 4.0 by 0.5
+    } {
+      poke(c.io.a1, i)
+      poke(c.io.a2, j)
+      step(1)
+
+      val result = peek(c.io.c)
+
+      expect(c.io.c, i + j, s"parameterize adder tester $i + $j => $result should have been ${i + j}")
+    }
   }
 }
 

src/test/scala/examples/TransposedStreamFIRSpec.scala

@@ -61,7 +61,7 @@ class TransposedStreamFIRSpec extends FlatSpec with Matchers {
   "ConstantTapTransposedStreamingFIR" should "compute a running average like thing" in {
     val taps = 0 until 3
 
-    chisel3.iotesters.Driver.execute(Array("--is-verbose"),
+    chisel3.iotesters.Driver.execute(Array[String](),
       () => new ConstantTapTransposedStreamingFIR(SInt(10.W), SInt(16.W), taps)) {
       c => new ConstantTapTransposedStreamingTester(c)
     } should be (true)