fcvt fix
This commit is contained in:
@@ -33,7 +33,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT) kernel.pocl
|
run-fpga: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-ase: $(PROJECT) kernel.pocl
|
run-asesim: $(PROJECT) kernel.pocl
|
||||||
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT) kernel.pocl
|
run-vlsim: $(PROJECT) kernel.pocl
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
|
|||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP
|
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
||||||
@@ -83,7 +82,7 @@ VL_FLAGS += -DNOPAE
|
|||||||
CFLAGS += -DNOPAE
|
CFLAGS += -DNOPAE
|
||||||
|
|
||||||
# use DPI FPU
|
# use DPI FPU
|
||||||
VL_FLAGS += -DFPU_DPI
|
#VL_FLAGS += -DFPU_DPI
|
||||||
|
|
||||||
PROJECT = libopae-c-vlsim.so
|
PROJECT = libopae-c-vlsim.so
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
|
|||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP
|
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT)
|
run-fpga: $(PROJECT)
|
||||||
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-ase: $(PROJECT)
|
run-asesim: $(PROJECT)
|
||||||
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT)
|
run-vlsim: $(PROJECT)
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT)
|
run-fpga: $(PROJECT)
|
||||||
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-ase: $(PROJECT)
|
run-asesim: $(PROJECT)
|
||||||
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT)
|
run-vlsim: $(PROJECT)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ $(PROJECT): $(SRCS)
|
|||||||
run-fpga: $(PROJECT)
|
run-fpga: $(PROJECT)
|
||||||
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-ase: $(PROJECT)
|
run-asesim: $(PROJECT)
|
||||||
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
|
||||||
|
|
||||||
run-vlsim: $(PROJECT)
|
run-vlsim: $(PROJECT)
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#+define+DBG_PRINT_CORE_ICACHE
|
#+define+DBG_PRINT_CORE_ICACHE
|
||||||
#+define+DBG_PRINT_CORE_DCACHE
|
#+define+DBG_PRINT_CORE_DCACHE
|
||||||
#+define+DBG_PRINT_CACHE_BANK
|
#+define+DBG_PRINT_CACHE_BANK
|
||||||
#+define+DBG_PRINT_CACHE_SNP
|
|
||||||
#+define+DBG_PRINT_CACHE_MSRQ
|
#+define+DBG_PRINT_CACHE_MSRQ
|
||||||
#+define+DBG_PRINT_CACHE_TAG
|
#+define+DBG_PRINT_CACHE_TAG
|
||||||
#+define+DBG_PRINT_CACHE_DATA
|
#+define+DBG_PRINT_CACHE_DATA
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ module VX_fpu_unit #(
|
|||||||
|
|
||||||
VX_index_buffer #(
|
VX_index_buffer #(
|
||||||
.DATAW (`NW_BITS + `NUM_THREADS + 32 + `NR_BITS + 1),
|
.DATAW (`NW_BITS + `NUM_THREADS + 32 + `NR_BITS + 1),
|
||||||
.SIZE (`FPUQ_SIZE),
|
.SIZE (`FPUQ_SIZE)
|
||||||
.FASTRAM (1)
|
|
||||||
) req_metadata (
|
) req_metadata (
|
||||||
.clk (clk),
|
.clk (clk),
|
||||||
.reset (reset),
|
.reset (reset),
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ module VX_lsu_unit #(
|
|||||||
`IGNORE_WARNINGS_END
|
`IGNORE_WARNINGS_END
|
||||||
|
|
||||||
wire ready_in;
|
wire ready_in;
|
||||||
wire stall_in = ~ready_in & req_valid;
|
wire stall_in = ~ready_in && req_valid;
|
||||||
|
|
||||||
VX_pipe_register #(
|
VX_pipe_register #(
|
||||||
.DATAW (1 + 1 + `NW_BITS + `NUM_THREADS + 32 + (`NUM_THREADS * 32) + `LSU_BITS + `NR_BITS + 1 + (`NUM_THREADS * 32)),
|
.DATAW (1 + 1 + `NW_BITS + `NUM_THREADS + 32 + (`NUM_THREADS * 32) + `LSU_BITS + `NR_BITS + 1 + (`NUM_THREADS * 32)),
|
||||||
@@ -96,8 +96,7 @@ module VX_lsu_unit #(
|
|||||||
|
|
||||||
VX_index_buffer #(
|
VX_index_buffer #(
|
||||||
.DATAW (`NW_BITS + 32 + `NR_BITS + 1 + `LSU_BITS + (`NUM_THREADS * 2) + 1),
|
.DATAW (`NW_BITS + 32 + `NR_BITS + 1 + `LSU_BITS + (`NUM_THREADS * 2) + 1),
|
||||||
.SIZE (`LSUQ_SIZE),
|
.SIZE (`LSUQ_SIZE)
|
||||||
.FASTRAM (1)
|
|
||||||
) req_metadata (
|
) req_metadata (
|
||||||
.clk (clk),
|
.clk (clk),
|
||||||
.reset (reset),
|
.reset (reset),
|
||||||
@@ -171,7 +170,7 @@ module VX_lsu_unit #(
|
|||||||
1: mem_req_data[i][31:8] = req_data[i][23:0];
|
1: mem_req_data[i][31:8] = req_data[i][23:0];
|
||||||
2: mem_req_data[i][31:16] = req_data[i][15:0];
|
2: mem_req_data[i][31:16] = req_data[i][15:0];
|
||||||
3: mem_req_data[i][31:24] = req_data[i][7:0];
|
3: mem_req_data[i][31:24] = req_data[i][7:0];
|
||||||
default: mem_req_data[i] = req_data[i];
|
default: mem_req_data[i] = req_data[i];
|
||||||
endcase
|
endcase
|
||||||
|
|
||||||
mem_req_addr[i] = req_addr[i][31:2];
|
mem_req_addr[i] = req_addr[i][31:2];
|
||||||
|
|||||||
113
hw/rtl/cache/VX_bank.v
vendored
113
hw/rtl/cache/VX_bank.v
vendored
@@ -86,8 +86,8 @@ module VX_bank #(
|
|||||||
|
|
||||||
`ifdef DBG_CACHE_REQ_INFO
|
`ifdef DBG_CACHE_REQ_INFO
|
||||||
/* verilator lint_off UNUSED */
|
/* verilator lint_off UNUSED */
|
||||||
wire [31:0] debug_pc_st0, debug_pc_st1;
|
wire [31:0] debug_pc_sel, debug_pc_st0, debug_pc_st1;
|
||||||
wire [`NW_BITS-1:0] debug_wid_st0, debug_wid_st1;
|
wire [`NW_BITS-1:0] debug_wid_sel, debug_wid_st0, debug_wid_st1;
|
||||||
/* verilator lint_on UNUSED */
|
/* verilator lint_on UNUSED */
|
||||||
`endif
|
`endif
|
||||||
|
|
||||||
@@ -97,24 +97,24 @@ module VX_bank #(
|
|||||||
wire [WORD_SIZE-1:0] creq_byteen;
|
wire [WORD_SIZE-1:0] creq_byteen;
|
||||||
wire [`REQS_BITS-1:0] creq_tid;
|
wire [`REQS_BITS-1:0] creq_tid;
|
||||||
`IGNORE_WARNINGS_BEGIN
|
`IGNORE_WARNINGS_BEGIN
|
||||||
wire [`WORD_ADDR_WIDTH-1:0] creq_addr_unqual;
|
wire [`WORD_ADDR_WIDTH-1:0] creq_addr;
|
||||||
`IGNORE_WARNINGS_END
|
`IGNORE_WARNINGS_END
|
||||||
wire [`LINE_ADDR_WIDTH-1:0] creq_addr;
|
wire [`LINE_ADDR_WIDTH-1:0] creq_line_addr;
|
||||||
wire [`UP(`WORD_SELECT_BITS)-1:0] creq_wsel;
|
wire [`UP(`WORD_SELECT_BITS)-1:0] creq_wsel;
|
||||||
wire [`WORD_WIDTH-1:0] creq_writeword;
|
wire [`WORD_WIDTH-1:0] creq_data;
|
||||||
wire [CORE_TAG_WIDTH-1:0] creq_tag;
|
wire [CORE_TAG_WIDTH-1:0] creq_tag;
|
||||||
|
|
||||||
wire creq_push = core_req_valid && core_req_ready;
|
wire creq_push = core_req_valid && core_req_ready;
|
||||||
assign core_req_ready = !creq_full;
|
assign core_req_ready = !creq_full;
|
||||||
|
|
||||||
if (BANK_ADDR_OFFSET == 0) begin
|
if (BANK_ADDR_OFFSET == 0) begin
|
||||||
assign creq_addr = `LINE_SELECT_ADDR0(creq_addr_unqual);
|
assign creq_line_addr = `LINE_SELECT_ADDR0(creq_addr);
|
||||||
end else begin
|
end else begin
|
||||||
assign creq_addr = `LINE_SELECT_ADDRX(creq_addr_unqual);
|
assign creq_line_addr = `LINE_SELECT_ADDRX(creq_addr);
|
||||||
end
|
end
|
||||||
|
|
||||||
if (`WORD_SELECT_BITS != 0) begin
|
if (`WORD_SELECT_BITS != 0) begin
|
||||||
assign creq_wsel = creq_addr_unqual[`WORD_SELECT_BITS-1:0];
|
assign creq_wsel = creq_addr[`WORD_SELECT_BITS-1:0];
|
||||||
end else begin
|
end else begin
|
||||||
assign creq_wsel = 0;
|
assign creq_wsel = 0;
|
||||||
end
|
end
|
||||||
@@ -127,8 +127,8 @@ module VX_bank #(
|
|||||||
.reset (reset),
|
.reset (reset),
|
||||||
.push (creq_push),
|
.push (creq_push),
|
||||||
.pop (creq_pop),
|
.pop (creq_pop),
|
||||||
.data_in ({core_req_tag, core_req_tid, core_req_rw, core_req_byteen, core_req_addr, core_req_data}),
|
.data_in ({core_req_tag, core_req_tid, core_req_rw, core_req_byteen, core_req_addr, core_req_data}),
|
||||||
.data_out ({creq_tag, creq_tid, creq_rw, creq_byteen, creq_addr_unqual, creq_writeword}),
|
.data_out ({creq_tag, creq_tid, creq_rw, creq_byteen, creq_addr, creq_data}),
|
||||||
.empty (creq_empty),
|
.empty (creq_empty),
|
||||||
.full (creq_full),
|
.full (creq_full),
|
||||||
`UNUSED_PIN (alm_empty),
|
`UNUSED_PIN (alm_empty),
|
||||||
@@ -144,8 +144,8 @@ module VX_bank #(
|
|||||||
wire [`REQS_BITS-1:0] mshr_tid;
|
wire [`REQS_BITS-1:0] mshr_tid;
|
||||||
wire [`LINE_ADDR_WIDTH-1:0] mshr_addr;
|
wire [`LINE_ADDR_WIDTH-1:0] mshr_addr;
|
||||||
wire [`UP(`WORD_SELECT_BITS)-1:0] mshr_wsel;
|
wire [`UP(`WORD_SELECT_BITS)-1:0] mshr_wsel;
|
||||||
wire [`WORD_WIDTH-1:0] mshr_writeword;
|
wire [`WORD_WIDTH-1:0] mshr_data;
|
||||||
wire [`REQ_TAG_WIDTH-1:0] mshr_tag;
|
wire [CORE_TAG_WIDTH-1:0] mshr_tag;
|
||||||
wire mshr_rw;
|
wire mshr_rw;
|
||||||
wire [WORD_SIZE-1:0] mshr_byteen;
|
wire [WORD_SIZE-1:0] mshr_byteen;
|
||||||
|
|
||||||
@@ -155,13 +155,13 @@ module VX_bank #(
|
|||||||
wire [WORD_SIZE-1:0] byteen_st0, byteen_st1;
|
wire [WORD_SIZE-1:0] byteen_st0, byteen_st1;
|
||||||
wire [`CACHE_LINE_WIDTH-1:0] data_st0, data_st1;
|
wire [`CACHE_LINE_WIDTH-1:0] data_st0, data_st1;
|
||||||
wire [`REQS_BITS-1:0] req_tid_st0, req_tid_st1;
|
wire [`REQS_BITS-1:0] req_tid_st0, req_tid_st1;
|
||||||
wire [`REQ_TAG_WIDTH-1:0] tag_st0, tag_st1;
|
wire [CORE_TAG_WIDTH-1:0] tag_st0, tag_st1;
|
||||||
wire valid_st0, valid_st1;
|
wire valid_st0, valid_st1;
|
||||||
wire is_fill_st0, is_fill_st1;
|
wire is_fill_st0, is_fill_st1;
|
||||||
wire is_mshr_st0, is_mshr_st1;
|
wire is_mshr_st0, is_mshr_st1;
|
||||||
wire [`CACHE_LINE_WIDTH-1:0] readdata_st1;
|
wire [`CACHE_LINE_WIDTH-1:0] readdata_st1;
|
||||||
wire miss_st0, miss_st1;
|
wire miss_st0, miss_st1;
|
||||||
wire prev_miss_hazard_st0, prev_miss_hazard_st1;
|
wire prev_miss_dep_st0, prev_miss_dep_st1;
|
||||||
wire force_miss_st0, force_miss_st1;
|
wire force_miss_st0, force_miss_st1;
|
||||||
wire writeen_unqual_st0, writeen_unqual_st1;
|
wire writeen_unqual_st0, writeen_unqual_st1;
|
||||||
wire incoming_fill_st0, incoming_fill_st1;
|
wire incoming_fill_st0, incoming_fill_st1;
|
||||||
@@ -207,10 +207,18 @@ module VX_bank #(
|
|||||||
|
|
||||||
// we have a miss in mshr or entering it for the current address
|
// we have a miss in mshr or entering it for the current address
|
||||||
wire mshr_pending_sel = mshr_pending
|
wire mshr_pending_sel = mshr_pending
|
||||||
|| (is_miss_st1 && (creq_addr == addr_st1));
|
|| (is_miss_st1 && (creq_line_addr == addr_st1));
|
||||||
|
|
||||||
|
`ifdef DBG_CACHE_REQ_INFO
|
||||||
|
if (CORE_TAG_WIDTH != CORE_TAG_ID_BITS && CORE_TAG_ID_BITS != 0) begin
|
||||||
|
assign {debug_pc_sel, debug_wid_sel} = mshr_pop_unqual ? mshr_tag[CORE_TAG_WIDTH-1:CORE_TAG_ID_BITS] : creq_tag[CORE_TAG_WIDTH-1:CORE_TAG_ID_BITS];
|
||||||
|
end else begin
|
||||||
|
assign {debug_pc_sel, debug_wid_sel} = 0;
|
||||||
|
end
|
||||||
|
`endif
|
||||||
|
|
||||||
VX_pipe_register #(
|
VX_pipe_register #(
|
||||||
.DATAW (1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + 1 + WORD_SIZE + `CACHE_LINE_WIDTH + `REQS_BITS + `REQ_TAG_WIDTH + 1 + 1),
|
.DATAW (1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + 1 + WORD_SIZE + `CACHE_LINE_WIDTH + `REQS_BITS + CORE_TAG_WIDTH + 1 + 1),
|
||||||
.RESETW (1)
|
.RESETW (1)
|
||||||
) pipe_reg0 (
|
) pipe_reg0 (
|
||||||
.clk (clk),
|
.clk (clk),
|
||||||
@@ -220,13 +228,13 @@ module VX_bank #(
|
|||||||
mshr_pop || drsq_pop || creq_pop,
|
mshr_pop || drsq_pop || creq_pop,
|
||||||
mshr_pop_unqual,
|
mshr_pop_unqual,
|
||||||
drsq_pop_unqual,
|
drsq_pop_unqual,
|
||||||
mshr_pop_unqual ? mshr_addr : (dram_rsp_valid ? dram_rsp_addr : creq_addr),
|
mshr_pop_unqual ? mshr_addr : (dram_rsp_valid ? dram_rsp_addr : creq_line_addr),
|
||||||
mshr_pop_unqual ? mshr_wsel : creq_wsel,
|
mshr_pop_unqual ? mshr_wsel : creq_wsel,
|
||||||
mshr_pop_unqual ? mshr_rw : creq_rw,
|
mshr_pop_unqual ? mshr_rw : creq_rw,
|
||||||
mshr_pop_unqual ? mshr_byteen : creq_byteen,
|
mshr_pop_unqual ? mshr_byteen : creq_byteen,
|
||||||
mshr_pop_unqual ? {`WORDS_PER_LINE{mshr_writeword}} : (dram_rsp_valid ? dram_rsp_data : {`WORDS_PER_LINE{creq_writeword}}),
|
mshr_pop_unqual ? {`WORDS_PER_LINE{mshr_data}} : (dram_rsp_valid ? dram_rsp_data : {`WORDS_PER_LINE{creq_data}}),
|
||||||
mshr_pop_unqual ? mshr_tid : creq_tid,
|
mshr_pop_unqual ? mshr_tid : creq_tid,
|
||||||
mshr_pop_unqual ? `REQ_TAG_WIDTH'(mshr_tag) : `REQ_TAG_WIDTH'(creq_tag),
|
mshr_pop_unqual ? mshr_tag : creq_tag,
|
||||||
mshr_pending_sel,
|
mshr_pending_sel,
|
||||||
dram_rsp_flush
|
dram_rsp_flush
|
||||||
}),
|
}),
|
||||||
@@ -271,11 +279,11 @@ module VX_bank #(
|
|||||||
wire is_redundant_fill = is_fill_st0 && !miss_st0;
|
wire is_redundant_fill = is_fill_st0 && !miss_st0;
|
||||||
|
|
||||||
// we had a miss with prior request for the current address
|
// we had a miss with prior request for the current address
|
||||||
assign prev_miss_hazard_st0 = is_miss_st1 && (addr_st0 == addr_st1);
|
assign prev_miss_dep_st0 = is_miss_st1 && (addr_st0 == addr_st1);
|
||||||
|
|
||||||
// force miss to ensure commit order when a new request has pending previous requests to same block
|
// force miss to ensure commit order when a new request has pending previous requests to same block
|
||||||
// also force a miss for mshr requests when previous requests got a miss
|
// also force a miss for mshr requests when previous requests got a miss
|
||||||
assign force_miss_st0 = (!is_fill_st0 && !is_mshr_st0 && (mshr_pending_st0 || prev_miss_hazard_st0))
|
assign force_miss_st0 = (!is_fill_st0 && !is_mshr_st0 && (mshr_pending_st0 || prev_miss_dep_st0))
|
||||||
|| (is_mshr_st0 && is_miss_st1 && is_mshr_st1);
|
|| (is_mshr_st0 && is_miss_st1 && is_mshr_st1);
|
||||||
|
|
||||||
assign writeen_unqual_st0 = (!is_fill_st0 && !miss_st0 && mem_rw_st0)
|
assign writeen_unqual_st0 = (!is_fill_st0 && !miss_st0 && mem_rw_st0)
|
||||||
@@ -284,15 +292,23 @@ module VX_bank #(
|
|||||||
assign incoming_fill_st0 = dram_rsp_valid && (addr_st0 == dram_rsp_addr);
|
assign incoming_fill_st0 = dram_rsp_valid && (addr_st0 == dram_rsp_addr);
|
||||||
|
|
||||||
VX_pipe_register #(
|
VX_pipe_register #(
|
||||||
.DATAW (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + `CACHE_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + `REQ_TAG_WIDTH),
|
.DATAW (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `UP(`WORD_SELECT_BITS) + `CACHE_LINE_WIDTH + 1 + WORD_SIZE + `REQS_BITS + CORE_TAG_WIDTH),
|
||||||
.RESETW (1)
|
.RESETW (1)
|
||||||
) pipe_reg1 (
|
) pipe_reg1 (
|
||||||
.clk (clk),
|
.clk (clk),
|
||||||
.reset (reset),
|
.reset (reset),
|
||||||
.enable (1'b1),
|
.enable (1'b1),
|
||||||
.data_in ({valid_st0, is_mshr_st0, is_fill_st0, writeen_unqual_st0, prev_miss_hazard_st0, incoming_fill_st0, miss_st0, force_miss_st0, addr_st0, wsel_st0, data_st0, mem_rw_st0, byteen_st0, req_tid_st0, tag_st0}),
|
.data_in ({valid_st0, is_mshr_st0, is_fill_st0, writeen_unqual_st0, prev_miss_dep_st0, incoming_fill_st0, miss_st0, force_miss_st0, addr_st0, wsel_st0, data_st0, mem_rw_st0, byteen_st0, req_tid_st0, tag_st0}),
|
||||||
.data_out ({valid_st1, is_mshr_st1, is_fill_st1, writeen_unqual_st1, prev_miss_hazard_st1, incoming_fill_st1, miss_st1, force_miss_st1, addr_st1, wsel_st1, data_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1})
|
.data_out ({valid_st1, is_mshr_st1, is_fill_st1, writeen_unqual_st1, prev_miss_dep_st1, incoming_fill_st1, miss_st1, force_miss_st1, addr_st1, wsel_st1, data_st1, mem_rw_st1, byteen_st1, req_tid_st1, tag_st1})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
`ifdef DBG_CACHE_REQ_INFO
|
||||||
|
if (CORE_TAG_WIDTH != CORE_TAG_ID_BITS && CORE_TAG_ID_BITS != 0) begin
|
||||||
|
assign {debug_pc_st1, debug_wid_st1} = tag_st1[CORE_TAG_WIDTH-1:CORE_TAG_ID_BITS];
|
||||||
|
end else begin
|
||||||
|
assign {debug_pc_st1, debug_wid_st1} = 0;
|
||||||
|
end
|
||||||
|
`endif
|
||||||
|
|
||||||
wire writeen_st1 = writeen_unqual_st1 && (is_fill_st1 || !force_miss_st1);
|
wire writeen_st1 = writeen_unqual_st1 && (is_fill_st1 || !force_miss_st1);
|
||||||
|
|
||||||
@@ -304,7 +320,7 @@ module VX_bank #(
|
|||||||
|| incoming_fill_st1;
|
|| incoming_fill_st1;
|
||||||
|
|
||||||
wire send_fill_req_st1 = !is_fill_st1 && !mem_rw_st1 && miss_st1
|
wire send_fill_req_st1 = !is_fill_st1 && !mem_rw_st1 && miss_st1
|
||||||
&& (!force_miss_st1 || (is_mshr_st1 && !prev_miss_hazard_st1))
|
&& (!force_miss_st1 || (is_mshr_st1 && !prev_miss_dep_st1))
|
||||||
&& !incoming_fill_qual_st1;
|
&& !incoming_fill_qual_st1;
|
||||||
|
|
||||||
wire do_writeback_st1 = !is_fill_st1 && mem_rw_st1;
|
wire do_writeback_st1 = !is_fill_st1 && mem_rw_st1;
|
||||||
@@ -341,15 +357,7 @@ module VX_bank #(
|
|||||||
.wsel (wsel_st1),
|
.wsel (wsel_st1),
|
||||||
.byteen (byteen_st1),
|
.byteen (byteen_st1),
|
||||||
.wrdata (data_st1)
|
.wrdata (data_st1)
|
||||||
);
|
);
|
||||||
|
|
||||||
`ifdef DBG_CACHE_REQ_INFO
|
|
||||||
if (CORE_TAG_WIDTH != CORE_TAG_ID_BITS && CORE_TAG_ID_BITS != 0) begin
|
|
||||||
assign {debug_pc_st1, debug_wid_st1} = tag_st1[CORE_TAG_WIDTH-1:CORE_TAG_ID_BITS];
|
|
||||||
end else begin
|
|
||||||
assign {debug_pc_st1, debug_wid_st1} = 0;
|
|
||||||
end
|
|
||||||
`endif
|
|
||||||
|
|
||||||
assign mshr_push = valid_st1 && mshr_push_st1;
|
assign mshr_push = valid_st1 && mshr_push_st1;
|
||||||
wire mshr_dequeue = valid_st1 && is_mshr_st1 && !mshr_push_st1;
|
wire mshr_dequeue = valid_st1 && is_mshr_st1 && !mshr_push_st1;
|
||||||
@@ -359,7 +367,7 @@ module VX_bank #(
|
|||||||
wire mshr_init_ready_state = !miss_st1 || incoming_fill_qual_st1;
|
wire mshr_init_ready_state = !miss_st1 || incoming_fill_qual_st1;
|
||||||
|
|
||||||
// use dram rsp or core req address to lookup the mshr
|
// use dram rsp or core req address to lookup the mshr
|
||||||
wire [`LINE_ADDR_WIDTH-1:0] lookup_addr = dram_rsp_valid ? dram_rsp_addr : creq_addr;
|
wire [`LINE_ADDR_WIDTH-1:0] lookup_addr = dram_rsp_valid ? dram_rsp_addr : creq_line_addr;
|
||||||
|
|
||||||
VX_miss_resrv #(
|
VX_miss_resrv #(
|
||||||
.BANK_ID (BANK_ID),
|
.BANK_ID (BANK_ID),
|
||||||
@@ -401,7 +409,7 @@ module VX_bank #(
|
|||||||
.schedule (mshr_pop),
|
.schedule (mshr_pop),
|
||||||
.schedule_valid (mshr_valid),
|
.schedule_valid (mshr_valid),
|
||||||
.schedule_addr (mshr_addr),
|
.schedule_addr (mshr_addr),
|
||||||
.schedule_data ({mshr_writeword, mshr_tid, mshr_tag, mshr_rw, mshr_byteen, mshr_wsel}),
|
.schedule_data ({mshr_data, mshr_tid, mshr_tag, mshr_rw, mshr_byteen, mshr_wsel}),
|
||||||
|
|
||||||
// dequeue
|
// dequeue
|
||||||
.dequeue (mshr_dequeue)
|
.dequeue (mshr_dequeue)
|
||||||
@@ -520,24 +528,23 @@ module VX_bank #(
|
|||||||
if (crsq_alm_full || dreq_alm_full || mshr_alm_full) begin
|
if (crsq_alm_full || dreq_alm_full || mshr_alm_full) begin
|
||||||
$display("%t: cache%0d:%0d pipeline-stall: cwbq=%b, dwbq=%b, mshr=%b", $time, CACHE_ID, BANK_ID, crsq_alm_full, dreq_alm_full, mshr_alm_full);
|
$display("%t: cache%0d:%0d pipeline-stall: cwbq=%b, dwbq=%b, mshr=%b", $time, CACHE_ID, BANK_ID, crsq_alm_full, dreq_alm_full, mshr_alm_full);
|
||||||
end
|
end
|
||||||
if (valid_st0 && is_fill_st0) begin
|
if (drsq_pop) begin
|
||||||
if (is_flush_st0)
|
if (dram_rsp_flush)
|
||||||
$display("%t: cache%0d:%0d flush: addr=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID));
|
$display("%t: cache%0d:%0d flush: addr=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(dram_rsp_addr, BANK_ID));
|
||||||
else
|
else
|
||||||
$display("%t: cache%0d:%0d fill-rsp: addr=%0h, data=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), data_st0);
|
$display("%t: cache%0d:%0d fill-rsp: addr=%0h, data=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(dram_rsp_addr, BANK_ID), dram_rsp_data);
|
||||||
end
|
end
|
||||||
if (valid_st0 && !is_fill_st0) begin
|
if (mshr_pop) begin
|
||||||
if (is_mshr_st0) begin
|
if (mshr_rw)
|
||||||
if (mem_rw_st0)
|
$display("%t: cache%0d:%0d mshr-wr-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), mshr_tag, mshr_tid, mshr_byteen, mshr_data, debug_wid_sel, debug_pc_sel);
|
||||||
$display("%t: cache%0d:%0d mshr-wr-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), tag_st0, req_tid_st0, byteen_st0, data_st0[`WORD_WIDTH-1:0], debug_wid_st0, debug_pc_st0);
|
else
|
||||||
else
|
$display("%t: cache%0d:%0d mshr-rd-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), mshr_tag, mshr_tid, mshr_byteen, debug_wid_sel, debug_pc_sel);
|
||||||
$display("%t: cache%0d:%0d mshr-rd-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), tag_st0, req_tid_st0, byteen_st0, debug_wid_st0, debug_pc_st0);
|
end
|
||||||
end else begin
|
if (creq_pop) begin
|
||||||
if (mem_rw_st0)
|
if (creq_rw)
|
||||||
$display("%t: cache%0d:%0d core-wr-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), tag_st0, req_tid_st0, byteen_st0, data_st0[`WORD_WIDTH-1:0], debug_wid_st0, debug_pc_st0);
|
$display("%t: cache%0d:%0d core-wr-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), creq_tag, creq_tid, creq_byteen, creq_data, debug_wid_sel, debug_pc_sel);
|
||||||
else
|
else
|
||||||
$display("%t: cache%0d:%0d core-rd-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), tag_st0, req_tid_st0, byteen_st0, debug_wid_st0, debug_pc_st0);
|
$display("%t: cache%0d:%0d core-rd-req: addr=%0h, tag=%0h, tid=%0d, byteen=%b, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st0, BANK_ID), creq_tag, creq_tid, creq_byteen, debug_wid_sel, debug_pc_sel);
|
||||||
end
|
|
||||||
end
|
end
|
||||||
if (crsq_push) begin
|
if (crsq_push) begin
|
||||||
$display("%t: cache%0d:%0d core-rsp: addr=%0h, tag=%0h, tid=%0d, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st1, BANK_ID), crsq_tag_st1, crsq_tid_st1, crsq_data_st1, debug_wid_st1, debug_pc_st1);
|
$display("%t: cache%0d:%0d core-rsp: addr=%0h, tag=%0h, tid=%0d, data=%0h, wid=%0d, PC=%0h", $time, CACHE_ID, BANK_ID, `LINE_TO_BYTE_ADDR(addr_st1, BANK_ID), crsq_tag_st1, crsq_tid_st1, crsq_data_st1, debug_wid_st1, debug_pc_st1);
|
||||||
|
|||||||
4
hw/rtl/cache/VX_cache_config.vh
vendored
4
hw/rtl/cache/VX_cache_config.vh
vendored
@@ -7,12 +7,10 @@
|
|||||||
`include "VX_define.vh"
|
`include "VX_define.vh"
|
||||||
`endif
|
`endif
|
||||||
|
|
||||||
`define REQ_TAG_WIDTH CORE_TAG_WIDTH
|
|
||||||
|
|
||||||
`define REQS_BITS `LOG2UP(NUM_REQS)
|
`define REQS_BITS `LOG2UP(NUM_REQS)
|
||||||
|
|
||||||
// tag rw byteen tid
|
// tag rw byteen tid
|
||||||
`define REQ_INST_META_WIDTH (`REQ_TAG_WIDTH + 1 + WORD_SIZE + `REQS_BITS)
|
`define REQ_INST_META_WIDTH (CORE_TAG_WIDTH + 1 + WORD_SIZE + `REQS_BITS)
|
||||||
|
|
||||||
// data metadata word_sel
|
// data metadata word_sel
|
||||||
`define MSHR_DATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_BITS))
|
`define MSHR_DATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_BITS))
|
||||||
|
|||||||
@@ -221,8 +221,8 @@ module VX_fp_cvt #(
|
|||||||
// Handle INT casts
|
// Handle INT casts
|
||||||
if (is_itof_s1) begin
|
if (is_itof_s1) begin
|
||||||
// Overflow or infinities (for proper rounding)
|
// Overflow or infinities (for proper rounding)
|
||||||
if ((destination_exp_s1[i] >= 2**EXP_BITS-1)
|
if ((destination_exp_s1[i] >= $signed(2**EXP_BITS-1))
|
||||||
|| (~is_itof_s1 && in_a_type_s1[i].is_inf)) begin
|
|| (!is_itof_s1 && in_a_type_s1[i].is_inf)) begin
|
||||||
final_exp[i] = (2**EXP_BITS-2); // largest normal value
|
final_exp[i] = (2**EXP_BITS-2); // largest normal value
|
||||||
preshift_mant[i] = ~0; // largest normal value and RS bits set
|
preshift_mant[i] = ~0; // largest normal value and RS bits set
|
||||||
of_before_round[i] = 1'b1;
|
of_before_round[i] = 1'b1;
|
||||||
@@ -234,14 +234,14 @@ module VX_fp_cvt #(
|
|||||||
// Limit the shift to retain sticky bits
|
// Limit the shift to retain sticky bits
|
||||||
end else if (destination_exp_s1[i] < -$signed(MAN_BITS)) begin
|
end else if (destination_exp_s1[i] < -$signed(MAN_BITS)) begin
|
||||||
final_exp[i] = 0; // denormal result
|
final_exp[i] = 0; // denormal result
|
||||||
denorm_shamt[i] = $unsigned(denorm_shamt[i] + SHAMT_BITS'(2 + MAN_BITS)); // to sticky
|
denorm_shamt[i] = $unsigned(denorm_shamt[i] + (2 + MAN_BITS)); // to sticky
|
||||||
end
|
end
|
||||||
end else begin
|
end else begin
|
||||||
// By default right shift mantissa to be an integer
|
// By default right shift mantissa to be an integer
|
||||||
denorm_shamt[i] = SHAMT_BITS'(MAX_INT_WIDTH-1) - SHAMT_BITS'(input_exp_s1[i]);
|
denorm_shamt[i] = (MAX_INT_WIDTH-1) - input_exp_s1[i];
|
||||||
// overflow: when converting to unsigned the range is larger by one
|
// overflow: when converting to unsigned the range is larger by one
|
||||||
if (input_exp_s1[i] >= $signed(MAX_INT_WIDTH -1 + unsigned_s1)) begin
|
if (input_exp_s1[i] >= $signed(MAX_INT_WIDTH -1 + unsigned_s1)) begin
|
||||||
denorm_shamt[i] = SHAMT_BITS'(1'b0); // prevent shifting
|
denorm_shamt[i] = SHAMT_BITS'(0); // prevent shifting
|
||||||
of_before_round[i] = 1'b1;
|
of_before_round[i] = 1'b1;
|
||||||
// underflow
|
// underflow
|
||||||
end else if (input_exp_s1[i] < -1) begin
|
end else if (input_exp_s1[i] < -1) begin
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ module VX_fp_type (
|
|||||||
assign type_o.is_subnormal = is_subnormal;
|
assign type_o.is_subnormal = is_subnormal;
|
||||||
assign type_o.is_inf = is_inf;
|
assign type_o.is_inf = is_inf;
|
||||||
assign type_o.is_nan = is_nan;
|
assign type_o.is_nan = is_nan;
|
||||||
assign type_o.is_signaling = is_signaling;
|
|
||||||
assign type_o.is_quiet = is_quiet;
|
assign type_o.is_quiet = is_quiet;
|
||||||
|
assign type_o.is_signaling = is_signaling;
|
||||||
|
|
||||||
endmodule
|
endmodule
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
module VX_index_buffer #(
|
module VX_index_buffer #(
|
||||||
parameter DATAW = 1,
|
parameter DATAW = 1,
|
||||||
parameter SIZE = 1,
|
parameter SIZE = 1,
|
||||||
parameter FASTRAM = 0,
|
parameter FASTRAM = 1,
|
||||||
parameter ADDRW = `LOG2UP(SIZE)
|
parameter ADDRW = `LOG2UP(SIZE)
|
||||||
) (
|
) (
|
||||||
input wire clk,
|
input wire clk,
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_BANK
|
|||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_MSHR
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_TAG
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_DATA
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_CACHE_SNP
|
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
DBG_PRINT_FLAGS += -DDBG_PRINT_DRAM
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
DBG_PRINT_FLAGS += -DDBG_PRINT_OPAE
|
||||||
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
DBG_PRINT_FLAGS += -DDBG_PRINT_AVS
|
||||||
|
|||||||
Reference in New Issue
Block a user