From 617dd6fe1e6face5638793e535dd129348472d0f Mon Sep 17 00:00:00 2001 From: Colin Schmidt Date: Thu, 18 May 2017 11:06:43 -0700 Subject: [PATCH] try travis suggestion on the jvm stages --- .travis.yml | 5 +++-- Makefrag | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5fbfc3f..b3e1e4e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,10 +52,11 @@ jobs: - ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf env: SUITE=none - &test + sudo: required stage: Test script: - - make emulator-ndebug -C regression SUITE=$SUITE - - travis_wait 30 make emulator-regression-tests -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 JVM_MEMORY=6G env: SUITE=RocketSuiteA - <<: *test env: SUITE=RocketSuiteB diff --git a/Makefrag b/Makefrag index 9f6fddbd..47400577 100644 --- a/Makefrag +++ b/Makefrag @@ -12,12 +12,13 @@ long_name = $(PROJECT).$(CONFIG) CXX ?= g++ 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 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. $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala")