From 44727dea7ba41c608385e49395d9e41179a4efa7 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Wed, 17 Apr 2024 16:47:01 -0700 Subject: [PATCH 1/2] Add EXTRA_SIM_OUT_NAME --- common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index b31ddafc..84f9d498 100644 --- a/common.mk +++ b/common.mk @@ -28,6 +28,7 @@ EXTRA_SIM_CXXFLAGS ?= EXTRA_SIM_LDFLAGS ?= EXTRA_SIM_SOURCES ?= EXTRA_SIM_REQS ?= +EXTRA_SIM_OUT_NAME ?= ifneq ($(ASPECTS), ) comma = , @@ -361,7 +362,7 @@ get_loadarch_flag = +loadarch=$(subst mem.elf,loadarch,$(1)) endif # get the output path base name for simulation outputs, First arg is the binary -get_sim_out_name = $(output_dir)/$(call get_out_name,$(1)) +get_sim_out_name = $(output_dir)/$(call get_out_name,$(1))$(if $(EXTRA_SIM_OUT_NAME),.$(EXTRA_SIM_OUT_NAME),) # sim flags that are common to run-binary/run-binary-fast/run-binary-debug get_common_sim_flags = $(SIM_FLAGS) $(EXTRA_SIM_FLAGS) $(SEED_FLAG) $(call get_loadmem_flag,$(1)) $(call get_loadarch_flag,$(1)) From 89deaf4bd29f712d1769bdaff5fb0800b0f79e06 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Wed, 17 Apr 2024 16:47:55 -0700 Subject: [PATCH 2/2] WIP: disable Gemmini tile temporarily --- .../src/main/scala/config/RadianceConfigs.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala index 97df7d0e..d7f82a1e 100644 --- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala @@ -36,29 +36,29 @@ class WithRadBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigIn class RadianceBaseConfig(argsBinFilename: String = "args.bin") extends Config( // NOTE: when changing these, remember to change +define+NUM_CORES/THREADS/WARPS in // radiance.mk as well! - new radiance.subsystem.WithSimtConfig(nWarps = 8, nCoreLanes = 8, nMemLanes = 8, nSrcIds = 8) ++ + new radiance.subsystem.WithSimtConfig(nWarps = 8, nCoreLanes = 8, nMemLanes = 8, nSrcIds = 16) ++ new chipyard.config.WithSystemBusWidth(bitWidth = 256) ++ new WithExtMemSize(BigInt("80000000", 16)) ++ new WithRadBootROM() ++ new WithRadROMs(0x7FFF0000L, 0x10000, s"sims/${argsBinFilename}") ++ - new WithRadROMs(0x20000L, 0x8000, "sims/op_a.bin") ++ - new WithRadROMs(0x28000L, 0x8000, "sims/op_b.bin") ++ + new WithRadROMs(0x20000L, 0x20000, "sims/op_a.bin") ++ + new WithRadROMs(0x40000L, 0x20000, "sims/op_b.bin") ++ new chipyard.harness.WithCeaseSuccess ++ new chipyard.iobinders.WithCeasePunchThrough ++ new AbstractConfig) class RadianceConfig 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 WithRadianceGemmini(location = InCluster(0), dim = 8, extMemBase = x"ff000000", spSizeInKB = 16, accSizeInKB = 8) ++ new radiance.subsystem.WithRadianceCores(1, location=InCluster(0), useVxCache = false) ++ - new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++ + new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++ new radiance.subsystem.WithVortexL1Banks(nBanks = 4)++ new radiance.subsystem.WithRadianceCluster(0) ++ 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 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 = 8)++