minor update

This commit is contained in:
Blaise Tine 2022-05-19 04:58:00 -04:00
parent ddd222818a
commit 55eb8562a7
3 changed files with 13 additions and 11 deletions

View file

@ -27,12 +27,14 @@ CONFIGS="-DEXT_GFX_ENABLE -DL1_DISABLE -DSM_DISABLE" ./ci/blackbox.sh --driver=r
CONFIGS="-DEXT_TEX_ENABLE" ./ci/blackbox.sh --driver=simx --app=tex --args="-isoccer.png -osoccer_result.png -rsoccer_ref_g1.png -g1" --perf=2
CONFIGS="-DEXT_TEX_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=tex --args="-isoccer.png -osoccer_result.png -rsoccer_ref_g1.png -g1" --perf=2
CONFIGS="-DEXT_TEX_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=tex --args="-isoccer.png -osoccer_result.png -rsoccer_ref_g1.png -g1 -z"
CONFIGS="-DEXT_RASTER_ENABLE" ./ci/blackbox.sh --driver=simx --app=raster --args="-ttriangle.cgltrace -rtriangle_ref_128.png" --perf=3
CONFIGS="-DEXT_RASTER_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=raster --args="-ttriangle.cgltrace -rtriangle_ref_8.png -w8 -h8" --perf=3
CONFIGS="-DEXT_ROP_ENABLE" ./ci/blackbox.sh --driver=simx --app=rop --args="-rwhitebox_128.png" --perf=4
CONFIGS="-DEXT_ROP_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=rop --args="-rwhitebox_128.png" --perf=4
CONFIGS="-DEXT_IMADD_ENABLE" ./ci/blackbox.sh --driver=simx --app=imadd
CONFIGS="-DEXT_IMADD_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=imadd
CONFIGS="-DEXT_IMADD_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=imadd --args="-n32 -z"
CONFIGS="-DEXT_GFX_ENABLE" ./ci/blackbox.sh --driver=simx --app=draw3d --args="-ttriangle.cgltrace -rtriangle_ref.png"
CONFIGS="-DEXT_GFX_ENABLE" ./ci/blackbox.sh --driver=rtlsim --app=draw3d --args="-ttriangle.cgltrace -rtriangle_ref_8.png -w8 -h8"
CONFIGS="-DEXT_GFX_ENABLE" ./ci/blackbox.sh --driver=vlsim --app=draw3d --args="-ttriangle.cgltrace -rtriangle_ref_8.png -w8 -h8" --warps=1 --threads=1 --debug=3

View file

@ -18,7 +18,7 @@ VX_LDFLAGS += -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/linker/vx_link$(XLEN).ld -Wl,--g
VX_LDFLAGS += -lm
VX_SRCS = kernel.c
VX_SRCS = kernel.cpp
CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Wfatal-errors
@ -46,7 +46,7 @@ kernel.bin: kernel.elf
$(VX_CP) -O binary kernel.elf kernel.bin
kernel.elf: $(VX_SRCS)
$(VX_CC) $(VX_CFLAGS) $(VX_SRCS) $(VX_LDFLAGS) -o kernel.elf
$(VX_CXX) $(VX_CFLAGS) $(VX_SRCS) $(VX_LDFLAGS) -o kernel.elf
$(PROJECT): $(SRCS)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@

View file

@ -4,7 +4,7 @@
#include <vx_spawn.h>
#include "common.h"
inline int32_t vx_imad_sw(int32_t a, int32_t b, int32_t c, int32_t s) {
inline int32_t vx_imadd_sw(int32_t a, int32_t b, int32_t c, int32_t s) {
int64_t x = a;
int64_t y = b;
int64_t p = (x * y) >> (s << 3);
@ -29,18 +29,18 @@ void kernel_body(int task_id, kernel_arg_t* arg) {
int32_t d;
if (arg->use_sw) {
switch (s) {
case 0: d = vx_imad_sw(a, b, c, 0); break;
case 1: d = vx_imad_sw(a, b, c, 1); break;
case 2: d = vx_imad_sw(a, b, c, 2); break;
case 3: d = vx_imad_sw(a, b, c, 3); break;
case 0: d = vx_imadd_sw(a, b, c, 0); break;
case 1: d = vx_imadd_sw(a, b, c, 1); break;
case 2: d = vx_imadd_sw(a, b, c, 2); break;
case 3: d = vx_imadd_sw(a, b, c, 3); break;
default: d = 0; break;
}
} else {
switch (s) {
case 0: d = vx_imad(a, b, c, 0); break;
case 1: d = vx_imad(a, b, c, 1); break;
case 2: d = vx_imad(a, b, c, 2); break;
case 3: d = vx_imad(a, b, c, 3); break;
case 0: d = vx_imadd(a, b, c, 0); break;
case 1: d = vx_imadd(a, b, c, 1); break;
case 2: d = vx_imadd(a, b, c, 2); break;
case 3: d = vx_imadd(a, b, c, 3); break;
default: d = 0; break;
}
}