From 1aa2d936000e95678f27903b6a8da19e717aea8e Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Mon, 15 Apr 2024 21:46:43 -0700 Subject: [PATCH 1/3] Enable rs1/2/3 duplicated GPR by default --- radiance.mk | 7 ++++--- src/main/scala/radiance/tile/VortexCore.scala | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/radiance.mk b/radiance.mk index 196cf22..26a7927 100644 --- a/radiance.mk +++ b/radiance.mk @@ -2,19 +2,20 @@ # extra variables/targets ingested by the chipyard make system ############################################################## +RADPIE_SRC_DIR = $(base_dir)/generators/radiance/radpie +RADPIE_BUILD_DIR = $(RADPIE_SRC_DIR)/target/release + ################################################################## # THE FOLLOWING MUST BE += operators ################################################################## -RADPIE_SRC_DIR = $(base_dir)/generators/radiance/radpie -RADPIE_BUILD_DIR = $(RADPIE_SRC_DIR)/target/release - # EXTRA_SIM_REQS += radpie EXTRA_SIM_LDFLAGS += -L$(RADPIE_BUILD_DIR) -Wl,-rpath,$(RADPIE_BUILD_DIR) -lradpie EXTRA_SIM_PREPROC_DEFINES += \ +define+SIMULATION \ +define+SV_DPI \ +define+GPR_RESET \ + +define+GPR_DUPLICATED \ +define+LSU_DUP_DISABLE \ +define+DBG_TRACE_CORE_PIPELINE_VCS \ +define+PERF_ENABLE \ diff --git a/src/main/scala/radiance/tile/VortexCore.scala b/src/main/scala/radiance/tile/VortexCore.scala index b10ac58..f61c35f 100644 --- a/src/main/scala/radiance/tile/VortexCore.scala +++ b/src/main/scala/radiance/tile/VortexCore.scala @@ -175,7 +175,8 @@ class Vortex(tile: RadianceTile)(implicit p: Parameters) addResource("/vsrc/vortex/hw/rtl/core/VX_issue.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_lsu_unit.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_muldiv_unit.sv") - addResource("/vsrc/vortex/hw/rtl/core/VX_operands.sv") + // addResource("/vsrc/vortex/hw/rtl/core/VX_operands.sv") + addResource("/vsrc/vortex/hw/rtl/core/VX_operands_dup.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_pending_instr.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_schedule.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_scoreboard.sv") From 378d298a0606a94b05cd6cf95a49c34a76fb956d Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Mon, 15 Apr 2024 21:49:14 -0700 Subject: [PATCH 2/3] Bump vortex for RF dup --- src/main/resources/vsrc/vortex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/vsrc/vortex b/src/main/resources/vsrc/vortex index d3e0f18..4752b86 160000 --- a/src/main/resources/vsrc/vortex +++ b/src/main/resources/vsrc/vortex @@ -1 +1 @@ -Subproject commit d3e0f18fd54e2bd0b1d7744df89a6555df0366c4 +Subproject commit 4752b868583541c40b089249b7f24fabea55828a From 3b9f538aa2845f1becc42bdc451c1faa596255f4 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Mon, 15 Apr 2024 22:20:02 -0700 Subject: [PATCH 3/3] Fix elaboration error when both including dup-nondup RF --- src/main/resources/vsrc/vortex | 2 +- src/main/scala/radiance/tile/VortexCore.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/vsrc/vortex b/src/main/resources/vsrc/vortex index 4752b86..217bc18 160000 --- a/src/main/resources/vsrc/vortex +++ b/src/main/resources/vsrc/vortex @@ -1 +1 @@ -Subproject commit 4752b868583541c40b089249b7f24fabea55828a +Subproject commit 217bc189da90c29200635d2d7224bdf6a476bf27 diff --git a/src/main/scala/radiance/tile/VortexCore.scala b/src/main/scala/radiance/tile/VortexCore.scala index f61c35f..c00a85c 100644 --- a/src/main/scala/radiance/tile/VortexCore.scala +++ b/src/main/scala/radiance/tile/VortexCore.scala @@ -175,7 +175,7 @@ class Vortex(tile: RadianceTile)(implicit p: Parameters) addResource("/vsrc/vortex/hw/rtl/core/VX_issue.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_lsu_unit.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_muldiv_unit.sv") - // addResource("/vsrc/vortex/hw/rtl/core/VX_operands.sv") + addResource("/vsrc/vortex/hw/rtl/core/VX_operands.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_operands_dup.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_pending_instr.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_schedule.sv")