From 967e382332c86fa571ea9eb4906f1fbabf5900d8 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Mon, 14 Oct 2024 19:45:44 -0700 Subject: [PATCH 1/6] variables.mk: Add target for tensor synthesizable unittest --- variables.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/variables.mk b/variables.mk index 0a62d2fa..8b5a3647 100644 --- a/variables.mk +++ b/variables.mk @@ -131,9 +131,20 @@ ifeq ($(SUB_PROJECT),coalescer) SBT_PROJECT ?= chipyard MODEL ?= TestHarness VLOG_MODEL ?= $(MODEL) - MODEL_PACKAGE ?= freechips.rocketchip.unittest + MODEL_PACKAGE ?= chipyard.unittest CONFIG ?= CoalescingUnitTestConfig - CONFIG_PACKAGE ?= radiance.memory + CONFIG_PACKAGE ?= radiance.unittest + GENERATOR_PACKAGE ?= chipyard + TB ?= TestDriver + TOP ?= UnitTestSuite +endif +ifeq ($(SUB_PROJECT),tensor) + SBT_PROJECT ?= chipyard + MODEL ?= TestHarness + VLOG_MODEL ?= $(MODEL) + MODEL_PACKAGE ?= chipyard.unittest + CONFIG ?= TensorUnitTestConfig + CONFIG_PACKAGE ?= radiance.unittest GENERATOR_PACKAGE ?= chipyard TB ?= TestDriver TOP ?= UnitTestSuite From 6b232e43a31a093c3b78206f537f792779ce6fe1 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Wed, 23 Oct 2024 14:56:17 -0700 Subject: [PATCH 2/6] Bump radiance with hopper changes --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index 9e86007e..2a8c488d 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 9e86007e9097ccac26efeda0ac918422ed5b4f2f +Subproject commit 2a8c488d282ebc118bf1476c597dd6e8640d100a From 06555a8331c479dc46afb9308bdbff424b9878c8 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 25 Oct 2024 23:03:30 -0700 Subject: [PATCH 3/6] Bump radiance --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index 2a8c488d..13b95777 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 2a8c488d282ebc118bf1476c597dd6e8640d100a +Subproject commit 13b957772378d8795e5ecf2ec409c2eb910a93a1 From a3bf1ff31c43b9f1613085889741d19fa291fd96 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Sun, 27 Oct 2024 18:50:00 -0700 Subject: [PATCH 4/6] Specify no-decoupled tcore for FP16 config --- .../chipyard/src/main/scala/config/RadianceConfigs.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala index 71be3629..25fdbbf4 100644 --- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala @@ -46,7 +46,7 @@ class RadianceBaseConfig extends Config( class RadianceFP16ClusterConfig extends Config( new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 16, accSizeInKB = 64, tileSize = (8, 4, 8), dataType = RadianceGemminiDataType.FP16) ++ - new radiance.subsystem.WithRadianceCores(8, location = InCluster(0), tensorCoreFP16 = true, useVxCache = false) ++ + new radiance.subsystem.WithRadianceCores(8, location = InCluster(0), tensorCoreFP16 = true, tensorCoreDecoupled = false, useVxCache = false) ++ new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 128 << 10, numBanks = 4, numWords = 16) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++ new radiance.subsystem.WithVortexL1Banks(nBanks = 8)++ @@ -66,7 +66,7 @@ class RadianceClusterConfig extends Config( // important to keep gemmini tile before RadianceCores to ensure radiance tile id is 0-indexed new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 8, accSizeInKB = 16, tileSize = 8) ++ // new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 8, accSizeInKB = 16, tileSize = 8) ++ - new radiance.subsystem.WithRadianceCores(4, location = InCluster(0), tensorCoreFP16 = false, useVxCache = false) ++ + new radiance.subsystem.WithRadianceCores(4, location = InCluster(0), tensorCoreFP16 = false, tensorCoreDecoupled = true, useVxCache = false) ++ // new radiance.subsystem.WithRadianceFrameBuffer(x"ff018000", 16, 0x8000, x"ff011000", "fb0") ++ new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 256 << 10/*KBytes*/, numBanks = 8, numWords = 8) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++ From 3b00a3fe74e26af61c228fa101156367afd5ac05 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Sun, 27 Oct 2024 18:50:31 -0700 Subject: [PATCH 5/6] Bump radiance --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index 13b95777..0e389dc3 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 13b957772378d8795e5ecf2ec409c2eb910a93a1 +Subproject commit 0e389dc362b6f753d5fd7a756819ba1fcabef1d0 From d842a8e9265131f946db245520a0ef68f42a9b47 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Sun, 27 Oct 2024 19:48:05 -0700 Subject: [PATCH 6/6] Bump radiance --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index 0e389dc3..c22fd206 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 0e389dc362b6f753d5fd7a756819ba1fcabef1d0 +Subproject commit c22fd20616313163c4fe2e5c883b708164a748eb