mirror of
https://github.com/vortexgpgpu/vortex.git
synced 2025-04-23 21:39:10 -04:00
Merge branch 'graphics' of https://github.com/vortexgpgpu/vortex-dev into graphics
Conflicts: hw/rtl/VX_core.v hw/rtl/VX_csr_data.v hw/rtl/VX_csr_unit.v hw/rtl/VX_decode.v hw/rtl/VX_define.vh hw/rtl/VX_execute.v hw/rtl/VX_gpu_unit.v hw/rtl/VX_instr_demux.v hw/rtl/VX_lsu_unit.v hw/rtl/VX_mem_unit.v hw/rtl/VX_pipeline.v hw/rtl/VX_platform.vh hw/rtl/VX_smem_arb.v hw/rtl/VX_writeback.v hw/rtl/cache/VX_bank.v hw/rtl/interfaces/VX_cache_mem_req_if.v hw/rtl/interfaces/VX_cache_mem_rsp_if.v hw/rtl/interfaces/VX_dcache_core_rsp_if.v hw/rtl/interfaces/VX_dcache_req_if.v hw/rtl/interfaces/VX_icache_core_rsp_if.v hw/rtl/tex_unit/VX_tex_memory.v hw/rtl/tex_unit/VX_tex_unit.v hw/simulate/Makefile hw/syn/quartus/pipeline/Makefile hw/unit_tests/tex_unit/tex_sampler/main.cpp hw/unit_tests/tex_unit/tex_sampler/vl_simulator.h runtime/include/vx_intrinsics.h
This commit is contained in:
commit
94ad34768b
1 changed files with 1 additions and 1 deletions
|
@ -157,7 +157,7 @@
|
|||
"gpu_rsp_tmc": "`GPU_TMC_SIZE",
|
||||
"gpu_rsp_wspawn": "`GPU_WSPAWN_SIZE",
|
||||
"gpu_rsp_split": "`GPU_SPLIT_SIZE",
|
||||
"gpu_rsp_barrier": "`GPU_BARRIER_SIZE"
|
||||
"gpu_rsp_barrier": "`GPU_BARRIER_SIZE"
|
||||
},
|
||||
"afu/vortex/cluster/core/pipeline/execute/lsu_unit": {
|
||||
"?dcache_req_fire":"`NUM_THREADS",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue