github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-22 21:09:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor update

Browse source
This commit is contained in:
Blaise Tine 2023-04-06 20:58:02 -07:00
parent d67deb53c4
commit 77acfaec00
16 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

0
hw/rtl/afu/opae/ccip/local_mem_cfg_pkg.sv → hw/rtl/afu/opae/local_mem_cfg_pkg.sv
View file

6
hw/rtl/afu/opae/vortex_afu.sv
View file

@ -1,10 +1,4 @@
`ifndef NOPAE
`include "afu_json_info.vh"
`else
`include "vortex_afu.vh"
`endif
`include "VX_define.vh"
`include "VX_gpu_types.vh"
/* verilator lint_off IMPORTSTAR */
import ccip_if_pkg::*;

12
hw/rtl/afu/opae/vortex_afu.vh
View file

@ -1,8 +1,9 @@
`ifndef VORTEX_AFU_VH
`define VORTEX_AFU_VH
`include "ccip_if_pkg.sv"
`ifndef NOPAE
`include "afu_json_info.vh"
`else
`define PLATFORM_PROVIDES_LOCAL_MEMORY
`ifndef PLATFORM_PARAM_LOCAL_MEMORY_BANKS
@ -21,8 +22,6 @@
`define PLATFORM_PARAM_LOCAL_MEMORY_BURST_CNT_WIDTH 4
`endif
`include "local_mem_cfg_pkg.sv"
`define AFU_ACCEL_NAME "vortex_afu"
`define AFU_ACCEL_UUID 128'h35f9452b_25c2_434c_93d5_6f8c60db361c
@ -45,4 +44,9 @@
`define AFU_IMAGE_POWER 0
`define AFU_TOP_IFC "ccip_std_afu_avalon_mm"
`endif // NOPAE
`include "VX_define.vh"
`include "VX_gpu_types.vh"
`endif // VORTEX_AFU_VH

2
hw/rtl/afu/xrt/VX_afu_ctrl.sv
View file

@ -1,4 +1,4 @@
`include "VX_define.vh"
`include "vortex_afu.vh"
module VX_afu_ctrl #(
parameter AXI_ADDR_WIDTH = 6,

1
hw/rtl/afu/xrt/VX_afu_wrap.sv
View file

@ -1,4 +1,3 @@
`include "VX_define.vh"
`include "vortex_afu.vh"
module VX_afu_wrap #(

1
hw/rtl/afu/xrt/vortex_afu.v
View file

@ -1,4 +1,3 @@
`include "VX_define.vh"
`include "vortex_afu.vh"
module vortex_afu #(

2
hw/rtl/afu/xrt/vortex_afu.vh
View file

@ -94,4 +94,6 @@
assign m_axi_mem_bresp_a[i] = m``i``_axi_mem_bresp; \
assign m_axi_mem_bid_a[i] = m``i``_axi_mem_bid
`include "VX_define.vh"
`endif // VORTEX_AFU_VH

2
hw/syn/altera/opae/Makefile
View file

@ -96,7 +96,7 @@ vortex_afu.h: vortex_afu.json
setup:
mkdir -p $(BUILD_DIR)/src
$(SCRIPT_DIR)/gen_sources.sh $(CFLAGS) -F$(BUILD_DIR)/src -P -Osources.txt
$(SCRIPT_DIR)/gen_sources.sh $(CFLAGS) -F$(BUILD_DIR)/src -Osources.txt
ifeq ($(TARGET), ase)
afu_sim_setup -f -s setup.cfg $(BUILD_DIR)
else

9
hw/syn/altera/quartus/common.mk
View file

@ -13,7 +13,10 @@ ifeq ($(DEVICE_FAMILY), arria10)
DEVICE = 10AX115N3F40E2SG
endif
CONFIGS += -set "NDEBUG"
CONFIGS += -DNDEBUG
CONFIGS += -DQUARTUS
CONFIGS += -DSYNTHESIS
CONFIGS += -DNOGLOBALS
PROJECT_FILES = $(PROJECT).qpf $(PROJECT).qsf
@ -30,7 +33,7 @@ all: gen-sources $(PROJECT).sta.rpt $(PROJECT).pow.rpt
gen-sources: src
src:
mkdir -p src
$(SCRIPT_DIR)/gen_sources.sh $(RTL_INCLUDE) -Fsrc
$(SCRIPT_DIR)/gen_sources.sh $(CONFIGS) $(RTL_INCLUDE) -P -Fsrc
syn: $(PROJECT).syn.rpt
@ -71,7 +74,7 @@ smart.log: $(PROJECT_FILES)
# Project initialization
$(PROJECT_FILES): gen-sources
quartus_sh -t ../../project.tcl -project $(PROJECT) -family $(FAMILY) -device $(DEVICE) -top $(TOP_LEVEL_ENTITY) -src "$(SRC_FILE)" -sdc ../../project.sdc -inc "src" $(CONFIGS)
quartus_sh -t ../../project.tcl -project $(PROJECT) -family $(FAMILY) -device $(DEVICE) -top $(TOP_LEVEL_ENTITY) -src "$(SRC_FILE)" -sdc ../../project.sdc -inc "src"
syn.chg:
$(STAMP) syn.chg

2
hw/syn/altera/quartus/core/Makefile
View file

@ -4,7 +4,7 @@ SRC_FILE = VX_core.sv
include ../../common.mk
CONFIGS += -set "EXT_GFX_ENABLE"
CONFIGS += -DEXT_GFX_ENABLE
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
GFX_INCLUDE = -I$(RTL_DIR)/tex_unit -I$(RTL_DIR)/raster_unit -I$(RTL_DIR)/rop_unit

2
hw/syn/altera/quartus/project.tcl
View file

