From 3c4dc2ee9468dd0b51480180f07ba6860af7aa0d Mon Sep 17 00:00:00 2001
From: Richard Yan <yrh@berkeley.edu>
Date: Wed, 16 Oct 2024 16:21:31 -0700
Subject: [PATCH] add core serialized config, bump radiance

---
 .../src/main/scala/config/RadianceConfigs.scala     | 13 +++++++++----
 generators/radiance                                 |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
index 5b11eebc..71be3629 100644
--- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
+++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala
@@ -6,7 +6,7 @@ import freechips.rocketchip.devices.tilelink.BootROMLocated
 import freechips.rocketchip.resources.BigIntHexContext
 import freechips.rocketchip.subsystem._
 import org.chipsalliance.cde.config.Config
-import radiance.subsystem.RadianceGemminiDataType
+import radiance.subsystem.{CoreSerialized, RadianceGemminiDataType}
 
 class WithRadBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10100) extends Config((site, here, up) => {
   case BootROMLocated(x) => up(BootROMLocated(x))
@@ -25,9 +25,10 @@ class WithRadBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigIn
 // aliases for virgo
 class VirgoConfig extends RadianceClusterConfig
 class VirgoFP16Config extends RadianceFP16ClusterConfig
-class Virgo4CFP16Config extends Radiance4CFP16ClusterConfig
+class VirgoHopperConfig extends Radiance4CFP16ClusterConfig
 class VirgoSynConfig extends RadianceClusterSynConfig
 class VirgoFP16SynConfig extends RadianceFP16ClusterSynConfig
+class VirgoHopperSynConfig extends Radiance4CFP16ClusterSynConfig
 
 class RadianceBaseConfig extends Config(
   // NOTE: when changing these, remember to change NUM_CORES/THREADS/WARPS in
@@ -54,8 +55,8 @@ class RadianceFP16ClusterConfig extends Config(
 
 class Radiance4CFP16ClusterConfig extends Config(
   new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 16, accSizeInKB = 64, tileSize = (8, 4, 8), dataType = RadianceGemminiDataType.FP16) ++
-  new radiance.subsystem.WithRadianceCores(4, location = InCluster(0), useVxCache = false) ++
-  new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 128 << 10, numBanks = 4, numWords = 8) ++
+  new radiance.subsystem.WithRadianceCores(4, location = InCluster(0), tensorCoreFP16 = true, useVxCache = false) ++
+  new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 128 << 10, numBanks = 4, numWords = 16, serializeUnaligned = CoreSerialized) ++
   new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++
   new radiance.subsystem.WithVortexL1Banks(nBanks = 8)++
   new radiance.subsystem.WithRadianceCluster(0) ++
@@ -112,6 +113,10 @@ class RadianceFP16ClusterSynConfig extends Config(
   new radiance.subsystem.WithRadianceSimParams(false) ++
   new RadianceFP16ClusterConfig)
 
+class Radiance4CFP16ClusterSynConfig extends Config(
+  new radiance.subsystem.WithRadianceSimParams(false) ++
+    new Radiance4CFP16ClusterConfig)
+
 class RadianceBigLittleClusterSynConfig extends Config(
   new radiance.subsystem.WithRadianceSimParams(false) ++
     new RadianceBigLittleClusterConfig)
diff --git a/generators/radiance b/generators/radiance
index 0989d90d..9e86007e 160000
--- a/generators/radiance
+++ b/generators/radiance
@@ -1 +1 @@
-Subproject commit 0989d90dd25c51d8a7dc6b0aaac809868e39024d
+Subproject commit 9e86007e9097ccac26efeda0ac918422ed5b4f2f