From 4df478f23ac62356346f5f1e172c3ead43e65ab3 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Thu, 3 Oct 2019 01:52:36 +0000 Subject: [PATCH 1/7] [firechip] Remove SimConfigs --- .../firechip/src/main/scala/SimConfigs.scala | 42 ------------------- 1 file changed, 42 deletions(-) delete mode 100644 generators/firechip/src/main/scala/SimConfigs.scala diff --git a/generators/firechip/src/main/scala/SimConfigs.scala b/generators/firechip/src/main/scala/SimConfigs.scala deleted file mode 100644 index 06e6aa93..00000000 --- a/generators/firechip/src/main/scala/SimConfigs.scala +++ /dev/null @@ -1,42 +0,0 @@ -//See LICENSE for license details. -package firesim.firesim - -import freechips.rocketchip.config.{Parameters, Config, Field} - -import midas.models._ - -import firesim.endpoints._ -import firesim.configs._ - -/******************************************************************************* -* Full PLATFORM_CONFIG Configurations. These set simulator parameters. -* -* In general, if you're adding or removing features from any of these, you -* should CREATE A NEW ONE, WITH A NEW NAME. This is because the manager -* will store this name as part of the tags for the AGFI, so that later you can -* reconstruct what is in a particular AGFI. These tags are also used to -* determine which driver to build. -*******************************************************************************/ -class FireSimConfig extends Config(new BasePlatformConfig) - -class FireSimClockDivConfig extends Config( - new FireSimConfig) - -class FireSimDDR3Config extends Config( - new FireSimConfig) - -class FireSimDDR3LLC4MBConfig extends Config( - new FireSimConfig) - -class FireSimDDR3FRFCFSConfig extends Config( - new FireSimConfig) - -class FireSimDDR3FRFCFSLLC4MBConfig extends Config( - new FireSimConfig) - -class FireSimDDR3FRFCFSLLC4MB3ClockDivConfig extends Config( - new FireSimConfig) - -class Midas2Config extends Config( - new WithMultiCycleRamModels ++ - new FireSimConfig) From 5845862525d69cf14db1c9fb634ed335962bb4c7 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Thu, 3 Oct 2019 02:28:48 +0000 Subject: [PATCH 2/7] [Firechip] Push FASED configs into TargetConfigs.scala --- generators/firechip/src/main/scala/TargetConfigs.scala | 7 ++++++- .../firechip/src/test/scala/ScalaTestSuite.scala | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index d88ffa25..d0c55ed3 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -20,7 +20,7 @@ import icenet._ import firesim.endpoints._ import firesim.util.{WithNumNodes} -import firesim.configs.WithDefaultMemModel +import firesim.configs._ class WithBootROM extends Config((site, here, up) => { case BootROMParams => { @@ -86,6 +86,11 @@ class WithScalaTestFeatures extends Config((site, here, up) => { case PrintTracePort => true }) +// FASED Config Aliases. This to enable config generation via "_" concatenation +// which requires that all config classes be defined in the same package +class DDR3FRFCFSLLC4MB extends FRFCFS16GBQuadRankLLC4MB +class DDR3FRFCFSLLC4MB3Div extends FRFCFS16GBQuadRankLLC4MB3Div + /******************************************************************************* * Full TARGET_CONFIG configurations. These set parameters of the target being * simulated. diff --git a/generators/firechip/src/test/scala/ScalaTestSuite.scala b/generators/firechip/src/test/scala/ScalaTestSuite.scala index 77415636..49737be4 100644 --- a/generators/firechip/src/test/scala/ScalaTestSuite.scala +++ b/generators/firechip/src/test/scala/ScalaTestSuite.scala @@ -130,10 +130,10 @@ abstract class FireSimTestSuite( runSuite("verilator")(FastBlockdevTests) } -class RocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipConfig", "FireSimConfig") -class BoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "FireSimBoomConfig", "FireSimConfig") -class RocketNICF1Tests extends FireSimTestSuite("FireSim", "FireSimRocketChipConfig", "FireSimConfig") { +class RocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipQuadCoreConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") +class BoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "FireSimBoomConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") +class RocketNICF1Tests extends FireSimTestSuite("FireSim", "FireSimRocketChipConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") { runSuite("verilator")(NICLoopbackTests) } -class RamModelRocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipDualCoreConfig", "Midas2Config") -class RamModelBoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "FireSimBoomConfig", "Midas2Config") +class RamModelRocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipDualCoreConfig", "BaseF1Config_MCRams") +class RamModelBoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "FireSimBoomConfig", "BaseF1Config_MCRams") From 7c0bb51242e1a9915c16934edfbdd886537c9fb1 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Fri, 4 Oct 2019 18:15:34 +0000 Subject: [PATCH 3/7] [firechip] Update scalatest suite --- generators/firechip/src/test/scala/ScalaTestSuite.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/firechip/src/test/scala/ScalaTestSuite.scala b/generators/firechip/src/test/scala/ScalaTestSuite.scala index 49737be4..e7194d8c 100644 --- a/generators/firechip/src/test/scala/ScalaTestSuite.scala +++ b/generators/firechip/src/test/scala/ScalaTestSuite.scala @@ -130,9 +130,9 @@ abstract class FireSimTestSuite( runSuite("verilator")(FastBlockdevTests) } -class RocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipQuadCoreConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") -class BoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "FireSimBoomConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") -class RocketNICF1Tests extends FireSimTestSuite("FireSim", "FireSimRocketChipConfig_DDR3FRFCFSLLC4MB", "BaseF1Config") { +class RocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "DDR3FRFCFSLLC4MB_FireSimRocketChipQuadCoreConfig", "BaseF1Config") +class BoomF1Tests extends FireSimTestSuite("FireBoomNoNIC", "DDR3FRFCFSLLC4MB_FireSimBoomConfig", "BaseF1Config") +class RocketNICF1Tests extends FireSimTestSuite("FireSim", "DDR3FRFCFSLLC4MB_FireSimRocketChipConfig", "BaseF1Config") { runSuite("verilator")(NICLoopbackTests) } class RamModelRocketF1Tests extends FireSimTestSuite("FireSimNoNIC", "FireSimRocketChipDualCoreConfig", "BaseF1Config_MCRams") From 39172e0d385f40763bbff217a1d99351c0b14240 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Fri, 4 Oct 2019 18:27:19 +0000 Subject: [PATCH 4/7] [CI] Update FireSim defaults --- .circleci/defaults.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh index 8497f304..f5387bd8 100755 --- a/.circleci/defaults.sh +++ b/.circleci/defaults.sh @@ -47,6 +47,6 @@ mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig" mapping["rocketchip"]="SUB_PROJECT=rocketchip" mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig TOP=TopWithBlockDevice" mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaRocketConfig GENERATOR_PACKAGE=hwacha" -mapping["firesim"]="DESIGN=FireSim TARGET_CONFIG=FireSimRocketChipConfig PLATFORM_CONFIG=FireSimConfig" -mapping["fireboom"]="DESIGN=FireBoom TARGET_CONFIG=FireSimBoomConfig PLATFORM_CONFIG=FireSimConfig" -mapping["firesim-clockdiv"]="DESIGN=FireSim TARGET_CONFIG=FireSimRocketChipConfig PLATFORM_CONFIG=FireSimClockDivConfig" +mapping["firesim"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimRocketChipConfig PLATFORM_CONFIG=FireSimConfig" +mapping["fireboom"]="DESIGN=FireBoom TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimBoomConfig PLATFORM_CONFIG=FireSimConfig" +mapping["firesim-clockdiv"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB3Div_FireSimRocketChipConfig PLATFORM_CONFIG=FireSimClockDivConfig" From 6210ca2df870fc13f147bf417dc4525b72b254fc Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Fri, 4 Oct 2019 21:03:16 +0000 Subject: [PATCH 5/7] Bump FireSim --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 26ffba7c..4c1a3aa2 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 26ffba7cbca2982fef6b221a7abbc51d5cdc4b62 +Subproject commit 4c1a3aa2122d35c505e8135642bfb6870f2fce19 From 36b269bfc9aa8582150abb5011f1c5e60a7e00e2 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Fri, 4 Oct 2019 21:51:39 +0000 Subject: [PATCH 6/7] [CI] Fix PLATFORM_CONFIG in firesim --- .circleci/defaults.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh index f5387bd8..bdc53e80 100755 --- a/.circleci/defaults.sh +++ b/.circleci/defaults.sh @@ -47,6 +47,6 @@ mapping["boom"]="SUB_PROJECT=example CONFIG=SmallBoomConfig" mapping["rocketchip"]="SUB_PROJECT=rocketchip" mapping["blockdevrocketchip"]="SUB_PROJECT=example CONFIG=SimBlockDeviceRocketConfig TOP=TopWithBlockDevice" mapping["hwacha"]="SUB_PROJECT=example CONFIG=HwachaRocketConfig GENERATOR_PACKAGE=hwacha" -mapping["firesim"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimRocketChipConfig PLATFORM_CONFIG=FireSimConfig" -mapping["fireboom"]="DESIGN=FireBoom TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimBoomConfig PLATFORM_CONFIG=FireSimConfig" -mapping["firesim-clockdiv"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB3Div_FireSimRocketChipConfig PLATFORM_CONFIG=FireSimClockDivConfig" +mapping["firesim"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimRocketChipConfig PLATFORM_CONFIG=BaseF1Config" +mapping["fireboom"]="DESIGN=FireBoom TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimBoomConfig PLATFORM_CONFIG=BaseF1Config" +mapping["firesim-clockdiv"]="DESIGN=FireSim TARGET_CONFIG=DDR3FRFCFSLLC4MB3Div_FireSimRocketChipConfig PLATFORM_CONFIG=BaseF1Config" From 370c0dbfa88ce8e79c9c61cf41911d06580c3ac2 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Sat, 5 Oct 2019 21:16:31 +0000 Subject: [PATCH 7/7] Bump FireSim [ci skip] --- sims/firesim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/firesim b/sims/firesim index 4c1a3aa2..31682ca9 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 4c1a3aa2122d35c505e8135642bfb6870f2fce19 +Subproject commit 31682ca9957ea20a823ab313285b1a95a6dfeb80