diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala index e75d8af7..a91671a6 100644 --- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala @@ -3,11 +3,12 @@ package chipyard import chipyard.config.AbstractConfig import chipyard.stage.phases.TargetDirKey import freechips.rocketchip.devices.tilelink.BootROMLocated -import freechips.rocketchip.diplomacy.AsynchronousCrossing -import freechips.rocketchip.subsystem.{WithCluster, InCluster, WithExtMemSize} +import freechips.rocketchip.diplomacy.{AsynchronousCrossing, BigIntHexContext} +import freechips.rocketchip.subsystem.{InCluster, WithCluster, WithExtMemSize} import freechips.rocketchip.tile.XLen import org.chipsalliance.cde.config.Config import radiance.memory._ +import radiance.subsystem.WithRadianceGemmini class WithRadROMs(address: BigInt, size: Int, filename: String) extends Config((site, here, up) => { case RadianceROMsLocated() => Some(up(RadianceROMsLocated()).getOrElse(Seq()) ++ @@ -53,6 +54,8 @@ class RadianceConfig extends Config( new RadianceBaseConfig) class RadianceClusterConfig extends Config( + // important to keep gemmini tile before RadianceCores to ensure radiance tile id is 0-indexed + new WithRadianceGemmini(location = InCluster(0), dim = 8, extMemBase = x"ff000000", spSizeInKB = 16, accSizeInKB = 8) ++ new radiance.subsystem.WithRadianceCores(2, location=InCluster(0), useVxCache = false) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++ new radiance.subsystem.WithVortexL1Banks(nBanks = 1)++ diff --git a/generators/gemmini b/generators/gemmini index 5a10e96b..a92e231a 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 5a10e96bcb0aff1e5138fe7acfb066d2eeae6068 +Subproject commit a92e231a80d9f62fe6fc56280e359c4f93d30c75 diff --git a/generators/radiance b/generators/radiance index 6d5418fd..cb0a4c52 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 6d5418fd87effdd8b7702d83dc8058e346edc9b2 +Subproject commit cb0a4c526e5c9724b8c3615023e4920d57efff83 diff --git a/generators/rocket-chip b/generators/rocket-chip index 056e62aa..0dc13d70 160000 --- a/generators/rocket-chip +++ b/generators/rocket-chip @@ -1 +1 @@ -Subproject commit 056e62aaa160029c65135c0880d5a777fa89d0e3 +Subproject commit 0dc13d701d23bba00d5a43fd190e2f73ed992321