Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
run: source .github/workflows/tools.sh && install_packages

- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-v2
restore-keys: |
${{ runner.os }}-pip-

- name: Cache SBT
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.ivy2/cache
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Cache tools
id: tools
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/tools
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RISCV_GCC=$(RISCV)/bin/$(RISCV_HOST)-gcc
RISCV_OBJCOPY=$(RISCV)/bin/$(RISCV_HOST)-objcopy
RISCV_OBJDUMP=$(RISCV)/bin/$(RISCV_HOST)-objdump
# Verilator
VERILATOR_VERSION_NAX=v4.216
VERILATOR_VERSION_NAX=v4.228
VERILATOR_ROOT_NAX=$(TOOLCHAIN_DIR)/verilator-$(VERILATOR_VERSION_NAX)
# ELFIO
ELFIO_VERSION=d251da09a07dff40af0b63b8f6c8ae71d2d1938d # Avoid C++17
Expand Down Expand Up @@ -158,7 +158,7 @@ clean-gen:
clean-all: clean-install clean-sim clean-workspace clean-exec clean-gen
rm -rf $(TOOLCHAIN_DIR)/openjdk
rm -rf $(TOOLCHAIN_DIR)/sbt
rm -rf $(TOOLCHAIN_DIR)/verilator-$(VERILATOR_VERSION_NAX)
rm -rf $(TOOLCHAIN_DIR)/verilator-*
rm -rf $(SPIKE_DIR)
rm -rf $(RVLS_DIR)
rm -rf $(CORE_DIR)/ext/SpinalHDL
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/naxriscv/NaxRiscvRegression.scala
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class NaxRiscvRegression extends MultithreadedFunSuite(sys.env.getOrElse("NAXRIS
val updatedEnv = HeavyLock.synchronized {
// Verilator configuration
val verilatorRoot = {
val base = new File("toolchain/verilator-v4.216")
val base = new File("toolchain/verilator-v4.228")
val canonical = base.getCanonicalFile
if (!canonical.exists()) throw new Exception(s"Verilator missing at ${canonical.getAbsolutePath}")
canonical.getAbsolutePath
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/naxriscv/NaxRiscvRvls.scala
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ import scala.util.Random

// Verify and configure Verilator installation
val verilatorRoot = {
val base = new File("toolchain/verilator-v4.216")
val base = new File("toolchain/verilator-v4.228")
val canonical = base.getCanonicalFile
if (!canonical.exists()) throw new Exception(s"Verilator missing at ${canonical.getAbsolutePath}")
canonical.getAbsolutePath
Expand Down