diff --git a/.circleci/config.yml b/.circleci/config.yml index b0e8cf8b..5eda3c15 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ jobs: - run: name: Building the boomexample subproject using Verilator - command: .circleci/do-rtl-build.sh boomexample SmallDefaultBoomConfig + command: .circleci/do-rtl-build.sh boomexample example SmallDefaultBoomConfig no_output_timeout: 120m - save_cache: @@ -255,7 +255,7 @@ jobs: - run: name: Building the hwacha subproject using Verilator - command: .circleci/do-rtl-build.sh hwacha + command: .circleci/do-rtl-build.sh hwacha example SmallHwachaConfig no_output_timeout: 120m - save_cache: @@ -401,7 +401,7 @@ jobs: - run: name: Run hwacha benchmark tests - command: make run-bmark-tests -C sims/verisim SUB_PROJECT=hwacha + command: make run-bmark-tests -C sims/verisim SUB_PROJECT=hwacha CONFIG_PACKAGE=example CONFIG=SmallHwachaConfig # Order and dependencies of jobs to run workflows: diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh index e7056e53..eabce7c1 100755 --- a/.circleci/do-rtl-build.sh +++ b/.circleci/do-rtl-build.sh @@ -2,7 +2,8 @@ # create the different verilator builds # 1st argument is the subproject -# 2nd argument is the config (can be unspecified) +# 2nd argument is the config package (can be unspecified) +# 3nd argument is the config (can be unspecified) # turn echo on and error on earliest command set -ex @@ -19,8 +20,8 @@ make clean if [ $# -ne 0 ]; then if [ $# -eq 1 ]; then make SUB_PROJECT=$1 JAVA_ARGS="-Xmx2G -Xss8M" - elif [ $# -eq 2 ]; then - make SUB_PROJECT=$1 CONFIG=$2 JAVA_ARGS="-Xmx2G -Xss8M" + elif [ $# -eq 3 ]; then + make SUB_PROJECT=$1 CONFIG_PACKAGE=$2 CONFIG=$3 JAVA_ARGS="-Xmx2G -Xss8M" else exit 1 # wrong amount of args fi diff --git a/generators/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala index dc0a07ba..90b6cf89 100644 --- a/generators/example/src/main/scala/Configs.scala +++ b/generators/example/src/main/scala/Configs.scala @@ -21,6 +21,11 @@ class HwachaConfig extends Config( new hwacha.DefaultHwachaConfig ++ new DefaultRocketConfig) +class SmallHwachaConfig extends Config( + new hwacha.WithNBanks(1) ++ + new hwacha.DefaultHwachaConfig ++ + new DefaultConfig) + class RoccRocketConfig extends Config( new WithRoccExample ++ new DefaultRocketConfig)