Cleanup configs

generators/example/src/main/scala/BoomConfigs.scala

@@ -3,88 +3,65 @@ package example
 import chisel3._
 
 import freechips.rocketchip.config.{Config}
-import freechips.rocketchip.subsystem.{WithJtagDTM}
-
-import boom.common._
 
 // ---------------------
 // BOOM Configs
 // ---------------------
 
 class SmallBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
-  new WithBootROM ++
-  new boom.common.SmallBoomConfig)
+  new WithTop ++                                            // use normal top
+  new WithBootROM ++                                        // use testchipip bootrom
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++  // use Sifive L2 cache
+  new boom.common.WithSmallBooms ++                         // 1-wide BOOM
+  new boom.common.WithNBoomCores(1) ++                      // single-core
+  new freechips.rocketchip.system.BaseConfig)               // "Base" rocketchip system
 
 class MediumBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
+  new WithTop ++
   new WithBootROM ++
-  new boom.common.MediumBoomConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithMediumBooms ++                        // 2-wide BOOM
+  new boom.common.WithNBoomCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)
 
 class LargeBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
+  new WithTop ++
   new WithBootROM ++
-  new boom.common.LargeBoomConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithLargeBooms ++                         // 3-wide BOOM
+  new boom.common.WithNBoomCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)
 
 class MegaBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
+  new WithTop ++
   new WithBootROM ++
-  new boom.common.MegaBoomConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithMegaBooms ++                          // 4-wide BOOM
+  new boom.common.WithNBoomCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)
 
-class jtagSmallBoomConfig extends Config(
-  new WithDTMBoomRocketTop ++
+class DualSmallBoomConfig extends Config(
+  new WithTop ++
   new WithBootROM ++
-  new WithJtagDTM ++
-  new boom.common.SmallBoomConfig)
-
-class jtagMediumBoomConfig extends Config(
-  new WithDTMBoomRocketTop ++
-  new WithBootROM ++
-  new WithJtagDTM ++
-  new boom.common.MediumBoomConfig)
-
-class jtagLargeBoomConfig extends Config(
-  new WithDTMBoomRocketTop ++
-  new WithBootROM ++
-  new WithJtagDTM ++
-  new boom.common.LargeBoomConfig)
-
-class jtagMegaBoomConfig extends Config(
-  new WithDTMBoomRocketTop ++
-  new WithBootROM ++
-  new WithJtagDTM ++
-  new boom.common.MegaBoomConfig)
-
-class SmallDualBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
-  new WithBootROM ++
-  new boom.common.SmallDualBoomConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithSmallBooms ++
+  new boom.common.WithNBoomCores(2) ++                      // dual-core
+  new freechips.rocketchip.system.BaseConfig)
 
 class TracedSmallBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
+  new WithTop ++
   new WithBootROM ++
-  new boom.common.TracedSmallBoomConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithTrace ++                             // enable trace port on BOOM
+  new boom.common.WithSmallBooms ++
+  new boom.common.WithNBoomCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)
 
 class SmallRV32UnifiedBoomConfig extends Config(
-  new WithNormalBoomRocketTop ++
+  new WithTop ++
   new WithBootROM ++
-  new boom.common.SmallRV32UnifiedBoomConfig)
-
-// --------------------------
-// BOOM + Rocket Configs
-// --------------------------
-
-class SmallBoomAndRocketConfig extends Config(
-  new WithNormalBoomRocketTop ++
-  new WithBootROM ++
-  new boom.common.SmallBoomAndRocketConfig)
-
-class MediumBoomAndRocketConfig extends Config(
-  new WithNormalBoomRocketTop ++
-  new WithBootROM ++
-  new boom.common.MediumBoomAndRocketConfig)
-
-class DualMediumBoomAndDualRocketConfig extends Config(
-  new WithNormalBoomRocketTop ++
-  new WithBootROM ++
-  new boom.common.DualMediumBoomAndDualRocketConfig)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++
+  new boom.common.WithUnifiedMemIntIQs ++                 // use unified mem+int issue queues
+  new boom.common.WithSmallBooms ++
+  new boom.common.WithNBoomCores(1) ++
+  new freechips.rocketchip.system.BaseConfig)