From 1b00d540f0a964dfbe86449df6491eda7910d639 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Tue, 17 Nov 2020 15:14:30 -0800 Subject: [PATCH 1/3] Add config fragment for replacing L2 with broadcastManager --- generators/chipyard/src/main/scala/ConfigFragments.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generators/chipyard/src/main/scala/ConfigFragments.scala b/generators/chipyard/src/main/scala/ConfigFragments.scala index 479120ba..c5c85e47 100644 --- a/generators/chipyard/src/main/scala/ConfigFragments.scala +++ b/generators/chipyard/src/main/scala/ConfigFragments.scala @@ -151,6 +151,11 @@ class WithRocketDCacheScratchpad extends Config((site, here, up) => { } }) +// Replaces the L2 with a broadcast manager for maintaining coherence +class WithBroadcastManager extends Config((site, here, up) => { + case BankedL2Key => up(BankedL2Key, site).copy(coherenceManager = CoherenceManagerWrapper.broadcastManager) +}) + class WithHwachaTest extends Config((site, here, up) => { case TestSuitesKey => (tileParams: Seq[TileParams], suiteHelper: TestSuiteHelper, p: Parameters) => { up(TestSuitesKey).apply(tileParams, suiteHelper, p) From 94c85c70bbe173077d1665190ccf1e3863bfeb4e Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Mon, 16 Nov 2020 10:37:23 -0800 Subject: [PATCH 2/3] bump IceNet for input/output tap and checksum fixes --- generators/icenet | 2 +- software/firemarshal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/icenet b/generators/icenet index 277a9080..c14e5a02 160000 --- a/generators/icenet +++ b/generators/icenet @@ -1 +1 @@ -Subproject commit 277a9080fe92afb25d942f3207252e0ddea1b864 +Subproject commit c14e5a02a7e4fee4d59b6cb0c1087976aba3fe14 diff --git a/software/firemarshal b/software/firemarshal index 45aebace..199f23ed 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit 45aebace86d3a46c357337a19d4c8e894a5d0ed4 +Subproject commit 199f23ed74f723313b3bf225a9b4cfed8b6f6399 From 71a3ea8abcacd9907b3a1bcc4e2588b6905526fa Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Tue, 24 Nov 2020 16:44:20 -0800 Subject: [PATCH 3/3] Allow custom verilator optimization flags --- sims/verilator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index 65e64179..2b250ee9 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -84,7 +84,7 @@ TRACING_CFLAGS := $(if $(filter $(VERILATOR_FST_MODE),0),,-DCY_FST_TRACE) #---------------------------------------------------------------------------------------- # we initially had --noassert for performance, but several modules use # assertions, including dramsim, so we enable --assert by default -VERILATOR_OPT_FLAGS := \ +VERILATOR_OPT_FLAGS ?= \ -O3 \ --x-assign fast \ --x-initial fast \