diff --git a/generators/boom b/generators/boom index fac2c370c9..9e4269088e 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit fac2c370c9deae97ca52aca6b34857e9ac0f6e9d +Subproject commit 9e4269088ed7f83ad57b75d62082170c2c502952 diff --git a/generators/chipyard/src/main/scala/config/BoomConfigs.scala b/generators/chipyard/src/main/scala/config/BoomConfigs.scala index 9e1f558ae1..aced79ae24 100644 --- a/generators/chipyard/src/main/scala/config/BoomConfigs.scala +++ b/generators/chipyard/src/main/scala/config/BoomConfigs.scala @@ -16,10 +16,12 @@ class MediumBoomConfig extends Config( class LargeBoomConfig extends Config( new boom.common.WithNLargeBooms(1) ++ // large boom config + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) class MegaBoomConfig extends Config( new boom.common.WithNMegaBooms(1) ++ // mega boom config + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) class DualSmallBoomConfig extends Config( @@ -30,16 +32,19 @@ class HwachaLargeBoomConfig extends Config( new chipyard.config.WithHwachaTest ++ new hwacha.DefaultHwachaConfig ++ // use Hwacha vector accelerator new boom.common.WithNLargeBooms(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) class LoopbackNICLargeBoomConfig extends Config( new chipyard.harness.WithLoopbackNIC ++ // drive NIC IOs with loopback new icenet.WithIceNIC ++ // build a NIC new boom.common.WithNLargeBooms(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) class DromajoBoomConfig extends Config( new chipyard.harness.WithSimDromajoBridge ++ // attach Dromajo new chipyard.config.WithTraceIO ++ // enable the traceio new boom.common.WithNSmallBooms(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) diff --git a/generators/chipyard/src/main/scala/config/HeteroConfigs.scala b/generators/chipyard/src/main/scala/config/HeteroConfigs.scala index 28cdc4cb20..8e8c7fe929 100644 --- a/generators/chipyard/src/main/scala/config/HeteroConfigs.scala +++ b/generators/chipyard/src/main/scala/config/HeteroConfigs.scala @@ -9,6 +9,7 @@ import freechips.rocketchip.config.{Config} class LargeBoomAndRocketConfig extends Config( new boom.common.WithNLargeBooms(1) ++ // single-core boom new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // single rocket-core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include start: BoomAndRocketWithHwacha @@ -17,6 +18,7 @@ class HwachaLargeBoomAndHwachaRocketConfig extends Config( new hwacha.DefaultHwachaConfig ++ // add hwacha to all harts new boom.common.WithNLargeBooms(1) ++ // add 1 boom core new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // add 1 rocket core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include end: BoomAndRocketWithHwacha @@ -26,6 +28,7 @@ class LargeBoomAndHwachaRocketConfig extends Config( new hwacha.DefaultHwachaConfig ++ // set default hwacha config keys new boom.common.WithNLargeBooms(1) ++ // add 1 boom core new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // add 1 rocket core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include start: DualBoomAndRocketOneHwacha @@ -35,18 +38,21 @@ class DualLargeBoomAndHwachaRocketConfig extends Config( new hwacha.DefaultHwachaConfig ++ // set default hwacha config keys new boom.common.WithNLargeBooms(2) ++ // add 2 boom cores new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // add 1 rocket core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include end: DualBoomAndRocketOneHwacha class DualLargeBoomAndDualRocketConfig extends Config( new boom.common.WithNLargeBooms(2) ++ // add 2 boom cores new freechips.rocketchip.subsystem.WithNBigCores(2) ++ // add 2 rocket cores + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include start: DualBoomAndSingleRocket class DualLargeBoomAndSingleRocketConfig extends Config( new boom.common.WithNLargeBooms(2) ++ // add 2 boom cores new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // add 1 rocket core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include end: DualBoomAndSingleRocket @@ -54,4 +60,5 @@ class LargeBoomAndRocketWithControlCoreConfig extends Config( new freechips.rocketchip.subsystem.WithNSmallCores(1) ++ // Add a small "control" core new boom.common.WithNLargeBooms(1) ++ // Add 1 boom core new freechips.rocketchip.subsystem.WithNBigCores(1) ++ // add 1 rocket core + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) diff --git a/generators/chipyard/src/main/scala/config/RocketConfigs.scala b/generators/chipyard/src/main/scala/config/RocketConfigs.scala index a082990edd..1a3ac0eda8 100644 --- a/generators/chipyard/src/main/scala/config/RocketConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RocketConfigs.scala @@ -42,18 +42,21 @@ class HwachaRocketConfig extends Config( new chipyard.config.WithHwachaTest ++ new hwacha.DefaultHwachaConfig ++ // use Hwacha vector accelerator new freechips.rocketchip.subsystem.WithNBigCores(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include start: GemminiRocketConfig class GemminiRocketConfig extends Config( new gemmini.DefaultGemminiConfig ++ // use Gemmini systolic array GEMM accelerator new freechips.rocketchip.subsystem.WithNBigCores(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) // DOC include end: GemminiRocketConfig class FPGemminiRocketConfig extends Config( new gemmini.GemminiFP32DefaultConfig ++ // use FP32Gemmini systolic array GEMM accelerator new freechips.rocketchip.subsystem.WithNBigCores(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) diff --git a/generators/gemmini b/generators/gemmini index c47cb7f3eb..350b3196ba 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit c47cb7f3eb5c18390f176f3a53c43c8546d487d2 +Subproject commit 350b3196bab88b75d29c61da70487231b3f2249c diff --git a/generators/hwacha b/generators/hwacha index 7cc6354351..b0795a3aaf 160000 --- a/generators/hwacha +++ b/generators/hwacha @@ -1 +1 @@ -Subproject commit 7cc6354351457c6b5bf186cdd34297ee5caeb22a +Subproject commit b0795a3aafd3b22b00061c1c3e2e710d73b4f112