wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OPAE rtl fixes

Browse Source
This commit is contained in:
Blaise Tine
2020-06-04 15:44:03 -07:00
parent ea890b457d
commit 4e0e710182
8 changed files with 49 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
hw/opae/Makefile
View File

@@ -1,61 +1,56 @@
ASE_BUILD_DIR=build_ase ASE_BUILD_DIR=build_ase
FPGA_BUILD_DIR=build_fpga FPGA_BUILD_DIR=build_fpga
all: ase all: ase-2c
ase: setup-ase
make -C $(ASE_BUILD_DIR)
setup-ase: $(ASE_BUILD_DIR)/Makefile
$(ASE_BUILD_DIR)/Makefile:
afu_sim_setup -s sources.txt $(ASE_BUILD_DIR)
ase-1c: setup-ase-1c ase-1c: setup-ase-1c
make -C $(ASE_BUILD_DIR)_1c make -C $(ASE_BUILD_DIR)_1c
ase-2c: setup-ase-2c
make -C $(ASE_BUILD_DIR)_2c
setup-ase-1c: $(ASE_BUILD_DIR)_1c/Makefile setup-ase-1c: $(ASE_BUILD_DIR)_1c/Makefile
setup-ase-2c: $(ASE_BUILD_DIR)_2c/Makefile
$(ASE_BUILD_DIR)_1c/Makefile: $(ASE_BUILD_DIR)_1c/Makefile:
afu_sim_setup -s sources_1c.txt $(ASE_BUILD_DIR)_1c afu_sim_setup -s sources_1c.txt $(ASE_BUILD_DIR)_1c
fpga: setup-fpga $(ASE_BUILD_DIR)_2c/Makefile:
cd $(FPGA_BUILD_DIR) && qsub-synth afu_sim_setup -s sources_2c.txt $(ASE_BUILD_DIR)_2c
setup-fpga: $(FPGA_BUILD_DIR)/build/dcp.qpf
$(FPGA_BUILD_DIR)/build/dcp.qpf:
afu_synth_setup -s sources.txt $(FPGA_BUILD_DIR)
fpga-1c: setup-fpga-1c fpga-1c: setup-fpga-1c
cd $(FPGA_BUILD_DIR)_1c && qsub-synth cd $(FPGA_BUILD_DIR)_1c && qsub-synth
fpga-2c: setup-fpga-2c
cd $(FPGA_BUILD_DIR)_2c && qsub-synth
setup-fpga-1c: $(FPGA_BUILD_DIR)_1c/build/dcp.qpf setup-fpga-1c: $(FPGA_BUILD_DIR)_1c/build/dcp.qpf
setup-fpga-2c: $(FPGA_BUILD_DIR)_2c/build/dcp.qpf
$(FPGA_BUILD_DIR)_1c/build/dcp.qpf: $(FPGA_BUILD_DIR)_1c/build/dcp.qpf:
afu_synth_setup -s sources_1c.txt $(FPGA_BUILD_DIR)_1c afu_synth_setup -s sources_1c.txt $(FPGA_BUILD_DIR)_1c
run-ase: $(FPGA_BUILD_DIR)_2c/build/dcp.qpf:
cd $(ASE_BUILD_DIR) && make sim afu_synth_setup -s sources_2c.txt $(FPGA_BUILD_DIR)_2c
run-ase-1c: run-ase-1c:
cd $(ASE_BUILD_DIR)_1c && make sim cd $(ASE_BUILD_DIR)_1c && make sim
wave: run-ase-2c:
vsim -view $(ASE_BUILD_DIR)/work/vsim.wlf -do wave.do cd $(ASE_BUILD_DIR)_2c && make sim
run-fpga:
# TODO
clean-ase:
rm -rf $(ASE_BUILD_DIR)
clean-ase-1c: clean-ase-1c:
rm -rf $(ASE_BUILD_DIR)_1c rm -rf $(ASE_BUILD_DIR)_1c
clean-fpga: clean-ase-2c:
rm -rf $(FPGA_BUILD_DIR) rm -rf $(ASE_BUILD_DIR)_2c
clean-fpga-1c: clean-fpga-1c:
rm -rf $(FPGA_BUILD_DIR)_1c rm -rf $(FPGA_BUILD_DIR)_1c
clean-fpga-2c:
rm -rf $(FPGA_BUILD_DIR)_2c

