Update Chisel from 6.5.0 to 7.0.0

`UnknownWidth` became a `case object` in this Chisel PR:
chipsalliance/chisel#4242

The `connectFromBits` method was removed in this Chisel PR:
chipsalliance/chisel#4168

The `connectFromBits` API was replaced with the `_fromUInt` API in this
Chisel PR: chipsalliance/chisel#4782

The `NumObject` trait was replaced by the `Num` object in this PR:
chipsalliance/chisel#4768

Wrapping unary negation (`unary_-%`) was deprecated in this PR:
chipsalliance/chisel#4829

The sbt update is necessary to maintain compatibility with the latest
Scala compiler version.

Author: tymcauley

.github/workflows/test.yml

@@ -20,8 +20,7 @@ env:
   VERILATOR_REPO: https://github.com/verilator/verilator
   VERILATOR_DIR: verilator
   VERILATOR_VERSION_TAG: v4.228
-  FIRTOOL_VERSION: v1.62.0
-  FIRTOOL_VERSION_TAG: firtool-1.62.0
+  FIRTOOL_VERSION_TAG: firtool-1.111.1
 
 jobs:
   test:
@@ -37,7 +36,7 @@ jobs:
         java-version: ${{ env.JDK_VERSION }}
         distribution: ${{ env.JDK_DIST }}
         cache: 'sbt'
-    - name: Install firtool ${{ env.FIRTOOL_VERSION }}
+    - name: Install firtool ${{ env.FIRTOOL_VERSION_TAG }}
       run: |
         wget -q -O - "https://github.com/llvm/circt/releases/download/${{ env.FIRTOOL_VERSION_TAG }}/firrtl-bin-linux-x64.tar.gz" | tar -zx
         sudo mv "${{ env.FIRTOOL_VERSION_TAG }}/bin/firtool" /usr/local/bin

build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.16"
 scalacOptions += "-language:higherKinds"
 addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)
 
@@ -12,12 +12,13 @@ scalacOptions ++= Seq(
   "-language:reflectiveCalls",
   "-Ymacro-annotations"
 )
-val chiselVersion = "6.5.0"
+val chiselVersion = "7.0.0-M2+638-b1254a56-SNAPSHOT"
 addCompilerPlugin("org.chipsalliance" %% "chisel-plugin" % chiselVersion cross CrossVersion.full)
 libraryDependencies ++= Seq(
   "org.chipsalliance" %% "chisel" % chiselVersion,
   "org.scalatest" %% "scalatest" % "3.2.15" % "test",
   "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
 )
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 
 Test / parallelExecution := false

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.10.7

src/main/scala/fixedpoint/FixedPoint.scala

