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

fixed warning messages

Browse Source
This commit is contained in:
Blaise Tine
2021-10-15 21:30:47 -07:00
parent 58a2140b92
commit 78345d8bdf
15 changed files with 20 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
hw/rtl/VX_cache_arb.v
View File

@@ -1,159 +0,0 @@
`include "VX_define.vh"
module VX_cache_arb #(
parameter NUM_REQS = 1,
parameter LANES = 1,
parameter DATA_SIZE = 1,
parameter TAG_IN_WIDTH = 1,
parameter TAG_SEL_IDX = 0,
parameter BUFFERED_REQ = 0,
parameter BUFFERED_RSP = 0,
parameter TYPE = "R",
localparam ADDR_WIDTH = (32-`CLOG2(DATA_SIZE)),
localparam DATA_WIDTH = (8 * DATA_SIZE),
localparam LOG_NUM_REQS = `CLOG2(NUM_REQS),
localparam TAG_OUT_WIDTH = TAG_IN_WIDTH + LOG_NUM_REQS
) (
input wire clk,
input wire reset,
// input requests
input wire [NUM_REQS-1:0][LANES-1:0] req_valid_in,
input wire [NUM_REQS-1:0][LANES-1:0] req_rw_in,
input wire [NUM_REQS-1:0][LANES-1:0][DATA_SIZE-1:0] req_byteen_in,
input wire [NUM_REQS-1:0][LANES-1:0][ADDR_WIDTH-1:0] req_addr_in,
input wire [NUM_REQS-1:0][LANES-1:0][DATA_WIDTH-1:0] req_data_in,
input wire [NUM_REQS-1:0][LANES-1:0][TAG_IN_WIDTH-1:0] req_tag_in,
output wire [NUM_REQS-1:0][LANES-1:0] req_ready_in,
// output request
output wire [LANES-1:0] req_valid_out,
output wire [LANES-1:0] req_rw_out,
output wire [LANES-1:0][DATA_SIZE-1:0] req_byteen_out,
output wire [LANES-1:0][ADDR_WIDTH-1:0] req_addr_out,
output wire [LANES-1:0][DATA_WIDTH-1:0] req_data_out,
output wire [LANES-1:0][TAG_OUT_WIDTH-1:0] req_tag_out,
input wire [LANES-1:0] req_ready_out,
// input response
input wire rsp_valid_in,
input wire [LANES-1:0] rsp_tmask_in,
input wire [LANES-1:0][DATA_WIDTH-1:0] rsp_data_in,
input wire [TAG_OUT_WIDTH-1:0] rsp_tag_in,
output wire rsp_ready_in,
// output responses
output wire [NUM_REQS-1:0] rsp_valid_out,
output wire [NUM_REQS-1:0][LANES-1:0] rsp_tmask_out,
output wire [NUM_REQS-1:0][LANES-1:0][DATA_WIDTH-1:0] rsp_data_out,
output wire [NUM_REQS-1:0][TAG_IN_WIDTH-1:0] rsp_tag_out,
input wire [NUM_REQS-1:0] rsp_ready_out
);
localparam REQ_DATAW = TAG_OUT_WIDTH + ADDR_WIDTH + 1 + DATA_SIZE + DATA_WIDTH;
localparam RSP_DATAW = LANES * (1 + DATA_WIDTH) + TAG_IN_WIDTH;
if (NUM_REQS > 1) begin
wire [NUM_REQS-1:0][LANES-1:0][REQ_DATAW-1:0] req_data_in_merged;
wire [LANES-1:0][REQ_DATAW-1:0] req_data_out_merged;
for (genvar i = 0; i < NUM_REQS; i++) begin
for (genvar j = 0; j < LANES; ++j) begin
wire [TAG_OUT_WIDTH-1:0] req_tag_in_w;
VX_bits_insert #(
.N (TAG_IN_WIDTH),
.S (LOG_NUM_REQS),
.POS (TAG_SEL_IDX)
) bits_insert (
.data_in (req_tag_in[i][j]),
.sel_in (LOG_NUM_REQS'(i)),
.data_out (req_tag_in_w)
);
assign req_data_in_merged[i][j] = {req_tag_in_w, req_addr_in[i][j], req_rw_in[i][j], req_byteen_in[i][j], req_data_in[i][j]};
end
end
VX_stream_arbiter #(
.NUM_REQS (NUM_REQS),
.LANES (LANES),
.DATAW (REQ_DATAW),
.BUFFERED (BUFFERED_REQ),
.TYPE (TYPE)
) req_arb (
.clk (clk),
.reset (reset),
.valid_in (req_valid_in),
.data_in (req_data_in_merged),
.ready_in (req_ready_in),
.valid_out (req_valid_out),
.data_out (req_data_out_merged),
.ready_out (req_ready_out)
);
for (genvar i = 0; i < LANES; ++i) begin
assign {req_tag_out[i], req_addr_out[i], req_rw_out[i], req_byteen_out[i], req_data_out[i]} = req_data_out_merged[i];
end
///////////////////////////////////////////////////////////////////////
wire [NUM_REQS-1:0][RSP_DATAW-1:0] rsp_data_out_merged;
wire [LOG_NUM_REQS-1:0] rsp_sel = rsp_tag_in[TAG_SEL_IDX +: LOG_NUM_REQS];
wire [TAG_IN_WIDTH-1:0] rsp_tag_in_w;
VX_bits_remove #(
.N (TAG_OUT_WIDTH),
.S (LOG_NUM_REQS),
.POS (TAG_SEL_IDX)
) bits_remove (
.data_in (rsp_tag_in),
.data_out (rsp_tag_in_w)
);
VX_stream_demux #(
.NUM_REQS (NUM_REQS),
.LANES (1),
.DATAW (RSP_DATAW),
.BUFFERED (BUFFERED_RSP)
) rsp_demux (
.clk (clk),
.reset (reset),
.sel_in (rsp_sel),
.valid_in (rsp_valid_in),
.data_in ({rsp_tmask_in, rsp_tag_in_w, rsp_data_in}),
.ready_in (rsp_ready_in),
.valid_out (rsp_valid_out),
.data_out (rsp_data_out_merged),
.ready_out (rsp_ready_out)
);
for (genvar i = 0; i < NUM_REQS; i++) begin
assign {rsp_tmask_out[i], rsp_tag_out[i], rsp_data_out[i]} = rsp_data_out_merged[i];
end
end else begin
`UNUSED_VAR (clk)
`UNUSED_VAR (reset)
assign req_valid_out = req_valid_in;
assign req_tag_out = req_tag_in;
assign req_addr_out = req_addr_in;
assign req_rw_out = req_rw_in;
assign req_byteen_out = req_byteen_in;
assign req_data_out = req_data_in;
assign req_ready_in = req_ready_out;
assign rsp_valid_out = rsp_valid_in;
assign rsp_tmask_out = rsp_tmask_in;
assign rsp_tag_out = rsp_tag_in;
assign rsp_data_out = rsp_data_in;
assign rsp_ready_in = rsp_ready_out;
end
endmodule

6
runtime/src/vx_print.c
View File

@@ -34,7 +34,7 @@ int vx_vprintf(const char* format, va_list va) {
printf_arg_t arg; printf_arg_t arg;
arg.format = format; arg.format = format;
arg.va = &va; arg.va = &va;
vx_serial(__printf_cb, &arg); vx_serial((vx_serial_cb)__printf_cb, &arg);
return arg.ret; return arg.ret;
} }
@@ -63,7 +63,7 @@ void vx_putint(int value, int base) {
putint_arg_t arg; putint_arg_t arg;
arg.value = value; arg.value = value;
arg.base = base; arg.base = base;
vx_serial(__putint_cb, &arg); vx_serial((vx_serial_cb)__putint_cb, &arg);
} }
static void __putfloat_cb(const putfloat_arg_t* arg) { static void __putfloat_cb(const putfloat_arg_t* arg) {
@@ -83,7 +83,7 @@ void vx_putfloat(float value, int precision) {
putfloat_arg_t arg; putfloat_arg_t arg;
arg.value = value; arg.value = value;
arg.precision = precision; arg.precision = precision;
vx_serial(__putfloat_cb, &arg); vx_serial((vx_serial_cb)__putfloat_cb, &arg);
} }
#ifdef __cplusplus #ifdef __cplusplus

2
sim/rtlsim/Makefile
View File

@@ -1,7 +1,7 @@
RTL_DIR=../../hw/rtl RTL_DIR=../../hw/rtl
DPI_DIR=../../hw/dpi DPI_DIR=../../hw/dpi
CXXFLAGS += -std=c++11 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -Wall -Wextra -Wfatal-errors -Wno-array-bounds
CXXFLAGS += -fPIC -Wno-maybe-uninitialized CXXFLAGS += -fPIC -Wno-maybe-uninitialized
CXXFLAGS += -I../../../hw -I../../common CXXFLAGS += -I../../../hw -I../../common
CXXFLAGS += -I../../common/softfloat/source/include CXXFLAGS += -I../../common/softfloat/source/include

2
sim/vlsim/Makefile
View File

@@ -2,7 +2,7 @@ RTL_DIR = ../../hw/rtl
DPI_DIR = ../../hw/dpi DPI_DIR = ../../hw/dpi
SCRIPT_DIR=../../hw/scripts SCRIPT_DIR=../../hw/scripts
CXXFLAGS += -std=c++11 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -Wall -Wextra -Wfatal-errors -Wno-array-bounds
CXXFLAGS += -fPIC -Wno-maybe-uninitialized CXXFLAGS += -fPIC -Wno-maybe-uninitialized
CXXFLAGS += -I.. -I../../../hw -I../../common CXXFLAGS += -I.. -I../../../hw -I../../common
CXXFLAGS += -I../../common/softfloat/source/include CXXFLAGS += -I../../common/softfloat/source/include

6
tests/opencl/guassian/clutils.cpp
View File

@@ -421,7 +421,7 @@ cl_context cl_init_context(int platform, int dev,int quiet) {
#else #else
commandQueue = clCreateCommandQueue(context, commandQueue = clCreateCommandQueue(context,
devices[device_touse], NULL, &status); devices[device_touse], 0, &status);
#endif // PROFILING #endif // PROFILING
@@ -451,8 +451,8 @@ void cl_cleanup()
printf("clReleaseContext()\n"); printf("clReleaseContext()\n");
} }
for (int p = 0; p < numPlatforms; ++p) { for (cl_uint p = 0; p < numPlatforms; ++p) {
for (int d = 0; d < numDevices[p]; ++d) { for (cl_uint d = 0; d < numDevices[p]; ++d) {
status = clReleaseDevice(devices[d]); status = clReleaseDevice(devices[d]);
cl_errChk(status, "Oops!", true); cl_errChk(status, "Oops!", true);
printf("clReleaseDevice()\n"); printf("clReleaseDevice()\n");

6
tests/opencl/nearn/clutils.cpp
View File

@@ -421,7 +421,7 @@ cl_context cl_init_context(int platform, int dev,int quiet) {
#else #else
commandQueue = clCreateCommandQueue(context, commandQueue = clCreateCommandQueue(context,
devices[device_touse], NULL, &status); devices[device_touse], 0, &status);
#endif // PROFILING #endif // PROFILING
@@ -451,8 +451,8 @@ void cl_cleanup()
printf("clReleaseContext()\n"); printf("clReleaseContext()\n");
} }
for (int p = 0; p < numPlatforms; ++p) { for (cl_uint p = 0; p < numPlatforms; ++p) {
for (int d = 0; d < numDevices[p]; ++d) { for (cl_uint d = 0; d < numDevices[p]; ++d) {
status = clReleaseDevice(devices[d]); status = clReleaseDevice(devices[d]);
cl_errChk(status, "Oops!", true); cl_errChk(status, "Oops!", true);
printf("clReleaseDevice()\n"); printf("clReleaseDevice()\n");

2
tests/opencl/oclprintf/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

BIN
tests/opencl/oclprintf/kernel.pocl
View File

Binary file not shown.

2
tests/opencl/psort/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-strict-aliasing -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

2
tests/opencl/saxpy/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

2
tests/opencl/saxpy/main.cc
View File

@@ -157,7 +157,7 @@ int main(int argc, char **argv) {
context = CL_CHECK_ERR(clCreateContext(NULL, 1, &device_id, &pfn_notify, NULL, &_err)); context = CL_CHECK_ERR(clCreateContext(NULL, 1, &device_id, &pfn_notify, NULL, &_err));
cl_command_queue queue; cl_command_queue queue;
queue = CL_CHECK_ERR(clCreateCommandQueue(context, device_id, NULL, &_err)); queue = CL_CHECK_ERR(clCreateCommandQueue(context, device_id, 0, &_err));
cl_kernel kernel = 0; cl_kernel kernel = 0;
cl_mem memObjects[2] = {0, 0}; cl_mem memObjects[2] = {0, 0};

2
tests/opencl/sfilter/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

2
tests/opencl/sgemm/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

2
tests/opencl/vecadd/Makefile
View File

@@ -16,7 +16,7 @@ K_LDFLAGS += "-Wl,-Bstatic,-T$(VORTEX_RT_PATH)/linker/vx_link.ld -Wl,--gc-secti
CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -Wfatal-errors
#CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors #CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
CXXFLAGS += -I$(POCL_RT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include

4
tests/runtime/simple/tests.cpp
View File

@@ -208,7 +208,7 @@ int test_spawn_tasks() {
st_buffer_src[i] = 65 + i; st_buffer_src[i] = 65 + i;
} }
vx_spawn_tasks(ST_BUF_SZ, st_kernel, &arg); vx_spawn_tasks(ST_BUF_SZ, (vx_spawn_tasks_cb)st_kernel, &arg);
return check_error(st_buffer_dst, 0, ST_BUF_SZ); return check_error(st_buffer_dst, 0, ST_BUF_SZ);
} }
@@ -230,7 +230,7 @@ void sr_kernel(const sr_args_t * arg) {
void __attribute__ ((noinline)) do_serial() { void __attribute__ ((noinline)) do_serial() {
sr_args_t arg; sr_args_t arg;
arg.buf = sr_buffer; arg.buf = sr_buffer;
vx_serial(sr_kernel, &arg); vx_serial((vx_serial_cb)sr_kernel, &arg);
} }
int test_serial() { int test_serial() {