wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump verilator to v4.034 (#547)

Browse Source 
* Bump verilator to v4.034
* Add new flags to verilator makefile
* Conditionally set timescale flag based on Verilator version
This commit is contained in:
Albert Magyar
2020-05-11 23:02:37 -07:00
committed by GitHub
parent 57c840f2ab
commit 2a6bd3bd5c
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/defaults.sh
View File

@@ -21,7 +21,7 @@ clean () {
NPROC=8 NPROC=8
# verilator version # verilator version
VERILATOR_VERSION=v4.028 VERILATOR_VERSION=v4.034
# remote variables # remote variables
REMOTE_WORK_DIR=$CI_DIR/$CIRCLE_PROJECT_REPONAME-$CIRCLE_BRANCH-$CIRCLE_SHA1-$CIRCLE_JOB REMOTE_WORK_DIR=$CI_DIR/$CIRCLE_PROJECT_REPONAME-$CIRCLE_BRANCH-$CIRCLE_SHA1-$CIRCLE_JOB

2
.circleci/images/Dockerfile
View File

@@ -164,7 +164,7 @@ RUN apt-get install -y \
# Install verilator # Install verilator
RUN git clone http://git.veripool.org/git/verilator \ RUN git clone http://git.veripool.org/git/verilator \
&& cd verilator \ && cd verilator \
&& git checkout v4.028 \ && git checkout v4.034 \
&& autoconf && ./configure && make && make install && autoconf && ./configure && make && make install
# Update PATH for Java tools # Update PATH for Java tools

2
scripts/centos-req.sh
View File

@@ -22,5 +22,5 @@ sudo yum install -y dtc
# install verilator # install verilator
git clone http://git.veripool.org/git/verilator git clone http://git.veripool.org/git/verilator
cd verilator cd verilator
git checkout v4.028 git checkout v4.034
autoconf && ./configure && make -j16 && sudo make install autoconf && ./configure && make -j16 && sudo make install

2
scripts/ubuntu-req.sh
View File

@@ -23,5 +23,5 @@ sudo apt-get install -y device-tree-compiler
# install verilator # install verilator
git clone http://git.veripool.org/git/verilator git clone http://git.veripool.org/git/verilator
cd verilator cd verilator
git checkout v4.028 git checkout v4.034
autoconf && ./configure && make -j16 && sudo make install autoconf && ./configure && make -j16 && sudo make install

3
sims/verilator/Makefile
View File

@@ -86,7 +86,10 @@ ARIANE_VERILATOR_FLAGS = \
CHIPYARD_VERILATOR_FLAGS = \ CHIPYARD_VERILATOR_FLAGS = \
--assert --assert
# Use --timescale to approximate timescale behavior of pre-4.034
TIMESCALE_OPTS := $(shell verilator --version | perl -lne 'if (/(\d.\d+)/ && $$1 >= 4.034) { print "--timescale 1ns/1ps"; }')
VERILATOR_NONCC_OPTS = \ VERILATOR_NONCC_OPTS = \
$(TIMESCALE_OPTS) \
--top-module $(VLOG_MODEL) \ --top-module $(VLOG_MODEL) \
$(shell if ! grep -iq "module.*ariane" $(build_dir)/*.*v; then echo "$(CHIPYARD_VERILATOR_FLAGS)"; else echo "$(ARIANE_VERILATOR_FLAGS)"; fi) \ $(shell if ! grep -iq "module.*ariane" $(build_dir)/*.*v; then echo "$(CHIPYARD_VERILATOR_FLAGS)"; else echo "$(ARIANE_VERILATOR_FLAGS)"; fi) \
--output-split 10000 \ --output-split 10000 \