wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'graphics' of https://github.com/hansungk/chipyard into graphics

Browse Source
This commit is contained in:
Richard Yan
2024-06-12 02:26:57 -07:00
parent d3aff01831 b901000fa6
commit 3ab8fc7b7a
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common.mk
View File

@@ -323,7 +323,7 @@ get_common_sim_flags = $(SIM_FLAGS) $(EXTRA_SIM_FLAGS) $(SEED_FLAG) $(call get_l
# run normal binary with hardware-logged insn dissassembly
run-binary: check-binary $(BINARY).run
run-binaries: check-binaries $(addsuffix .run,$(BINARIES))
run-binaries: check-binaries $(addsuffix .run,$(wildcard $(BINARIES)))
%.run: %.check-exists $(SIM_PREREQ) | $(output_dir)
(set -o pipefail && $(NUMA_PREFIX) $(sim) \
@@ -337,7 +337,7 @@ run-binaries: check-binaries $(addsuffix .run,$(BINARIES))
# run simulator as fast as possible (no insn disassembly)
run-binary-fast: check-binary $(BINARY).run.fast
run-binaries-fast: check-binaries $(addsuffix .run.fast,$(BINARIES))
run-binaries-fast: check-binaries $(addsuffix .run.fast,$(wildcard $(BINARIES)))
%.run.fast: %.check-exists $(SIM_PREREQ) | $(output_dir)
(set -o pipefail && $(NUMA_PREFIX) $(sim) \
@@ -350,7 +350,7 @@ run-binaries-fast: check-binaries $(addsuffix .run.fast,$(BINARIES))
# run simulator with as much debug info as possible
run-binary-debug: check-binary $(BINARY).run.debug
run-binaries-debug: check-binaries $(addsuffix .run.debug,$(BINARIES))
run-binaries-debug: check-binaries $(addsuffix .run.debug,$(wildcard $(BINARIES)))
%.run.debug: %.check-exists $(SIM_DEBUG_PREREQ) | $(output_dir)
if [ "$*" != "none" ]; then riscv64-unknown-elf-objdump -D -S $* > $(call get_sim_out_name,$*).dump ; fi

24
generators/chipyard/src/main/scala/config/RadianceConfigs.scala
View File

@@ -19,7 +19,7 @@ class WithRadROMs(address: BigInt, size: Int, filename: String) extends Config((
})
class WithRadBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10100) extends Config((site, here, up) => {
case BootROMLocated(x) => up(BootROMLocated(x), site)
case BootROMLocated(x) => up(BootROMLocated(x))
.map(_.copy(
address = address,
size = size,
@@ -39,8 +39,8 @@ class RadianceBaseConfig(argsBinFilename: String = "args.bin") extends Config(
new chipyard.config.WithSystemBusWidth(bitWidth = 256) ++
new WithExtMemSize(BigInt("80000000", 16)) ++
new WithRadBootROM() ++
new WithRadROMs(0x7FFF0000L, 0x10000, s"sims/${argsBinFilename}") ++
// new chipyard.harness.WithCeaseSuccess ++
// new WithRadROMs(0x7FFF0000L, 0x10000, s"sims/${argsBinFilename}") ++
// new chipyard.harness.WithCeaseSuccess ++
new chipyard.iobinders.WithCeasePunchThrough ++
new radiance.subsystem.WithRadianceSimParams(true) ++
new WithCacheBlockBytes(64) ++
@@ -54,21 +54,33 @@ class RadianceClusterConfig extends Config(
new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 8, accSizeInKB = 16, tileSize = 8) ++
new radiance.subsystem.WithRadianceCores(4, location = InCluster(0), useVxCache = false) ++
// new radiance.subsystem.WithRadianceFrameBuffer(x"ff018000", 16, 0x8000, x"ff011000", "fb0") ++
new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 64 << 10, numBanks = 4, numWords = 8) ++
new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 64 << 10, numBanks = 4, numWords = 8, serializeUnaligned = true) ++
new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++
new radiance.subsystem.WithVortexL1Banks(nBanks = 8)++
new radiance.subsystem.WithRadianceCluster(0) ++
new RadianceBaseConfig)
class Radiance16KClusterConfig extends Config(
class RadianceClusterSmem16KConfig extends Config(
new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 8, accSizeInKB = 4, tileSize = 4) ++
new radiance.subsystem.WithRadianceCores(2, location = InCluster(0), useVxCache = false) ++
new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 16 << 10, numBanks = 4, numWords = 8) ++
new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 16 << 10, numBanks = 4, numWords = 8, serializeUnaligned = false) ++
new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++
new radiance.subsystem.WithVortexL1Banks(nBanks = 8)++
new radiance.subsystem.WithRadianceCluster(0) ++
new RadianceBaseConfig)
class RadianceTwoClustersSmem16KConfig extends Config(
new radiance.subsystem.WithRadianceGemmini(location = InCluster(0), dim = 8, accSizeInKB = 4, tileSize = 4) ++
new radiance.subsystem.WithRadianceCores(2, location = InCluster(0), useVxCache = false) ++
new radiance.subsystem.WithRadianceGemmini(location = InCluster(1), dim = 8, accSizeInKB = 4, tileSize = 4) ++
new radiance.subsystem.WithRadianceCores(2, location = InCluster(1), useVxCache = false) ++
new radiance.subsystem.WithRadianceSharedMem(address = x"ff000000", size = 16 << 10, numBanks = 4, numWords = 8, serializeUnaligned = false) ++
new radiance.subsystem.WithCoalescer(nNewSrcIds = 16) ++
new radiance.subsystem.WithVortexL1Banks(nBanks = 8)++
new radiance.subsystem.WithRadianceCluster(0) ++
new radiance.subsystem.WithRadianceCluster(1) ++
new RadianceBaseConfig)
class RadianceClusterConfig0 extends Config(
new radiance.subsystem.WithRadianceCores(2, location=InCluster(0), useVxCache = false) ++
// new radiance.subsystem.WithCoalescer(nNewSrcIds = 8, enable = false) ++

2
generators/radiance

Submodule generators/radiance updated: 17756d5f53...1401c4a090

2
generators/rocket-chip

Submodule generators/rocket-chip updated: cf654499ab...c6fa6b918d