Skip to content

Commit 52b9eba

Browse files
authored
Merge pull request #29 from rameloni/update-firtool-and-surfer
Bump firtool v0.1.3 (fork) and surfer v0.3.2 (fork)
2 parents 361285d + 8c295dc commit 52b9eba

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Tywaves Surfer information
33
TYWAVES_SURFER_NAME=surfer-tywaves-demo
44
TYWAVES_SURFER_REPO=https://gitlab.com/rameloni/${TYWAVES_SURFER_NAME}.git
5-
TYWAVES_SURFER_VERSION=0.3.0
5+
TYWAVES_SURFER_VERSION=0.3.2
66
TYWAVES_SURFER_TAG=v${TYWAVES_SURFER_VERSION}-tywaves-dev-SNAPSHOT
77
TYWAVES_SURFER_BIN=surfer-tywaves
88
TYWAVES_SURFER_TARGET_NAME=${TYWAVES_SURFER_BIN}-${TYWAVES_SURFER_VERSION}
@@ -14,13 +14,13 @@ CHISEL_FORK_TAG=v6.4.2-tywaves-SNAPSHOT
1414

1515
# Circt (firtool) information
1616
CIRCT_FIRTOOL_ZIP_NAME=firtool-bin-linux-x64.tar.gz
17-
CIRCT_FORK_VERSION=0.1.1
17+
CIRCT_FORK_VERSION=0.1.3
1818
CIRCT_FORK_TAG=v${CIRCT_FORK_VERSION}-tywaves-SNAPSHOT
1919
CIRCT_FORK_FIRTOOL_ZIP_LINK=https://github.com/rameloni/circt/releases/download/${CIRCT_FORK_TAG}/${CIRCT_FIRTOOL_ZIP_NAME}
2020
CIRCT_FIRTOOL_NAME=firtool-type-dbg-info-${CIRCT_FORK_VERSION}
2121
CIRCT_FIRTOOL_INSTALL_PATH=$(HOME)/.local/bin/
2222

23-
all: install-surfer-tywaves install-chisel-fork install-firtool-fork-bin clean install-tywaves-backend
23+
all: install-surfer-tywaves install-chisel-fork install-firtool-fork-bin clean install-tywaves-chisel-api
2424

2525
create-tmp:
2626
@mkdir -p tmp/

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,25 +215,26 @@ The following list shows a summary of the features added by the Tywaves project
215215
- [x] Chisel data types representation (basic):
216216
- [x] Hierarchical structures of bundles
217217
- [x] Vectors
218-
- [ ] Enums
218+
- [x] Enums
219219
- [x] Hierarchical modules (modules with children)
220220
- [x] Generic submodules (all different types of modules)
221221
- [x] Variants of the same module (i.e. parametric module)
222222
- [x] Instances of the same module
223223
- [ ] Chisel data types representation (advanced):
224224
- [ ] Type visualization for module instances (scopes in the waveform viewer)
225225
- [ ] Constructor parameters for both signals and modules
226-
- [ ] Selectable signal value rendering (with type information attached)
226+
- [x] Selectable signal value rendering (with type information attached)
227227
- [ ] Automatic/custom signal value rendering
228228
- [ ] For loops code generation
229+
- [ ] Temporary values (also inside `when` and `otherwise` blocks)
229230

230231
# Versioning and tools ([ref](https://github.com/rameloni/tywaves-chisel-demo/wiki/Tywaves-internals#tywaves-software-architecture))
231232

232233
Use the new name of the library in your sbt dependencies: `com.github.rameloni::tywaves-chisel-api:<version>`.
233234

234235
| Release | Chisel fork version (from `rameloni/chisel`) | Firtool fork version (from `rameloni/circt`) | Tywaves-rs version | Surfer-tywaves version |
235236
|:-----------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------|:------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------|
236-
| 0.3.1-SNAPSHOT (_coming soon_) | [v6.4.2-tywaves-SNAPSHOT](https://github.com/rameloni/chisel/releases/tag/v6.4.2-tywaves-SNAPSHOT) | [v0.1.1](https://github.com/rameloni/circt/releases/tag/v0.1.1-tywaves-SNAPSHOT) | [v0.1.2](https://github.com/rameloni/tywaves-rs/releases/tag/v0.1.2-SNAPSHOT) | [v0.3.1-tywaves-dev-SNAPSHOT]() _COMING SOON_ |
237+
| [0.4.0-SNAPSHOT]() _coming soon_ | [v6.4.3-tywaves-SNAPSHOT]() _coming soon_ | [v0.1.3](https://github.com/rameloni/circt/releases/tag/v0.1.3-tywaves-SNAPSHOT) | [v0.1.4](https://github.com/rameloni/tywaves-rs/releases/tag/v0.1.4-SNAPSHOT) | [v0.3.2-tywaves-dev-SNAPSHOT](https://gitlab.com/rameloni/surfer-tywaves-demo/-/releases/v0.3.2-tywaves-SNAPSHOT) |
237238
| [0.3.0-SNAPSHOT](https://github.com/rameloni/tywaves-chisel-demo/releases/tag/v0.3.0-SNAPSHOT) | [v6.4.2-tywaves-SNAPSHOT](https://github.com/rameloni/chisel/releases/tag/v6.4.2-tywaves-SNAPSHOT) | [v0.1.1](https://github.com/rameloni/circt/releases/tag/v0.1.1-tywaves-SNAPSHOT) | [v0.1.1](https://github.com/rameloni/tywaves-rs/releases/tag/v0.1.1-SNAPSHOT) | [v0.3.0-tywaves-dev-SNAPSHOT](https://gitlab.com/rameloni/surfer-tywaves-demo/-/releases/v0.3.0-tywaves-dev-SNAPSHOT) |
238239

239240
## Old backend implementations ([ref](https://github.com/rameloni/tywaves-chisel-demo/wiki/An-alternative-solution-(old-demo-version)))

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ val chiselVersion = "6.4.2-tywaves-SNAPSHOT" // Local version of chisel
22
val scalatestVersion = "3.2.16"
33
val circeVersion = "0.14.6"
44

5-
val firtoolVersion = "0.1.1"
5+
val firtoolVersion = "0.1.3"
66
val firtoolFullName = "firtool-type-dbg-info-" ++ firtoolVersion
77

8-
val surferTywavesVersion = "0.3.0"
8+
val surferTywavesVersion = "0.3.2-dev"
99
val surferTywavesFullName = "surfer-tywaves-" ++ surferTywavesVersion
1010

1111
Compile / scalaSource := baseDirectory.value / "src/main/scala"
1212

1313
Test / scalaSource := baseDirectory.value / "src/test/scala"
1414

1515
ThisBuild / organization := "com.github.rameloni"
16-
ThisBuild / version := "0.3.0-SNAPSHOT"
16+
ThisBuild / version := "0.4.0-SNAPSHOT-dev"
1717
ThisBuild / scalaVersion := "2.13.14"
1818

1919
enablePlugins(ScalafmtPlugin)

0 commit comments

Comments
 (0)