@@ -21,12 +21,13 @@ import chisel3.internal.sourceinfo.{SourceInfoTransform, SourceInfoWhiteboxTrans
 
 import scala.collection.immutable.SeqMap
 import scala.language.experimental.macros
+import scala.math.BigDecimal.RoundingMode.RoundingMode
 import chisel3.util.Cat
 
-object FixedPoint extends NumObject {
+object FixedPoint {
 
   /** Create a FixedPoint type with inferred width. */
-  def apply(): FixedPoint = apply(UnknownWidth(), BinaryPoint())
+  def apply(): FixedPoint = apply(UnknownWidth, BinaryPoint())
 
   /** Create a FixedPoint type or port with fixed width. */
   def apply(width: Width, binaryPoint: BinaryPoint): FixedPoint = new FixedPoint(width, binaryPoint)
@@ -42,15 +43,15 @@ object FixedPoint extends NumObject {
     * Use PrivateObject to force users to specify width and binaryPoint by name
     */
   def fromBigInt(value: BigInt, binaryPoint: BinaryPoint = 0.BP): FixedPoint = {
-    apply(value, UnknownWidth(), binaryPoint)
+    apply(value, UnknownWidth, binaryPoint)
   }
 
   /** Create a FixedPoint literal with inferred width from BigInt.
     * Use PrivateObject to force users to specify width and binaryPoint by name
     */
   def fromBigInt(value: BigInt, width: Int, binaryPoint: Int): FixedPoint =
     if (width == -1) {
-      apply(value, UnknownWidth(), BinaryPoint(binaryPoint))
+      apply(value, UnknownWidth, BinaryPoint(binaryPoint))
     } else {
       apply(value, KnownWidth(width), BinaryPoint(binaryPoint))
     }
@@ -60,7 +61,7 @@ object FixedPoint extends NumObject {
     */
   def fromDouble(value: Double, width: Width, binaryPoint: BinaryPoint): FixedPoint = {
     fromBigInt(
-      toBigInt(value, binaryPoint.get),
+      FixedPoint.toBigInt(value, binaryPoint.get),
       width = width,
       binaryPoint = binaryPoint
     )
@@ -71,7 +72,7 @@ object FixedPoint extends NumObject {
     */
   def fromBigDecimal(value: BigDecimal, width: Width, binaryPoint: BinaryPoint): FixedPoint = {
     fromBigInt(
-      toBigInt(value, binaryPoint.get),
+      FixedPoint.toBigInt(value, binaryPoint.get),
       width = width,
       binaryPoint = binaryPoint
     )
@@ -83,6 +84,14 @@ object FixedPoint extends NumObject {
     new FixedPoint(_width, binaryPoint).Lit(_.data -> value.S(_width))
   }
 
+  // Delegate to `chisel3.Num` methods that used to be in `chisel3.NumObject` trait. See chipsalliance/chisel#4768.
+  def toBigInt(x: Double, binaryPoint: Int): BigInt     = Num.toBigInt(x, binaryPoint)
+  def toBigInt(x: BigDecimal, binaryPoint: Int): BigInt = Num.toBigInt(x, binaryPoint)
+  def toBigInt(x: BigDecimal, binaryPoint: Int, roundingMode: RoundingMode): BigInt =
+    Num.toBigInt(x, binaryPoint, roundingMode)
+  def toDouble(i: BigInt, binaryPoint: Int): Double             = Num.toDouble(i, binaryPoint)
+  def toBigDecimal(value: BigInt, binaryPoint: Int): BigDecimal = Num.toBigDecimal(value, binaryPoint)
+
   /** Create a FixedPoint bundle with its data port connected to an SInt literal
     */
   private[fixedpoint] def fromData(
@@ -103,7 +112,7 @@ object FixedPoint extends NumObject {
   }
 
   private[fixedpoint] def recreateWidth[T <: Data](d: T): Width = {
-    d.widthOption.fold[Width](UnknownWidth())(_.W)
+    d.widthOption.fold[Width](UnknownWidth)(_.W)
   }
 
   /** Align all FixedPoints in a (possibly heterogeneous) sequence by width and binary point
@@ -145,7 +154,7 @@ object FixedPoint extends NumObject {
 
     implicit class fromDoubleToLiteral(double: Double) {
       def F(binaryPoint: BinaryPoint): FixedPoint = {
-        FixedPoint.fromDouble(double, UnknownWidth(), binaryPoint)
+        FixedPoint.fromDouble(double, UnknownWidth, binaryPoint)
       }
 
       def F(width: Width, binaryPoint: BinaryPoint): FixedPoint = {
@@ -155,7 +164,7 @@ object FixedPoint extends NumObject {
 
     implicit class fromBigDecimalToLiteral(bigDecimal: BigDecimal) {
       def F(binaryPoint: BinaryPoint): FixedPoint = {
-        FixedPoint.fromBigDecimal(bigDecimal, UnknownWidth(), binaryPoint)
+        FixedPoint.fromBigDecimal(bigDecimal, UnknownWidth, binaryPoint)
       }
 
       def F(width: Width, binaryPoint: BinaryPoint): FixedPoint = {
@@ -223,8 +232,6 @@ sealed class FixedPoint private[fixedpoint] (width: Width, private var _inferred
 
   def do_unary_-(implicit sourceInfo: SourceInfo): FixedPoint = FixedPoint.fromData(binaryPoint, -data)
 
-  def do_unary_-%(implicit sourceInfo: SourceInfo): FixedPoint = FixedPoint.fromData(binaryPoint, data.unary_-%)
-
   override def do_*(that: FixedPoint)(implicit sourceInfo: SourceInfo): FixedPoint =
     FixedPoint.fromData(binaryPoint + that.binaryPoint, data * that.data)
 
@@ -325,8 +332,10 @@ sealed class FixedPoint private[fixedpoint] (width: Width, private var _inferred
 
   override def bulkConnect(that: Data)(implicit sourceInfo: SourceInfo): Unit = connectOp(that, _ <> _)
 
-  override def connectFromBits(that: Bits)(implicit sourceInfo: SourceInfo): Unit = {
-    this.data := that.asTypeOf(this.data)
+  override protected def _fromUInt(that: UInt)(implicit sourceInfo: SourceInfo): Data = {
+    val _w = Wire(this.cloneType)
+    _w.data := that.asTypeOf(this.data)
+    _w
   }
 
   def apply(x: BigInt): Bool = data.apply(x)

src/test/scala/FixedPointSpec.scala

@@ -76,9 +76,9 @@ class FixedPointFromBitsTester extends BasicTester {
   val f6bp0 = 6.0.F(0.BP)
   val f6bp2 = 6.0.F(2.BP)
 
-  val f1bp5shiftleft2 = Wire(FixedPoint(UnknownWidth(), BinaryPoint()))
-  val f6bp0shiftright2 = Wire(FixedPoint(UnknownWidth(), BinaryPoint()))
-  val f6bp2shiftright2 = Wire(FixedPoint(UnknownWidth(), BinaryPoint()))
+  val f1bp5shiftleft2 = Wire(FixedPoint(UnknownWidth, BinaryPoint()))
+  val f6bp0shiftright2 = Wire(FixedPoint(UnknownWidth, BinaryPoint()))
+  val f6bp2shiftright2 = Wire(FixedPoint(UnknownWidth, BinaryPoint()))
 
   f1bp5shiftleft2 := f1bp5 << 2
   f6bp0shiftright2 := f6bp0 >> 2