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

fixed build warnings

Browse Source
This commit is contained in:
Blaise Tine
2021-10-17 12:01:31 -07:00
parent 5d90439a51
commit af6d9e7a8b
16 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regression/tex/common.h
View File

@@ -3,7 +3,7 @@
#define KERNEL_ARG_DEV_MEM_ADDR 0x7ffff000
struct kernel_arg_t {
typedef struct {
uint32_t num_tasks;
uint8_t format;
uint8_t filter;
@@ -20,6 +20,6 @@ struct kernel_arg_t {
uint8_t dst_stride;
uint32_t dst_pitch;
uint32_t dst_ptr;
};
} kernel_arg_t;
#endif

32
tests/regression/tex/kernel.c
View File

@@ -1,31 +1,31 @@
#include <stdint.h>
#include <vx_intrinsics.h>
#include <vx_spawn.h>
#include "common.h"
#include "texsw.h"
#define ENABLE_SW
struct tile_arg_t {
struct kernel_arg_t* state;
typedef struct {
kernel_arg_t* state;
uint32_t tile_width;
uint32_t tile_height;
float deltaX;
float deltaY;
};
} tile_arg_t;
void kernel_body(int task_id, void* arg) {
struct tile_arg_t* _arg = (struct tile_arg_t*)(arg);
struct kernel_arg_t* state = _arg->state;
void kernel_body(int task_id, tile_arg_t* arg) {
kernel_arg_t* state = arg->state;
uint32_t xoffset = 0;
uint32_t yoffset = task_id * _arg->tile_height;
uint32_t yoffset = task_id * arg->tile_height;
uint8_t* dst_ptr = (uint8_t*)(state->dst_ptr + xoffset * state->dst_stride + yoffset * state->dst_pitch);
float fv = yoffset * _arg->deltaY;
for (uint32_t y = 0; y < _arg->tile_height; ++y) {
float fv = yoffset * arg->deltaY;
for (uint32_t y = 0; y < arg->tile_height; ++y) {
uint32_t* dst_row = (uint32_t*)dst_ptr;
float fu = xoffset * _arg->deltaX;
for (uint32_t x = 0; x < _arg->tile_width; ++x) {
float fu = xoffset * arg->deltaX;
for (uint32_t x = 0; x < arg->tile_width; ++x) {
int32_t u = (int32_t)(fu * (1<<20));
int32_t v = (int32_t)(fv * (1<<20));
#ifdef ENABLE_SW
@@ -37,15 +37,15 @@ void kernel_body(int task_id, void* arg) {
#ifdef ENABLE_SW
}
#endif
fu += _arg->deltaX;
fu += arg->deltaX;
}
dst_ptr += state->dst_pitch;
fv += _arg->deltaY;
fv += arg->deltaY;
}
}
int main() {
struct kernel_arg_t* arg = (struct kernel_arg_t*)KERNEL_ARG_DEV_MEM_ADDR;
kernel_arg_t* arg = (kernel_arg_t*)KERNEL_ARG_DEV_MEM_ADDR;
// configure texture unit
vx_csr_write(CSR_TEX_ADDR(0), arg->src_ptr);
@@ -56,12 +56,12 @@ int main() {
vx_csr_write(CSR_TEX_WRAP(0), (arg->wrap << 2) | arg->wrap);
vx_csr_write(CSR_TEX_FILTER(0), (arg->filter ? 1 : 0));
struct tile_arg_t targ;
tile_arg_t targ;
targ.state = arg;
targ.tile_width = arg->dst_width;
targ.tile_height = (arg->dst_height + arg->num_tasks - 1) / arg->num_tasks;
targ.deltaX = 1.0f / arg->dst_width;
targ.deltaY = 1.0f / arg->dst_height;
vx_spawn_tasks(arg->num_tasks, kernel_body, &targ);
vx_spawn_tasks(arg->num_tasks, (vx_spawn_tasks_cb)kernel_body, &targ);
}

4
tests/regression/tex/texsw.h
View File

@@ -65,7 +65,7 @@ inline int pack(int format, int l, int h) {
}
}
inline int tex_sw(struct kernel_arg_t* state, int stage, int u, int v, int lod) {
inline int tex_sw(kernel_arg_t* state, int stage, int u, int v, int lod) {
int base_addr = state->src_ptr;
int mip_offset = 0;
int log_width = state->src_logWidth;
@@ -148,7 +148,7 @@ inline int vx_tex3(int stage, int u, int v, int lod) {
return c;
}
inline int tex3_sw(struct kernel_arg_t* state, int stage, int u, int v, int lod) {
inline int tex3_sw(kernel_arg_t* state, int stage, int u, int v, int lod) {
int lodn = MIN(lod + 0x10000, TEX_LOD_MAX);
int a = tex_sw(state, 0, u, v, lod);
int b = tex_sw(state, 0, u, v, lodn);