@ -35,8 +35,6 @@ set_global_assignment -name PROJECT_OUTPUT_DIRECTORY bin
set_global_assignment -name NUM_PARALLEL_PROCESSORS ALL
set_global_assignment -name VERILOG_INPUT_VERSION SYSTEMVERILOG_2009
set_global_assignment -name ADD_PASS_THROUGH_LOGIC_TO_INFERRED_RAMS ON
set_global_assignment -name VERILOG_MACRO QUARTUS
set_global_assignment -name VERILOG_MACRO SYNTHESIS
set_global_assignment -name MESSAGE_DISABLE 16818
set_global_assignment -name TIMEQUEST_DO_REPORT_TIMING ON

2
hw/syn/altera/quartus/test/Makefile
View file

@ -4,7 +4,7 @@ SRC_FILE = $(PROJECT).sv
include ../../common.mk
CONFIGS += -set "EXT_GFX_ENABLE"
CONFIGS += -DEXT_GFX_ENABLE
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
GFX_INCLUDE = -I$(RTL_DIR)/tex_unit -I$(RTL_DIR)/raster_unit -I$(RTL_DIR)/rop_unit

16
hw/syn/altera/quartus/top-gfx/Makefile
View file

@ -4,17 +4,17 @@ SRC_FILE = $(PROJECT).sv
include ../../common.mk
CONFIGS += -set "NOPAE"
CONFIGS += -set "EXT_GFX_ENABLE"
CONFIGS += -DNOPAE
CONFIGS += -DEXT_GFX_ENABLE
CONFIGS += -set "NUM_CORES=16"
CONFIGS += -set "NUM_CLUSTERS=1"
CONFIGS += -DNUM_CORES=16
CONFIGS += -DNUM_CLUSTERS=1
CONFIGS += -set "L2_ENABLE"
CONFIGS += -DL2_ENABLE
#CONFIGS += -set "L1_DISABLE"
#CONFIGS += -set "SM_DISABLE"
#CONFIGS += -set "RCACHE_DISABLE" -set "OCACHE_DISABLE" -set "TCACHE_DISABLE"
#CONFIGS += -DL1_DISABLE
#CONFIGS += -DSM_DISABLE
#CONFIGS += -DRCACHE_DISABLE -DOCACHE_DISABLE -DTCACHE_DISABLE
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
TEX_INCLUDE = -I$(RTL_DIR)/tex_unit -I$(RTL_DIR)/raster_unit -I$(RTL_DIR)/rop_unit

10
hw/syn/altera/quartus/top/Makefile
View file

@ -4,14 +4,14 @@ SRC_FILE = $(PROJECT).sv
include ../../common.mk
CONFIGS += -set "NOPAE"
CONFIGS += -DNOPAE
CONFIGS += -set "NUM_CORES=16"
CONFIGS += -DNUM_CORES=16
CONFIGS += -set "L2_ENABLE"
CONFIGS += -DL2_ENABLE
#CONFIGS += -set "L1_DISABLE"
#CONFIGS += -set "SM_DISABLE"
#CONFIGS += -DL1_DISABLE
#CONFIGS += -DSM_DISABLE
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
TEX_INCLUDE = -I$(RTL_DIR)/tex_unit

16
hw/syn/altera/quartus/vortex-gfx/Makefile
View file

@ -4,21 +4,21 @@ SRC_FILE = $(PROJECT).sv
include ../../common.mk
CONFIGS += -set "EXT_GFX_ENABLE"
CONFIGS += -DEXT_GFX_ENABLE
#CONFIGS += -set "L1_DISABLE"
#CONFIGS += -DL1_DISABLE
#CONFIGS += -set "SM_DISABLE"
#CONFIGS += -DSM_DISABLE
#CONFIGS += -set "RCACHE_DISABLE" -set "OCACHE_DISABLE" -set "TCACHE_DISABLE"
#CONFIGS += -DRCACHE_DISABLE -DOCACHE_DISABLE -DTCACHE_DISABLE
#CONFIGS += -set "EXT_F_DISABLE"
#CONFIGS += -DEXT_F_DISABLE
#CONFIGS += -set "NUM_WARPS=2" -set "NUM_THREADS=2"
#CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2
CONFIGS += -set "NUM_CORES=2"
CONFIGS += -DNUM_CORES=2
CONFIGS += -set "L2_ENABLE"
CONFIGS += -DL2_ENABLE
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
GFX_INCLUDE = -I$(RTL_DIR)/tex_unit -I$(RTL_DIR)/raster_unit -I$(RTL_DIR)/rop_unit

12
hw/syn/altera/quartus/vortex/Makefile
View file

@ -4,17 +4,17 @@ SRC_FILE = $(PROJECT).sv
include ../../common.mk
CONFIGS += -set "NUM_CORES=2"
CONFIGS += -DNUM_CORES=2
CONFIGS += -set "L2_ENABLE"
CONFIGS += -DL2_ENABLE
#CONFIGS += -set "L1_DISABLE"
#CONFIGS += -DL1_DISABLE
#CONFIGS += -set "SM_DISABLE"
#CONFIGS += -DSM_DISABLE
#CONFIGS += -set "EXT_F_DISABLE"
#CONFIGS += -DEXT_F_DISABLE
#CONFIGS += -set "NUM_WARPS=2" -set "NUM_THREADS=2"
#CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2
FPU_INCLUDE = -I$(RTL_DIR)/fpu_unit -I$(THIRD_PARTY_DIR)/fpnew/src -I$(THIRD_PARTY_DIR)/fpnew/src/fpu_div_sqrt_mvp/hdl -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/include -I$(THIRD_PARTY_DIR)/fpnew/src/common_cells/src
TEX_INCLUDE = -I$(RTL_DIR)/tex_unit