Merge branch 'develop' of https://github.com/vortexgpgpu/vortex into develop

Conflicts:
	hw/rtl/core/VX_lsu_unit.sv
This commit is contained in:
Blaise Tine 2023-12-18 13:01:13 -08:00
commit cf51770c2c

View file

@ -554,7 +554,7 @@ module VX_lsu_unit import VX_gpu_pkg::*; #(
VX_stream_arb #(
.NUM_INPUTS (2),
.DATAW (RSP_ARB_DATAW),
.OUT_REG (2)
.OUT_REG (3)
) rsp_arb (
.clk (clk),
.reset (commit_reset),