Skip to content

Commit

Permalink
Update Chisel from 5.1.0 to 6.5.0 (#10)
Browse files Browse the repository at this point in the history
This just involves bumping some tool versions and resolving
deprecated-package warnings.
  • Loading branch information
tymcauley authored Jan 6, 2025
1 parent ef16400 commit e40a376
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ env:
VERILATOR_REPO: https://github.com/verilator/verilator
VERILATOR_DIR: verilator
VERILATOR_VERSION_TAG: v4.228
FIRTOOL_VERSION: v1.43.0
FIRTOOL_VERSION_TAG: firtool-1.43.0
FIRTOOL_VERSION: v1.62.0
FIRTOOL_VERSION_TAG: firtool-1.62.0

jobs:
test:
Expand All @@ -39,7 +39,7 @@ jobs:
cache: 'sbt'
- name: Install firtool ${{ env.FIRTOOL_VERSION }}
run: |
wget -q -O - "https://github.com/llvm/circt/releases/download/${{ env.FIRTOOL_VERSION_TAG }}/firrtl-bin-ubuntu-20.04.tar.gz" | tar -zx
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
- name: "Cache: Verilator ${{ env.VERILATOR_VERSION_TAG }}"
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ work just as it did before. To that end, the following classes/traits have been
* BinaryPoint, KnownBinaryPoint, UnknownBinaryPoint
* HasBinaryPoint

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

## Usage

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
scalaVersion := "2.13.10"
scalaVersion := "2.13.14"
scalacOptions += "-language:higherKinds"
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full)
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)

scalacOptions += "-Ydelambdafy:inline"
scalacOptions ++= Seq(
Expand All @@ -12,7 +12,7 @@ scalacOptions ++= Seq(
"-language:reflectiveCalls",
"-Ymacro-annotations"
)
val chiselVersion = "5.1.0"
val chiselVersion = "6.5.0"
addCompilerPlugin("org.chipsalliance" %% "chisel-plugin" % chiselVersion cross CrossVersion.full)
libraryDependencies ++= Seq(
"org.chipsalliance" %% "chisel" % chiselVersion,
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/fixedpoint/FixedPoint.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package fixedpoint
import chisel3._
import chisel3.experimental.BundleLiterals.AddBundleLiteralConstructor
import chisel3.experimental.OpaqueType
import chisel3.internal.firrtl.{KnownWidth, UnknownWidth, Width}
import chisel3.experimental.SourceInfo
import chisel3.internal.sourceinfo.{SourceInfoTransform, SourceInfoWhiteboxTransform}

Expand Down
3 changes: 1 addition & 2 deletions src/test/scala/FixedPointSpec.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: Apache-2.0

import chisel3.internal.firrtl.UnknownWidth
import circt.stage.ChiselStage
import chisel3.testers.BasicTester
import chisel3.{Mux => _, _}
Expand Down Expand Up @@ -167,7 +166,7 @@ class FixedPointUnaryFuncTester(f: FixedPoint => FixedPoint, inExpected: Seq[(Fi
inExpected.foreach {
case (in, expected) =>
val out = f(in)
assert(out === expected, f"Wrong value: in=${in}; out=${out}; expected=${expected}")
assert(out === expected, cf"Wrong value: in=${in}; out=${out}; expected=${expected}")
assert(out.widthOption == in.widthOption, f"Width changed: in=${in}; out=${out}")
assert(out.binaryPoint == in.binaryPoint, f"Binary point changed: in=${in}; out=${out}")
}
Expand Down

0 comments on commit e40a376

Please sign in to comment.