From dc585609cf59a2abb2028f8dfcb75ab91b5b803a Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 18 Jul 2019 17:52:37 -0700 Subject: [PATCH] update hwacha ci to use L2 --- .circleci/defaults.sh | 2 +- generators/example/src/main/scala/Configs.scala | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh index e777af65..25b365d8 100755 --- a/.circleci/defaults.sh +++ b/.circleci/defaults.sh @@ -41,4 +41,4 @@ mapping["boomrocketexample"]="SUB_PROJECT=example CONFIG=DefaultBoomAndRocketCon mapping["boom"]="SUB_PROJECT=boom" mapping["rocketchip"]="SUB_PROJECT=rocketchip" mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=BlockDeviceModelRocketConfig TOP=BoomRocketTopWithBlockDevice" -mapping["hwacha"]="SUB_PROJECT=hwacha" +mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaL2Config GENERATOR_PACKAGE=hwacha" diff --git a/generators/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala index c2334ca8..c6cfa7a5 100644 --- a/generators/example/src/main/scala/Configs.scala +++ b/generators/example/src/main/scala/Configs.scala @@ -63,7 +63,13 @@ class GB1MemoryConfig extends Config( new DefaultRocketConfig) class RocketL2Config extends Config( - new WithInclusiveCache ++ new DefaultRocketConfig) + new WithInclusiveCache ++ + new DefaultRocketConfig) + +class HwachaL2Config extends Config( + new hwacha.DefaultHwachaConfig ++ + new WithInclusiveCache ++ + new DefaultRocketConfig) // ------------ // BOOM Configs @@ -146,7 +152,8 @@ class RV32UnifiedBoomConfig extends Config( new boom.system.SmallRV32UnifiedBoomConfig) class BoomL2Config extends Config( - new WithInclusiveCache ++ new SmallDefaultBoomConfig) + new WithInclusiveCache ++ + new SmallDefaultBoomConfig) // --------------------- // BOOM and Rocket Configs @@ -255,4 +262,5 @@ class RV32BoomAndRocketConfig extends Config( new freechips.rocketchip.system.BaseConfig) class DualCoreRocketL2Config extends Config( - new WithInclusiveCache ++ new DualCoreRocketConfig) + new WithInclusiveCache ++ + new DualCoreRocketConfig)