2
hw/opae/README
View File

@@ -82,4 +82,4 @@ ps -u tinebp
kill -9 <pid> kill -9 <pid>
# fixing device resource busy issue when deleting /build_ase/ # fixing device resource busy issue when deleting /build_ase/
- lsof +D build_ase

17
hw/opae/sources.txt
View File

@@ -1,22 +1,5 @@
vortex_afu.json vortex_afu.json
+define+DCACHE_SIZE=4096
+define+ICACHE_SIZE=2048
+define+SCACHE_SIZE=1024
+define+NUM_CORES=2
+define+NUM_WARPS=4
+define+NUM_THREADS=4
+define+L2_ENABLE=1
+define+DNUM_BANKS=4
+define+INUM_BANKS=1
+define+SNUM_BANKS=4
+define+DDFPQ_SIZE=16
+define+IDFPQ_SIZE=16
+define+SDFPQ_SIZE=0
#+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

6
hw/rtl/VX_config.vh
View File

@@ -224,7 +224,7 @@
// Number of banks {1, 2, 4, 8,...} // Number of banks {1, 2, 4, 8,...}
`ifndef SNUM_BANKS `ifndef SNUM_BANKS
`define SNUM_BANKS 8 `define SNUM_BANKS 4
`endif `endif
// Size of a word in bytes // Size of a word in bytes
@@ -261,7 +261,7 @@
// Number of banks {1, 2, 4, 8,...} // Number of banks {1, 2, 4, 8,...}
`ifndef L2NUM_BANKS `ifndef L2NUM_BANKS
`define L2NUM_BANKS 8 `define L2NUM_BANKS 4
`endif `endif
// Size of a word in bytes // Size of a word in bytes
@@ -332,7 +332,7 @@
// Number of banks {1, 2, 4, 8,...} // Number of banks {1, 2, 4, 8,...}
`ifndef L3NUM_BANKS `ifndef L3NUM_BANKS
`define L3NUM_BANKS 8 `define L3NUM_BANKS 4
`endif `endif
// Size of a word in bytes // Size of a word in bytes

8
hw/rtl/VX_define.vh
View File

@@ -57,11 +57,13 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
`define NW_BITS (`LOG2UP(`NUM_WARPS)) `define NW_BITS `LOG2UP(`NUM_WARPS)
`define NT_BITS (`LOG2UP(`NUM_THREADS)) `define NT_BITS `LOG2UP(`NUM_THREADS)
`define NC_BITS (`LOG2UP(`NUM_CORES)) `define NC_BITS `LOG2UP(`NUM_CORES)
`define REQS_BITS `LOG2UP(NUM_REQUESTS)
`define NUM_GPRS 32 `define NUM_GPRS 32

23
hw/rtl/VX_dram_arb.v
View File

