From 3e3678fbcb5deb5a75c137ceaa74437ff32317f9 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Thu, 2 May 2024 15:06:11 -0700 Subject: [PATCH 1/3] Enable addResources for tensor_core Adds back some non-synthesizable modules. --- src/main/scala/radiance/tile/VortexCore.scala | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/main/scala/radiance/tile/VortexCore.scala b/src/main/scala/radiance/tile/VortexCore.scala index ba74508..f5be91d 100644 --- a/src/main/scala/radiance/tile/VortexCore.scala +++ b/src/main/scala/radiance/tile/VortexCore.scala @@ -277,8 +277,11 @@ class Vortex(tile: RadianceTile)(implicit p: Parameters) addResource("/vsrc/vortex/hw/rtl/libs/VX_stream_switch.sv") addResource("/vsrc/vortex/hw/rtl/libs/VX_stream_xbar.sv") - // addResource("/vsrc/vortex/hw/dpi/float_dpi.cpp") - // addResource("/vsrc/vortex/hw/dpi/float_dpi.vh") + // start comment out for synthesis ------------------------ + addResource("/vsrc/vortex/hw/dpi/float_dpi.cpp") + addResource("/vsrc/vortex/hw/dpi/float_dpi.vh") + addResource("/vsrc/vortex/hw/dpi/half.h") + // end comment out for synthesis -------------------------- addResource("/vsrc/vortex/hw/dpi/util_dpi.cpp") addResource("/vsrc/vortex/hw/dpi/util_dpi.vh") // needed dpi cpp files @@ -303,19 +306,21 @@ class Vortex(tile: RadianceTile)(implicit p: Parameters) addResource("/csrc/softfloat/RISCV/specialize.h") // fpu - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_class.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_cvt.sv") - addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_define.vh") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_div.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_dpi.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_dsp.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_fma.sv") - addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_fpnew.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_ncomp.sv") - addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_pkg.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_rounding.sv") - // addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_sqrt.sv") + // start comment out for synthesis ------------------------ + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_class.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_cvt.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_div.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_dpi.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_dsp.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_fma.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_ncomp.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_rounding.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_sqrt.sv") + // end comment out for synthesis -------------------------- addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_to_csr_if.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_define.vh") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_pkg.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_fpu_fpnew.sv") addResource("/vsrc/vortex/hw/rtl/core/VX_fpu_unit.sv") // fpnew @@ -373,6 +378,13 @@ class Vortex(tile: RadianceTile)(implicit p: Parameters) addResource("/vsrc/vortex/hw/rtl/interfaces/VX_warp_ctl_if.sv") addResource("/vsrc/vortex/hw/rtl/interfaces/VX_writeback_if.sv") + // tensor core + addResource("/vsrc/vortex/hw/rtl/core/VX_tensor_core.sv") + addResource("/vsrc/vortex/hw/rtl/core/VX_tensor_ucode.vh") + addResource("/vsrc/vortex/hw/rtl/core/VX_uop_sequencer.sv") + addResource("/vsrc/vortex/hw/rtl/core/VX_reduce_unit.sv") + addResource("/vsrc/vortex/hw/rtl/fpu/VX_tensor_dpu.sv") + if (tile.radianceParams.useVxCache) { addResource("/vsrc/vortex/hw/rtl/libs/VX_pending_size.sv") addResource("/vsrc/vortex/hw/rtl/cache/VX_shared_mem.sv") From 2d298ff8b7044a3d83251292bc23ccb4933b7142 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Thu, 2 May 2024 16:15:08 -0700 Subject: [PATCH 2/3] Add EXT_T_DISABLE by default --- radiance.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/radiance.mk b/radiance.mk index 5eddf00..4711c93 100644 --- a/radiance.mk +++ b/radiance.mk @@ -21,6 +21,7 @@ EXTRA_SIM_PREPROC_DEFINES += \ +define+GBAR_ENABLE \ +define+GBAR_CLUSTER_ENABLE \ +define+FPU_FPNEW \ + +define+EXT_T_DISABLE \ +define+NUM_BARRIERS=8 \ +define+NUM_CORES=2 +define+NUM_THREADS=8 +define+NUM_WARPS=8 # Can't increase this to above 14, since the binary accesses 0xff0040.. From 9b2846fcee12fcc268648acaede590fcbe57f300 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Thu, 2 May 2024 16:18:51 -0700 Subject: [PATCH 3/3] Bump vortex to tensor_core merge --- 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 85213d2..bc45c40 160000 --- a/src/main/resources/vsrc/vortex +++ b/src/main/resources/vsrc/vortex @@ -1 +1 @@ -Subproject commit 85213d287674be2b0a57ef9e4908bfd183d92802 +Subproject commit bc45c402314183d18a914613f09527e8cb931067