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

.travis.yml

@@ -4,15 +4,8 @@ language: scala
 sudo: required
 services:
   - docker
-cache:
-  directories:
-    $HOME/.ivy2
 
 env:
-  global:
-    - CACHE_NAME=RocketChip
-    - RISCV=/opt/riscv
-    - TORTURE_CONFIG=default
   matrix:
     - SUITE=RocketSuiteA
     - SUITE=RocketSuiteB
@@ -29,8 +22,7 @@ branches:
     - /^hurricane.*$/
 
 before_install:
-  - docker pull hcook/docker-riscv
+  - docker pull hcook/docker-riscv:chisel
 
 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 $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"
+  - 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"

emulator/Makefrag-verilator

@@ -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.
 VERILATOR_VERSION=3.884
 VERILATOR_SRCDIR ?= verilator/src/verilator-$(VERILATOR_VERSION)
-INSTALLED_VERILATOR ?= $(abspath verilator/install/bin/verilator)
-$(INSTALLED_VERILATOR): $(VERILATOR_SRCDIR)/bin/verilator
+VERILATOR_TARGET := $(abspath verilator/install/bin/verilator)
+INSTALLED_VERILATOR ?= $(VERILATOR_TARGET)
+$(VERILATOR_TARGET): $(VERILATOR_SRCDIR)/bin/verilator
 	$(MAKE) -C $(VERILATOR_SRCDIR) installbin installdata
 	touch $@
 

regression/Makefile

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

torture

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