@@ -1,10 +1,13 @@
`include "VX_define.vh" `include "VX_define.vh"
module VX_dram_arb #( module VX_dram_arb #(
parameter BANK_LINE_SIZE = 1,
parameter NUM_REQUESTS = 1, parameter NUM_REQUESTS = 1,
parameter DRAM_LINE_SIZE = 1,
parameter CORE_TAG_WIDTH = 1, parameter CORE_TAG_WIDTH = 1,
parameter DRAM_TAG_WIDTH = 1 parameter DRAM_TAG_WIDTH = 1,
parameter DRAM_LINE_WIDTH = DRAM_LINE_SIZE * 8,
parameter DRAM_ADDR_WIDTH = 32 - `CLOG2(DRAM_LINE_SIZE)
) ( ) (
input wire clk, input wire clk,
input wire reset, input wire reset,
@@ -12,30 +15,30 @@ module VX_dram_arb #(
// Core request // Core request
input wire [NUM_REQUESTS-1:0] core_req_valid, input wire [NUM_REQUESTS-1:0] core_req_valid,
input wire [NUM_REQUESTS-1:0] core_req_rw, input wire [NUM_REQUESTS-1:0] core_req_rw,
input wire [NUM_REQUESTS-1:0][BANK_LINE_SIZE-1:0] core_req_byteen, input wire [NUM_REQUESTS-1:0][DRAM_LINE_SIZE-1:0] core_req_byteen,
input wire [NUM_REQUESTS-1:0][`DRAM_ADDR_WIDTH-1:0] core_req_addr, input wire [NUM_REQUESTS-1:0][DRAM_ADDR_WIDTH-1:0] core_req_addr,
input wire [NUM_REQUESTS-1:0][`BANK_LINE_WIDTH-1:0] core_req_data, input wire [NUM_REQUESTS-1:0][DRAM_LINE_WIDTH-1:0] core_req_data,
input wire [NUM_REQUESTS-1:0][CORE_TAG_WIDTH-1:0] core_req_tag, input wire [NUM_REQUESTS-1:0][CORE_TAG_WIDTH-1:0] core_req_tag,
output wire [NUM_REQUESTS-1:0] core_req_ready, output wire [NUM_REQUESTS-1:0] core_req_ready,
// Core response // Core response
output wire [NUM_REQUESTS-1:0] core_rsp_valid, output wire [NUM_REQUESTS-1:0] core_rsp_valid,
output wire [NUM_REQUESTS-1:0][`BANK_LINE_WIDTH-1:0]core_rsp_data, output wire [NUM_REQUESTS-1:0][DRAM_LINE_WIDTH-1:0] core_rsp_data,
output wire [NUM_REQUESTS-1:0][CORE_TAG_WIDTH-1:0] core_rsp_tag, output wire [NUM_REQUESTS-1:0][CORE_TAG_WIDTH-1:0] core_rsp_tag,
input wire [NUM_REQUESTS-1:0] core_rsp_ready, input wire [NUM_REQUESTS-1:0] core_rsp_ready,
// DRAM request // DRAM request
output wire dram_req_valid, output wire dram_req_valid,
output wire dram_req_rw, output wire dram_req_rw,
output wire [BANK_LINE_SIZE-1:0] dram_req_byteen, output wire [DRAM_LINE_SIZE-1:0] dram_req_byteen,
output wire [`DRAM_ADDR_WIDTH-1:0] dram_req_addr, output wire [DRAM_ADDR_WIDTH-1:0] dram_req_addr,
output wire [`BANK_LINE_WIDTH-1:0] dram_req_data, output wire [DRAM_LINE_WIDTH-1:0] dram_req_data,
output wire [DRAM_TAG_WIDTH-1:0] dram_req_tag, output wire [DRAM_TAG_WIDTH-1:0] dram_req_tag,
input wire dram_req_ready, input wire dram_req_ready,
// DRAM response // DRAM response
input wire dram_rsp_valid, input wire dram_rsp_valid,
input wire [`BANK_LINE_WIDTH-1:0] dram_rsp_data, input wire [DRAM_LINE_WIDTH-1:0] dram_rsp_data,
input wire [DRAM_TAG_WIDTH-1:0] dram_rsp_tag, input wire [DRAM_TAG_WIDTH-1:0] dram_rsp_tag,
output wire dram_rsp_ready output wire dram_rsp_ready
); );

2
hw/rtl/Vortex_Cluster.v
View File

@@ -423,8 +423,8 @@ module Vortex_Cluster #(
); );
VX_dram_arb #( VX_dram_arb #(
.BANK_LINE_SIZE (`L2BANK_LINE_SIZE),
.NUM_REQUESTS (`L2NUM_REQUESTS), .NUM_REQUESTS (`L2NUM_REQUESTS),
.DRAM_LINE_SIZE (`L2BANK_LINE_SIZE),
.CORE_TAG_WIDTH (`DDRAM_TAG_WIDTH), .CORE_TAG_WIDTH (`DDRAM_TAG_WIDTH),
.DRAM_TAG_WIDTH (`L2DRAM_TAG_WIDTH) .DRAM_TAG_WIDTH (`L2DRAM_TAG_WIDTH)
) dram_arb ( ) dram_arb (

2
hw/rtl/cache/VX_cache_config.vh vendored
View File

@@ -11,8 +11,6 @@
// data metadata word_sel is_snp // data metadata word_sel is_snp
`define MRVQ_METADATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH) + 1) `define MRVQ_METADATA_WIDTH (`WORD_WIDTH + `REQ_INST_META_WIDTH + `UP(`WORD_SELECT_WIDTH) + 1)
`define REQS_BITS `LOG2UP(NUM_REQUESTS)
`define BANK_BITS `LOG2UP(NUM_BANKS) `define BANK_BITS `LOG2UP(NUM_BANKS)
`define WORD_WIDTH (8 * WORD_SIZE) `define WORD_WIDTH (8 * WORD_SIZE)