Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bender: Update to version 0.28.1 #175

Merged
merged 3 commits into from
Sep 28, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
submodules: 'recursive'
- name: Hash Verilator prerequisites
id: verilator-hash
uses: colluca/list-make-prerequisites@v1.0.1
uses: colluca/list-make-prerequisites@v1.0.2
with:
working-directory: target/snitch_cluster
target: bin/snitch_cluster.vlt
Expand Down
2 changes: 1 addition & 1 deletion iis-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

# Define environment variables
export BENDER=bender-0.27.1
export BENDER=bender-0.28.1
export CC=gcc-9.2.0
export CXX=g++-9.2.0
export VCS_SEPP=vcs-2020.12
Expand Down
4 changes: 2 additions & 2 deletions sw/apps/doitgen/scripts/datagen.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def emit_header(self, **kwargs):

self.validate(**kwargs)

A = du.generate_random_array((kwargs['r'], kwargs['q'], kwargs['s']))
x = du.generate_random_array((kwargs['s'], kwargs['s']))
A = du.generate_random_array((kwargs['r'], kwargs['q'], kwargs['s']), seed=42)
x = du.generate_random_array((kwargs['s'], kwargs['s']), seed=42)

_ = self.golden_model(A, x)

Expand Down
12 changes: 7 additions & 5 deletions target/common/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ VLT_ROOT ?= ${VERILATOR_ROOT}
VLT_JOBS ?= $(shell nproc)
VLT_NUM_THREADS ?= 1

MATCH_REMOVE := 's/+incdir+\/[^ ]*//g'
SED_SRCS := sed -e ${MATCH_REMOVE}
MATCH_END := '/+incdir+/ s/$$/\/*\/*/'
MATCH_BGN := 's/+incdir+//g'
MATCH_DEF := '/+define+/d'
SED_SRCS := sed -e ${MATCH_END} -e ${MATCH_BGN} -e ${MATCH_DEF}

COMMON_BENDER_FLAGS += -t rtl

VSIM_BENDER += $(COMMON_BENDER_FLAGS) -t test -t simulation -t vsim
VSIM_SOURCES = $(shell ${BENDER} script flist ${VSIM_BENDER} | ${SED_SRCS})
VSIM_SOURCES = $(shell ${BENDER} script flist-plus ${VSIM_BENDER} | ${SED_SRCS})
VSIM_BUILDDIR ?= work-vsim
VSIM_FLAGS += -t 1ps
ifeq ($(DEBUG), ON)
Expand All @@ -66,15 +68,15 @@ endif
# VCS_BUILDDIR should to be the same as the `DEFAULT : ./work-vcs`
# in target/snitch_cluster/synopsys_sim.setup
VCS_BENDER += $(COMMON_BENDER_FLAGS) -t test -t simulation -t vcs
VCS_SOURCES = $(shell ${BENDER} script flist ${VCS_BENDER} | ${SED_SRCS})
VCS_SOURCES = $(shell ${BENDER} script flist-plus ${VCS_BENDER} | ${SED_SRCS})
VCS_BUILDDIR := work-vcs

# fesvr is being installed here
FESVR ?= ${MKFILE_DIR}work
FESVR_VERSION ?= 35d50bc40e59ea1d5566fbd3d9226023821b1bb6

VLT_BENDER += $(COMMON_BENDER_FLAGS) -DCOMMON_CELLS_ASSERTS_OFF
VLT_SOURCES = $(shell ${BENDER} script flist ${VLT_BENDER} | ${SED_SRCS})
VLT_SOURCES = $(shell ${BENDER} script flist-plus ${VLT_BENDER} | ${SED_SRCS})
VLT_BUILDDIR := $(abspath work-vlt)
VLT_FESVR = $(VLT_BUILDDIR)/riscv-isa-sim
VLT_FLAGS += --timing
Expand Down
2 changes: 1 addition & 1 deletion util/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG UBUNTU_VERSION=22.04

# 1. Stage: Install additional IIS tools
FROM ubuntu:${UBUNTU_VERSION} AS builder
ARG BENDER_VERSION=0.27.1
ARG BENDER_VERSION=0.28.1
ARG DOXYGEN_VERSION=1.12.0
ARG VERIBLE_VERSION=0.0-3318-g8d254167
ARG SNITCH_LLVM_VERSION=latest
Expand Down
Loading