From ba16e88eab1f704c21c8723a5d296a461706c2dc Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Mon, 3 May 2021 12:24:41 -0700 Subject: [PATCH] stress test update --- driver/tests/Makefile | 4 ++ driver/tests/basic/main.cpp | 52 +++++++++++++------------- driver/tests/demo/main.cpp | 30 +++++++-------- driver/tests/stress/common.h | 6 +-- driver/tests/stress/kernel.c | 8 ++-- driver/tests/stress/main.cpp | 72 +++++++++++++++++++----------------- hw/syn/opae/README | 7 +--- 7 files changed, 91 insertions(+), 88 deletions(-) diff --git a/driver/tests/Makefile b/driver/tests/Makefile index 5e4b3382..40394bc9 100644 --- a/driver/tests/Makefile +++ b/driver/tests/Makefile @@ -2,19 +2,23 @@ all: $(MAKE) -C basic $(MAKE) -C demo $(MAKE) -C dogfood + $(MAKE) -C stress run: $(MAKE) -C basic run-vlsim $(MAKE) -C demo run-vlsim $(MAKE) -C dogfood run-vlsim + $(MAKE) -C stress run-vlsim clean: $(MAKE) -C basic clean $(MAKE) -C demo clean $(MAKE) -C dogfood clean + $(MAKE) -C stress clean clean-all: $(MAKE) -C basic clean-all $(MAKE) -C demo clean-all $(MAKE) -C dogfood clean-all + $(MAKE) -C stress clean-all diff --git a/driver/tests/basic/main.cpp b/driver/tests/basic/main.cpp index fb232c7c..586173eb 100755 --- a/driver/tests/basic/main.cpp +++ b/driver/tests/basic/main.cpp @@ -23,7 +23,7 @@ int test = -1; uint32_t count = 0; vx_device_h device = nullptr; -vx_buffer_h buffer = nullptr; +vx_buffer_h staging_buf = nullptr; static void show_usage() { std::cout << "Vortex Driver Test." << std::endl; @@ -56,8 +56,8 @@ static void parse_args(int argc, char **argv) { } void cleanup() { - if (buffer) { - vx_buf_release(buffer); + if (staging_buf) { + vx_buf_release(staging_buf); } if (device) { vx_dev_close(device); @@ -77,38 +77,38 @@ int run_memcopy_test(uint32_t dev_addr, uint64_t value, int num_blocks) { // update source buffer for (int i = 0; i < num_blocks_8; ++i) { - ((uint64_t*)vx_host_ptr(buffer))[i] = shuffle(i, value); + ((uint64_t*)vx_host_ptr(staging_buf))[i] = shuffle(i, value); } /*for (int i = 0; i < num_blocks; ++i) { std::cout << "data[" << i << "]=0x"; for (int j = 7; j >= 0; --j) { - std::cout << std::hex << ((uint64_t*)vx_host_ptr(buffer))[i * 8 +j]; + std::cout << std::hex << ((uint64_t*)vx_host_ptr(staging_buf))[i * 8 +j]; } std::cout << std::endl; }*/ - // write buffer to local memory - std::cout << "write buffer to local memory" << std::endl; + // write source buffer to local memory + std::cout << "write source buffer to local memory" << std::endl; auto t0 = std::chrono::high_resolution_clock::now(); - RT_CHECK(vx_copy_to_dev(buffer, dev_addr, 64 * num_blocks, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, dev_addr, 64 * num_blocks, 0)); auto t1 = std::chrono::high_resolution_clock::now(); // clear destination buffer for (int i = 0; i < num_blocks_8; ++i) { - ((uint64_t*)vx_host_ptr(buffer))[i] = 0; + ((uint64_t*)vx_host_ptr(staging_buf))[i] = 0; } - // read buffer from local memory - std::cout << "read buffer from local memory" << std::endl; + // read destination buffer from local memory + std::cout << "read destination buffer from local memory" << std::endl; auto t2 = std::chrono::high_resolution_clock::now(); - RT_CHECK(vx_copy_from_dev(buffer, dev_addr, 64 * num_blocks, 0)); + RT_CHECK(vx_copy_from_dev(staging_buf, dev_addr, 64 * num_blocks, 0)); auto t3 = std::chrono::high_resolution_clock::now(); // verify result std::cout << "verify result" << std::endl; for (int i = 0; i < num_blocks_8; ++i) { - auto curr = ((uint64_t*)vx_host_ptr(buffer))[i]; + auto curr = ((uint64_t*)vx_host_ptr(staging_buf))[i]; auto ref = shuffle(i, value); if (curr != ref) { std::cout << "error at 0x" << std::hex << (dev_addr + 8 * i) @@ -145,25 +145,25 @@ int run_kernel_test(const kernel_arg_t& kernel_arg, // update source buffer { - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { buf_ptr[i] = i; } } std::cout << "upload source buffer" << std::endl; auto t0 = std::chrono::high_resolution_clock::now(); - RT_CHECK(vx_copy_to_dev(buffer, kernel_arg.src_ptr, buf_size, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src_ptr, buf_size, 0)); auto t1 = std::chrono::high_resolution_clock::now(); // clear destination buffer { - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { buf_ptr[i] = 0xdeadbeef; } } std::cout << "clear destination buffer" << std::endl; - RT_CHECK(vx_copy_to_dev(buffer, kernel_arg.dst_ptr, buf_size, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); // start device std::cout << "start execution" << std::endl; @@ -172,17 +172,17 @@ int run_kernel_test(const kernel_arg_t& kernel_arg, RT_CHECK(vx_ready_wait(device, -1)); auto t3 = std::chrono::high_resolution_clock::now(); - // read buffer from local memory - std::cout << "read buffer from local memory" << std::endl; + // read destination buffer from local memory + std::cout << "read destination buffer from local memory" << std::endl; auto t4 = std::chrono::high_resolution_clock::now(); - RT_CHECK(vx_copy_from_dev(buffer, kernel_arg.dst_ptr, buf_size, 0)); + RT_CHECK(vx_copy_from_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); auto t5 = std::chrono::high_resolution_clock::now(); // verify result std::cout << "verify result" << std::endl; for (uint32_t i = 0; i < num_points; ++i) { - int32_t curr = ((int32_t*)vx_host_ptr(buffer))[i]; + int32_t curr = ((int32_t*)vx_host_ptr(staging_buf))[i]; int32_t ref = i; if (curr != ref) { std::cout << "error at result #" << i @@ -233,8 +233,8 @@ int main(int argc, char *argv[]) { unsigned max_cores; RT_CHECK(vx_dev_caps(device, VX_CAPS_MAX_CORES, &max_cores)); uint32_t num_points = 1 * count; - uint32_t num_blocks = (num_points * sizeof(uint32_t) + 63) / 64; - uint32_t buf_size = num_blocks * 64; + uint32_t num_blocks = (num_points * sizeof(int32_t) + 63) / 64; + uint32_t buf_size = num_blocks * 64; std::cout << "number of points: " << num_points << std::endl; std::cout << "buffer size: " << buf_size << " bytes" << std::endl; @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) { // allocate shared memory std::cout << "allocate shared memory" << std::endl; uint32_t alloc_size = std::max(buf_size, sizeof(kernel_arg_t)); - RT_CHECK(vx_alloc_shared_mem(device, alloc_size, &buffer)); + RT_CHECK(vx_alloc_shared_mem(device, alloc_size, &staging_buf)); // run tests if (0 == test || -1 == test) { @@ -269,9 +269,9 @@ int main(int argc, char *argv[]) { // upload kernel argument std::cout << "upload kernel argument" << std::endl; { - auto buf_ptr = (void*)vx_host_ptr(buffer); + auto buf_ptr = (void*)vx_host_ptr(staging_buf); memcpy(buf_ptr, &kernel_arg, sizeof(kernel_arg_t)); - RT_CHECK(vx_copy_to_dev(buffer, KERNEL_ARG_DEV_MEM_ADDR, sizeof(kernel_arg_t), 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, KERNEL_ARG_DEV_MEM_ADDR, sizeof(kernel_arg_t), 0)); } std::cout << "run kernel test" << std::endl; diff --git a/driver/tests/demo/main.cpp b/driver/tests/demo/main.cpp index 41483458..7261869c 100644 --- a/driver/tests/demo/main.cpp +++ b/driver/tests/demo/main.cpp @@ -20,7 +20,7 @@ const char* kernel_file = "kernel.bin"; uint32_t count = 0; vx_device_h device = nullptr; -vx_buffer_h buffer = nullptr; +vx_buffer_h staging_buf = nullptr; static void show_usage() { std::cout << "Vortex Driver Test." << std::endl; @@ -50,8 +50,8 @@ static void parse_args(int argc, char **argv) { } void cleanup() { - if (buffer) { - vx_buf_release(buffer); + if (staging_buf) { + vx_buf_release(staging_buf); } if (device) { vx_dev_close(device); @@ -71,13 +71,13 @@ int run_test(const kernel_arg_t& kernel_arg, // download destination buffer std::cout << "download destination buffer" << std::endl; - RT_CHECK(vx_copy_from_dev(buffer, kernel_arg.dst_ptr, buf_size, 0)); + RT_CHECK(vx_copy_from_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); // verify result std::cout << "verify result" << std::endl; { int errors = 0; - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { int ref = i + i; int cur = buf_ptr[i]; @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) { uint32_t num_tasks = max_cores * max_warps * max_threads; uint32_t num_points = count * num_tasks; - uint32_t buf_size = num_points * sizeof(uint32_t); + uint32_t buf_size = num_points * sizeof(int32_t); std::cout << "number of points: " << num_points << std::endl; std::cout << "buffer size: " << buf_size << " bytes" << std::endl; @@ -148,45 +148,45 @@ int main(int argc, char *argv[]) { // allocate shared memory std::cout << "allocate shared memory" << std::endl; uint32_t alloc_size = std::max(buf_size, sizeof(kernel_arg_t)); - RT_CHECK(vx_alloc_shared_mem(device, alloc_size, &buffer)); + RT_CHECK(vx_alloc_shared_mem(device, alloc_size, &staging_buf)); // upload kernel argument std::cout << "upload kernel argument" << std::endl; { - auto buf_ptr = (int*)vx_host_ptr(buffer); + auto buf_ptr = (int*)vx_host_ptr(staging_buf); memcpy(buf_ptr, &kernel_arg, sizeof(kernel_arg_t)); - RT_CHECK(vx_copy_to_dev(buffer, KERNEL_ARG_DEV_MEM_ADDR, sizeof(kernel_arg_t), 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, KERNEL_ARG_DEV_MEM_ADDR, sizeof(kernel_arg_t), 0)); } // upload source buffer0 { - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { buf_ptr[i] = i-1; } } std::cout << "upload source buffer0" << std::endl; - RT_CHECK(vx_copy_to_dev(buffer, kernel_arg.src0_ptr, buf_size, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src0_ptr, buf_size, 0)); // upload source buffer1 { - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { buf_ptr[i] = i+1; } } std::cout << "upload source buffer1" << std::endl; - RT_CHECK(vx_copy_to_dev(buffer, kernel_arg.src1_ptr, buf_size, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src1_ptr, buf_size, 0)); // clear destination buffer { - auto buf_ptr = (int32_t*)vx_host_ptr(buffer); + auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); for (uint32_t i = 0; i < num_points; ++i) { buf_ptr[i] = 0xdeadbeef; } } std::cout << "clear destination buffer" << std::endl; - RT_CHECK(vx_copy_to_dev(buffer, kernel_arg.dst_ptr, buf_size, 0)); + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); // run tests std::cout << "run tests" << std::endl; diff --git a/driver/tests/stress/common.h b/driver/tests/stress/common.h index 41a7cc1f..55c6dbab 100644 --- a/driver/tests/stress/common.h +++ b/driver/tests/stress/common.h @@ -8,9 +8,9 @@ struct kernel_arg_t { uint32_t num_tasks; uint32_t size; - uint32_t stride; - uint32_t src0_ptr; - uint32_t src1_ptr; + uint32_t stride; + uint32_t addr_ptr; + uint32_t src_ptr; uint32_t dst_ptr; }; diff --git a/driver/tests/stress/kernel.c b/driver/tests/stress/kernel.c index abcc46e2..277935fc 100644 --- a/driver/tests/stress/kernel.c +++ b/driver/tests/stress/kernel.c @@ -6,8 +6,8 @@ void kernel_body(int task_id, void* arg) { struct kernel_arg_t* _arg = (struct kernel_arg_t*)(arg); uint32_t stride = _arg->stride; - int32_t* src0_ptr = (int32_t*)_arg->src0_ptr; - uint32_t* src1_ptr = (uint32_t*)_arg->src1_ptr; + uint32_t* addr_ptr = (uint32_t*)_arg->addr_ptr; + int32_t* src_ptr = (int32_t*)_arg->src_ptr; int32_t* dst_ptr = (int32_t*)_arg->dst_ptr; uint32_t offset = task_id * stride; @@ -16,8 +16,8 @@ void kernel_body(int task_id, void* arg) { int value = 0; for (uint32_t j = 0; j < NUM_LOADS; ++j) { uint32_t addr = offset + i + j; - uint32_t index = src1_ptr[addr]; - value += src0_ptr[index]; + uint32_t index = addr_ptr[addr]; + value += src_ptr[index]; } dst_ptr[offset+i] = value; } diff --git a/driver/tests/stress/main.cpp b/driver/tests/stress/main.cpp index e6952ba2..02c9b664 100644 --- a/driver/tests/stress/main.cpp +++ b/driver/tests/stress/main.cpp @@ -80,7 +80,7 @@ void gen_input_data(uint32_t num_points) { } int run_test(const kernel_arg_t& kernel_arg, - uint32_t buf_size, + uint32_t dst_buf_size, uint32_t num_points) { // start device std::cout << "start device" << std::endl; @@ -90,17 +90,15 @@ int run_test(const kernel_arg_t& kernel_arg, std::cout << "wait for completion" << std::endl; RT_CHECK(vx_ready_wait(device, -1)); - // download destination staging_buf - std::cout << "download destination staging_buf" << std::endl; - RT_CHECK(vx_copy_from_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); + // download destination buffer + std::cout << "download destination buffer" << std::endl; + RT_CHECK(vx_copy_from_dev(staging_buf, kernel_arg.dst_ptr, dst_buf_size, 0)); // verify result std::cout << "verify result" << std::endl; { int errors = 0; auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); - - uint32_t size_m1 = num_points - 1; for (uint32_t i = 0; i < num_points; ++i) { @@ -109,7 +107,7 @@ int run_test(const kernel_arg_t& kernel_arg, uint32_t addr = i + j; uint32_t index = addr_table.at(addr); int value = test_data.at(index); - printf("*** [%d] addr=%d, index=%d, value=%d\n", i, addr, index, value); + //printf("*** [%d] addr=%d, index=%d, value=%d\n", i, addr, index, value); ref += value; } @@ -155,14 +153,17 @@ int main(int argc, char *argv[]) { uint32_t num_tasks = max_cores * max_warps * max_threads; uint32_t num_points = count * num_tasks; - uint32_t buf_size = num_points * sizeof(uint32_t); - - std::cout << "number of points: " << num_points << std::endl; - std::cout << "staging_buf size: " << buf_size << " bytes" << std::endl; // generate input data gen_input_data(num_points); + uint32_t addr_buf_size = addr_table.size() * sizeof(int32_t); + uint32_t src_buf_size = test_data.size() * sizeof(int32_t); + uint32_t dst_buf_size = test_data.size() * sizeof(int32_t); + + std::cout << "number of points: " << num_points << std::endl; + std::cout << "buffer size: " << dst_buf_size << " bytes" << std::endl; + // upload program std::cout << "upload program" << std::endl; RT_CHECK(vx_upload_kernel_file(device, kernel_file)); @@ -170,24 +171,27 @@ int main(int argc, char *argv[]) { // allocate device memory std::cout << "allocate device memory" << std::endl; - RT_CHECK(vx_alloc_dev_mem(device, buf_size, &value)); - kernel_arg.src0_ptr = value; - RT_CHECK(vx_alloc_dev_mem(device, buf_size, &value)); - kernel_arg.src1_ptr = value; - RT_CHECK(vx_alloc_dev_mem(device, buf_size, &value)); + RT_CHECK(vx_alloc_dev_mem(device, addr_buf_size, &value)); + kernel_arg.addr_ptr = value; + RT_CHECK(vx_alloc_dev_mem(device, src_buf_size, &value)); + kernel_arg.src_ptr = value; + RT_CHECK(vx_alloc_dev_mem(device, dst_buf_size, &value)); kernel_arg.dst_ptr = value; kernel_arg.num_tasks = num_tasks; kernel_arg.stride = count; - std::cout << "dev_src0=" << std::hex << kernel_arg.src0_ptr << std::endl; - std::cout << "dev_src1=" << std::hex << kernel_arg.src1_ptr << std::endl; - std::cout << "dev_dst=" << std::hex << kernel_arg.dst_ptr << std::endl; + std::cout << "dev_addr=" << std::hex << kernel_arg.addr_ptr << std::endl; + std::cout << "dev_src=" << std::hex << kernel_arg.src_ptr << std::endl; + std::cout << "dev_dst=" << std::hex << kernel_arg.dst_ptr << std::endl; // allocate shared memory std::cout << "allocate shared memory" << std::endl; - uint32_t alloc_size = std::max(buf_size, sizeof(kernel_arg_t)); - RT_CHECK(vx_alloc_shared_mem(device, alloc_size, &staging_buf)); + uint32_t staging_buf_size = std::max(src_buf_size, + std::max(addr_buf_size, + std::max(dst_buf_size, + sizeof(kernel_arg_t)))); + RT_CHECK(vx_alloc_shared_mem(device, staging_buf_size, &staging_buf)); // upload kernel argument std::cout << "upload kernel argument" << std::endl; @@ -200,36 +204,36 @@ int main(int argc, char *argv[]) { // upload source buffer0 { auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); - for (uint32_t i = 0; i < num_points; ++i) { - buf_ptr[i] = test_data.at(i); + for (uint32_t i = 0; i < addr_table.size(); ++i) { + buf_ptr[i] = addr_table.at(i); } } - std::cout << "upload source buffer0" << std::endl; - RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src0_ptr, buf_size, 0)); + std::cout << "upload address buffer" << std::endl; + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.addr_ptr, addr_buf_size, 0)); // upload source buffer1 { auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); - for (uint32_t i = 0; i < num_points; ++i) { - buf_ptr[i] = addr_table.at(i); + for (uint32_t i = 0; i < test_data.size(); ++i) { + buf_ptr[i] = test_data.at(i); } } - std::cout << "upload source buffer1" << std::endl; - RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src1_ptr, buf_size, 0)); + std::cout << "upload source buffer" << std::endl; + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.src_ptr, src_buf_size, 0)); - // clear destination staging_buf + // clear destination buffer { auto buf_ptr = (int32_t*)vx_host_ptr(staging_buf); - for (uint32_t i = 0; i < num_points; ++i) { + for (uint32_t i = 0; i < test_data.size(); ++i) { buf_ptr[i] = 0xdeadbeef; } } - std::cout << "clear destination staging_buf" << std::endl; - RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.dst_ptr, buf_size, 0)); + std::cout << "clear destination buffer" << std::endl; + RT_CHECK(vx_copy_to_dev(staging_buf, kernel_arg.dst_ptr, dst_buf_size, 0)); // run tests std::cout << "run tests" << std::endl; - RT_CHECK(run_test(kernel_arg, buf_size, num_points)); + RT_CHECK(run_test(kernel_arg, dst_buf_size, num_points)); // cleanup std::cout << "cleanup" << std::endl; diff --git a/hw/syn/opae/README b/hw/syn/opae/README index c85981c7..9e0bd4bf 100644 --- a/hw/syn/opae/README +++ b/hw/syn/opae/README @@ -80,14 +80,9 @@ run -all tar -zcvf output_files_1c.tar.gz `find ./build_fpga_1c -type f \( -iname \*.rpt -o -iname \*.txt -o -iname \*summary -o -iname \*.log \)` # compress VCD trace -tar -zcvf trace.vcd.tar.gz ./build_ase_1c/work/trace.vcd -tar -zcvf trace.vcd.tar.gz obj_dir/trace.vcd -tar -zcvf trace.fst.tar.gz trace.fst run.log tar -zcvf run.log.tar.gz run.log -tar -zcvf vx_scope.vcd.tar.gz vx_scope.vcd tar -cvjf vx_scope.vcd.tar.bz2 vx_scope.vcd -tar -cvjf trace.fst.tar.bz2 trace.fst run.log -tar -cvjf trace.vcd.tar.bz2 driver/tests/basic/trace.vcd run.log +tar -cvjf trace.vcd.tar.bz2 trace.vcd run.log tar -cvjf trace.vcd.tar.bz2 build_ase_1c/work/run.log build_ase_1c/work/trace.vcd # decompress VCD trace