renamed classes to BoomRocket to clarify | clearer comments | readd the bmark timeout

generators/example/src/main/scala/Configs.scala

@@ -16,7 +16,7 @@ class BaseRocketConfig extends Config(
   new freechips.rocketchip.system.DefaultConfig)
 
 class DefaultRocketConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new BaseRocketConfig)
 
 class HwachaConfig extends Config(
@@ -28,26 +28,26 @@ class RoccRocketConfig extends Config(
   new DefaultRocketConfig)
 
 class PWMRocketConfig extends Config(
-  new WithPWMBoomAndRocketTop ++
+  new WithPWMBoomRocketTop ++
   new BaseRocketConfig)
 
 class PWMAXI4RocketConfig extends Config(
-  new WithPWMAXI4BoomAndRocketTop ++
+  new WithPWMAXI4BoomRocketTop ++
   new BaseRocketConfig)
 
 class SimBlockDeviceRocketConfig extends Config(
   new WithBlockDevice ++
-  new WithSimBlockDeviceBoomAndRocketTop ++
+  new WithSimBlockDeviceBoomRocketTop ++
   new BaseRocketConfig)
 
 class BlockDeviceModelRocketConfig extends Config(
   new WithBlockDevice ++
-  new WithBlockDeviceModelBoomAndRocketTop ++
+  new WithBlockDeviceModelBoomRocketTop ++
   new BaseRocketConfig)
 
 class GPIORocketConfig extends Config(
   new WithGPIO ++
-  new WithGPIOBoomAndRocketTop ++
+  new WithGPIOBoomRocketTop ++
   new BaseRocketConfig)
 
 class DualCoreRocketConfig extends Config(
@@ -75,11 +75,11 @@ class SmallBaseBoomConfig extends Config(
   new boom.system.SmallBoomConfig)
 
 class DefaultBoomConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new BaseBoomConfig)
 
 class SmallDefaultBoomConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new SmallBaseBoomConfig)
 
 class HwachaBoomConfig extends Config(
@@ -91,26 +91,26 @@ class RoccBoomConfig extends Config(
   new DefaultBoomConfig)
 
 class PWMBoomConfig extends Config(
-  new WithPWMBoomAndRocketTop ++
+  new WithPWMBoomRocketTop ++
   new BaseBoomConfig)
 
 class PWMAXI4BoomConfig extends Config(
-  new WithPWMAXI4BoomAndRocketTop ++
+  new WithPWMAXI4BoomRocketTop ++
   new BaseBoomConfig)
 
 class SimBlockDeviceBoomConfig extends Config(
   new WithBlockDevice ++
-  new WithSimBlockDeviceBoomAndRocketTop ++
+  new WithSimBlockDeviceBoomRocketTop ++
   new BaseBoomConfig)
 
 class BlockDeviceModelBoomConfig extends Config(
   new WithBlockDevice ++
-  new WithBlockDeviceModelBoomAndRocketTop ++
+  new WithBlockDeviceModelBoomRocketTop ++
   new BaseBoomConfig)
 
 class GPIOBoomConfig extends Config(
   new WithGPIO ++
-  new WithGPIOBoomAndRocketTop ++
+  new WithGPIOBoomRocketTop ++
   new BaseBoomConfig)
 
 /**
@@ -118,7 +118,7 @@ class GPIOBoomConfig extends Config(
  * the `WithNBoomCores` with the DefaultBoomConfig params
  */
 class DualCoreBoomConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.common.WithRVC ++
   new boom.common.DefaultBoomConfig ++
@@ -127,7 +127,7 @@ class DualCoreBoomConfig extends Config(
   new freechips.rocketchip.system.BaseConfig)
 
 class DualCoreSmallBoomConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.common.WithRVC ++
   new boom.common.WithSmallBooms ++
@@ -137,12 +137,12 @@ class DualCoreSmallBoomConfig extends Config(
   new freechips.rocketchip.system.BaseConfig)
 
 class RV32UnifiedBoomConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.system.SmallRV32UnifiedBoomConfig)
 
 // ---------------------
-// BOOM + Rocket Configs
+// BOOM and Rocket Configs
 // ---------------------
 
 class BaseBoomAndRocketConfig extends Config(
@@ -167,46 +167,46 @@ class SmallBaseBoomAndRocketConfig extends Config(
   new freechips.rocketchip.system.BaseConfig)
 
 class DefaultBoomAndRocketConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithNormalBoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class SmallDefaultBoomAndRocketConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
-  new SmallBaseBoomAndRocketConfig)
+  new WithNormalBoomRocketTop ++
+  new SmallBaseBoomRocketConfig)
 
 class HwachaBoomAndRocketConfig extends Config(
   new hwacha.DefaultHwachaConfig ++
-  new DefaultBoomAndRocketConfig)
+  new DefaultBoomRocketConfig)
 
 class RoccBoomAndRocketConfig extends Config(
   new WithRoccExample ++
-  new DefaultBoomAndRocketConfig)
+  new DefaultBoomRocketConfig)
 
 class PWMBoomAndRocketConfig extends Config(
-  new WithPWMBoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithPWMBoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class PWMAXI4BoomAndRocketConfig extends Config(
-  new WithPWMAXI4BoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithPWMAXI4BoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class SimBlockDeviceBoomAndRocketConfig extends Config(
   new WithBlockDevice ++
-  new WithSimBlockDeviceBoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithSimBlockDeviceBoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class BlockDeviceModelBoomAndRocketConfig extends Config(
   new WithBlockDevice ++
-  new WithBlockDeviceModelBoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithBlockDeviceModelBoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class GPIOBoomAndRocketConfig extends Config(
   new WithGPIO ++
-  new WithGPIOBoomAndRocketTop ++
-  new BaseBoomAndRocketConfig)
+  new WithGPIOBoomRocketTop ++
+  new BaseBoomRocketConfig)
 
 class DualCoreBoomAndOneRocketConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.system.WithRenumberHarts ++
   new boom.common.WithRVC ++
@@ -217,7 +217,7 @@ class DualCoreBoomAndOneRocketConfig extends Config(
   new freechips.rocketchip.system.BaseConfig)
 
 class RV32BoomAndRocketConfig extends Config(
-  new WithNormalBoomAndRocketTop ++
+  new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.system.WithRenumberHarts ++
   new boom.common.WithBoomRV32 ++