Skip to content

Commit e40a376

Browse files
authored
Update Chisel from 5.1.0 to 6.5.0 (ucb-bar#10)
This just involves bumping some tool versions and resolving deprecated-package warnings.
1 parent ef16400 commit e40a376

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ env:
2020
VERILATOR_REPO: https://github.com/verilator/verilator
2121
VERILATOR_DIR: verilator
2222
VERILATOR_VERSION_TAG: v4.228
23-
FIRTOOL_VERSION: v1.43.0
24-
FIRTOOL_VERSION_TAG: firtool-1.43.0
23+
FIRTOOL_VERSION: v1.62.0
24+
FIRTOOL_VERSION_TAG: firtool-1.62.0
2525

2626
jobs:
2727
test:
@@ -39,7 +39,7 @@ jobs:
3939
cache: 'sbt'
4040
- name: Install firtool ${{ env.FIRTOOL_VERSION }}
4141
run: |
42-
wget -q -O - "https://github.com/llvm/circt/releases/download/${{ env.FIRTOOL_VERSION_TAG }}/firrtl-bin-ubuntu-20.04.tar.gz" | tar -zx
42+
wget -q -O - "https://github.com/llvm/circt/releases/download/${{ env.FIRTOOL_VERSION_TAG }}/firrtl-bin-linux-x64.tar.gz" | tar -zx
4343
sudo mv "${{ env.FIRTOOL_VERSION_TAG }}/bin/firtool" /usr/local/bin
4444
- name: "Cache: Verilator ${{ env.VERILATOR_VERSION_TAG }}"
4545
uses: actions/cache@v3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ work just as it did before. To that end, the following classes/traits have been
1010
* BinaryPoint, KnownBinaryPoint, UnknownBinaryPoint
1111
* HasBinaryPoint
1212

13-
Currently, this library works with [Chisel v5.1.0](https://github.com/chipsalliance/chisel/releases/v5.1.0).
13+
Currently, this library works with [Chisel v6.5.0](https://github.com/chipsalliance/chisel/releases/v6.5.0).
1414

1515
## Usage
1616

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
scalaVersion := "2.13.10"
1+
scalaVersion := "2.13.14"
22
scalacOptions += "-language:higherKinds"
3-
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full)
3+
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)
44

55
scalacOptions += "-Ydelambdafy:inline"
66
scalacOptions ++= Seq(
@@ -12,7 +12,7 @@ scalacOptions ++= Seq(
1212
"-language:reflectiveCalls",
1313
"-Ymacro-annotations"
1414
)
15-
val chiselVersion = "5.1.0"
15+
val chiselVersion = "6.5.0"
1616
addCompilerPlugin("org.chipsalliance" %% "chisel-plugin" % chiselVersion cross CrossVersion.full)
1717
libraryDependencies ++= Seq(
1818
"org.chipsalliance" %% "chisel" % chiselVersion,

src/main/scala/fixedpoint/FixedPoint.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package fixedpoint
1616
import chisel3._
1717
import chisel3.experimental.BundleLiterals.AddBundleLiteralConstructor
1818
import chisel3.experimental.OpaqueType
19-
import chisel3.internal.firrtl.{KnownWidth, UnknownWidth, Width}
2019
import chisel3.experimental.SourceInfo
2120
import chisel3.internal.sourceinfo.{SourceInfoTransform, SourceInfoWhiteboxTransform}
2221

src/test/scala/FixedPointSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
22

3-
import chisel3.internal.firrtl.UnknownWidth
43
import circt.stage.ChiselStage
54
import chisel3.testers.BasicTester
65
import chisel3.{Mux => _, _}
@@ -167,7 +166,7 @@ class FixedPointUnaryFuncTester(f: FixedPoint => FixedPoint, inExpected: Seq[(Fi
167166
inExpected.foreach {
168167
case (in, expected) =>
169168
val out = f(in)
170-
assert(out === expected, f"Wrong value: in=${in}; out=${out}; expected=${expected}")
169+
assert(out === expected, cf"Wrong value: in=${in}; out=${out}; expected=${expected}")
171170
assert(out.widthOption == in.widthOption, f"Width changed: in=${in}; out=${out}")
172171
assert(out.binaryPoint == in.binaryPoint, f"Binary point changed: in=${in}; out=${out}")
173172
}

0 commit comments

Comments
 (0)