riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into jchang_test

Browse Source
This commit is contained in:
Jacob Chang 2016-12-12 16:18:14 -08:00
commit b28c0936a0
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -4,15 +4,8 @@ language: scala
sudo: required sudo: required
services: services:
- docker - docker
cache:
directories:
$HOME/.ivy2
env: env:
global:
- CACHE_NAME=RocketChip
- RISCV=/opt/riscv
- TORTURE_CONFIG=default
matrix: matrix:
- SUITE=RocketSuiteA - SUITE=RocketSuiteA
- SUITE=RocketSuiteB - SUITE=RocketSuiteB
@ -29,8 +22,7 @@ branches:
- /^hurricane.*$/ - /^hurricane.*$/
before_install: before_install:
- docker pull hcook/docker-riscv - docker pull hcook/docker-riscv:chisel
script: script:
- docker run -v /home/travis/build/ucb-bar/rocket-chip:/opt/riscv/test hcook/docker-riscv /bin/sh -c "which verilator; echo $INSTALLED_VERILATOR" - docker run -v $(pwd):/opt/riscv/test hcook/docker-riscv:chisel /bin/sh -c "make emulator-ndebug -C regression SUITE=$SUITE; make emulator-regression-tests -C regression SUITE=$SUITE"
- docker run -v $HOME/.ivy2:/opt/riscv/test/.ivy2 -v /home/travis/build/ucb-bar/rocket-chip:/opt/riscv/test hcook/docker-riscv /bin/sh -c "make emulator-ndebug -C regression SUITE=$SUITE; make emulator-regression-tests -C regression SUITE=$SUITE"

5
emulator/Makefrag-verilator
View File

@ -23,8 +23,9 @@ $(generated_dir_debug)/%.fir $(generated_dir_debug)/%.prm $(generated_dir_debug)
# Build and install our own Verilator, to work around versionining issues. # Build and install our own Verilator, to work around versionining issues.
VERILATOR_VERSION=3.884 VERILATOR_VERSION=3.884
VERILATOR_SRCDIR ?= verilator/src/verilator-$(VERILATOR_VERSION) VERILATOR_SRCDIR ?= verilator/src/verilator-$(VERILATOR_VERSION)
INSTALLED_VERILATOR ?= $(abspath verilator/install/bin/verilator) VERILATOR_TARGET := $(abspath verilator/install/bin/verilator)
$(INSTALLED_VERILATOR): $(VERILATOR_SRCDIR)/bin/verilator INSTALLED_VERILATOR ?= $(VERILATOR_TARGET)
$(VERILATOR_TARGET): $(VERILATOR_SRCDIR)/bin/verilator
$(MAKE) -C $(VERILATOR_SRCDIR) installbin installdata $(MAKE) -C $(VERILATOR_SRCDIR) installbin installdata
touch $@ touch $@

3
regression/Makefile
View File

@ -265,6 +265,3 @@ jtag-dtm-tests-64 : $(JTAG_DTM_64_TEST_STAMPS)
# Targets for JTAG DTM full-chain simulation # Targets for JTAG DTM full-chain simulation
jtag-dtm-regression: jtag-dtm-tests-32 jtag-dtm-tests-64 jtag-dtm-regression: jtag-dtm-tests-32 jtag-dtm-tests-64

2
torture

@ -1 +1 @@
Subproject commit 77195ab12aefc373ca688e0a9c4d710c13191341 Subproject commit b95d8ea3b2273d2a95e421de0d78ab1b280c96b0