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

try travis suggestion on the jvm stages

Browse Source
This commit is contained in:
Colin Schmidt 2017-05-18 11:06:43 -07:00
parent 66d660ff60
commit 617dd6fe1e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -52,10 +52,11 @@ jobs:
- ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf - ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf
env: SUITE=none env: SUITE=none
- &test - &test
sudo: required
stage: Test stage: Test
script: script:
- make emulator-ndebug -C regression SUITE=$SUITE - make emulator-ndebug -C regression SUITE=$SUITE JVM_MEMORY=6G
- travis_wait 30 make emulator-regression-tests -C regression SUITE=$SUITE - travis_wait 30 make emulator-regression-tests -C regression SUITE=$SUITE JVM_MEMORY=6G
env: SUITE=RocketSuiteA env: SUITE=RocketSuiteA
- <<: *test - <<: *test
env: SUITE=RocketSuiteB env: SUITE=RocketSuiteB

5
Makefrag
View File

@ -12,12 +12,13 @@ long_name = $(PROJECT).$(CONFIG)
CXX ?= g++ CXX ?= g++
CXXFLAGS := -O1 CXXFLAGS := -O1
JVM_MEMORY ?= 2G
SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar SBT ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar
SHELL := /bin/bash SHELL := /bin/bash
FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar
FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver FIRRTL ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver
# Build firrtl.jar and put it where chisel3 can find it. # Build firrtl.jar and put it where chisel3 can find it.
$(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala") $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala")