diff options
Diffstat (limited to 'VA')
| -rw-r--r-- | VA/Makefile | 34 | ||||
| -rw-r--r-- | VA/baselines/cpu/Makefile | 2 | ||||
| -rw-r--r-- | VA/baselines/cpu/app_baseline.c | 10 | ||||
| -rwxr-xr-x | VA/benchmark-scripts/ccmcc25-sim.sh | 25 | ||||
| -rwxr-xr-x | VA/benchmark-scripts/ccmcc25.sh | 31 | ||||
| -rw-r--r-- | VA/dpu/task.c | 2 | ||||
| -rw-r--r-- | VA/host/app.c | 79 | ||||
| -rw-r--r--[-rwxr-xr-x] | VA/include/common.h (renamed from VA/support/common.h) | 14 | ||||
| -rw-r--r-- | VA/include/dfatool_host.ah | 29 | ||||
| -rw-r--r-- | VA/include/params.h (renamed from VA/support/params.h) | 8 | ||||
| -rw-r--r-- | VA/include/timer.h | 5 | ||||
| -rwxr-xr-x | VA/support/timer.h | 74 |
12 files changed, 186 insertions, 127 deletions
diff --git a/VA/Makefile b/VA/Makefile index 040dd4a..a67c600 100644 --- a/VA/Makefile +++ b/VA/Makefile @@ -8,17 +8,34 @@ WITH_LOAD_OVERHEAD ?= 0 WITH_FREE_OVERHEAD ?= 0 WITH_DPUINFO ?= 0 -COMMON_INCLUDES := support HOST_SOURCES := $(wildcard host/*.c) DPU_SOURCES := $(wildcard dpu/*.c) -COMMON_FLAGS := -Wall -Wextra -g -I${COMMON_INCLUDES} -HOST_FLAGS := ${COMMON_FLAGS} -std=c11 -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DBL=${BL} -D${TYPE} -DENERGY=${ENERGY} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DWITH_DPUINFO=${WITH_DPUINFO} +aspectc ?= 0 +aspectc_timing ?= 0 +dfatool_timing ?= 1 + +HOST_CC := ${CC} + +COMMON_FLAGS := -Wall -Wextra -g -Iinclude +HOST_FLAGS := ${COMMON_FLAGS} -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DBL=${BL} -D${TYPE} -DENERGY=${ENERGY} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DWITH_DPUINFO=${WITH_DPUINFO} -DDFATOOL_TIMING=${dfatool_timing} -DASPECTC=${aspectc} DPU_FLAGS := ${COMMON_FLAGS} -O2 -DNR_TASKLETS=${NR_TASKLETS} -DBL=${BL} -D${TYPE} +ifeq (${aspectc_timing}, 1) + ASPECTC_HOST_FLAGS += -ainclude/dfatool_host_dpu.ah -ainclude/dfatool_host.ah +endif + +ASPECTC_HOST_FLAGS ?= -a0 + +ifeq (${aspectc}, 1) + HOST_CC = ag++ -r repo.acp -v 0 ${ASPECTC_HOST_FLAGS} --c_compiler ${UPMEM_HOME}/bin/clang++ -p . --Xcompiler +else + HOST_FLAGS += -std=c11 +endif + QUIET = @ -ifdef verbose +ifeq (${verbose}, 1) QUIET = endif @@ -27,10 +44,13 @@ all: bin/host_code bin/dpu_code bin: ${QUIET}mkdir -p bin -bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES} bin - ${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS} +# cp/rm are needed to work around AspectC++ not liking symlinks +bin/host_code: ${HOST_SOURCES} include bin + ${QUIET}cp ../include/dfatool_host_dpu.ah include + ${QUIET}${HOST_CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS} + ${QUIET}rm -f include/dfatool_host_dpu.ah -bin/dpu_code: ${DPU_SOURCES} ${COMMON_INCLUDES} bin +bin/dpu_code: ${DPU_SOURCES} include bin ${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES} clean: diff --git a/VA/baselines/cpu/Makefile b/VA/baselines/cpu/Makefile index 04aacb6..279b0f3 100644 --- a/VA/baselines/cpu/Makefile +++ b/VA/baselines/cpu/Makefile @@ -5,7 +5,7 @@ nop_sync ?= 0 numa ?= 0 numa_memcpy ?= 0 -CFLAGS = +CFLAGS = -DDFATOOL_TIMING=1 LDFLAGS = ifeq (${debug}, 1) diff --git a/VA/baselines/cpu/app_baseline.c b/VA/baselines/cpu/app_baseline.c index 7975200..fe5125d 100644 --- a/VA/baselines/cpu/app_baseline.c +++ b/VA/baselines/cpu/app_baseline.c @@ -15,7 +15,7 @@ #include <omp.h> #if WITH_BENCHMARK -#include "../../support/timer.h" +#include "../../include/timer.h" #else #define start(...) #define stop(...) @@ -109,7 +109,7 @@ struct Params input_params(int argc, char **argv) p.n_warmup = 1; p.n_reps = 3; p.exp = 1; - p.n_threads = 5; + p.n_threads = 8; #if NUMA p.bitmask_in = NULL; p.bitmask_out = NULL; @@ -213,9 +213,11 @@ int main(int argc, char **argv) C = (T *) malloc(input_size * sizeof(T)); #endif + omp_set_num_threads(p.n_threads); + #pragma omp parallel for for (unsigned long i = 0; i < input_size; i++) { - A[i] = (T) (rand()); - B[i] = (T) (rand()); + A[i] = (T) i % (1<<31) + 5; + B[i] = (T) i % (1<<31) + 6; } #if NUMA diff --git a/VA/benchmark-scripts/ccmcc25-sim.sh b/VA/benchmark-scripts/ccmcc25-sim.sh new file mode 100755 index 0000000..386cf90 --- /dev/null +++ b/VA/benchmark-scripts/ccmcc25-sim.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +mkdir -p log/$(hostname) + +run_benchmark_nmc() { + local "$@" + set -e + make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 \ + aspectc=1 aspectc_timing=1 dfatool_timing=0 + bin/host_code -w 0 -e 5 -i ${input_size} +} + +export -f run_benchmark_nmc + +fn=log/$(hostname)/ccmcc25-sim + +source ~/lib/local/upmem/upmem-2025.1.0-Linux-x86_64/upmem_env.sh simulator + +echo "prim-benchmarks VA $(git describe --all --long) $(git rev-parse HEAD) $(date -R)" >> ${fn}.txt + +parallel -j1 --eta --joblog ${fn}.joblog --resume --header : \ + run_benchmark_nmc nr_dpus={nr_dpus} nr_tasklets=16 input_size={input_size} \ + ::: nr_dpus 1 2 4 8 16 32 48 64 \ + ::: input_size 327680 655360 1310720 2621440 \ +>> ${fn}.txt diff --git a/VA/benchmark-scripts/ccmcc25.sh b/VA/benchmark-scripts/ccmcc25.sh new file mode 100755 index 0000000..f6d441d --- /dev/null +++ b/VA/benchmark-scripts/ccmcc25.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +mkdir -p log/$(hostname) + +run_benchmark_nmc() { + local "$@" + set -e + sudo limit_ranks_to_numa_node ${numa_rank} + make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 \ + aspectc=1 aspectc_timing=1 dfatool_timing=0 + bin/host_code -w 0 -e 50 -i ${input_size} +} + +export -f run_benchmark_nmc + +for sdk in 2023.2.0 2024.1.0 2024.2.0 2025.1.0; do + + fn=log/$(hostname)/ccmcc25-sdk${sdk} + + source /opt/upmem/upmem-${sdk}-Linux-x86_64/upmem_env.sh + + echo "prim-benchmarks VA $(git describe --all --long) $(git rev-parse HEAD) $(date -R)" >> ${fn}.txt + + parallel -j1 --eta --joblog ${fn}.joblog --resume --header : \ + run_benchmark_nmc nr_dpus={nr_dpus} nr_tasklets=16 input_size={input_size} numa_rank={numa_rank} \ + ::: numa_rank any \ + ::: nr_dpus 64 128 256 512 768 1024 1536 2048 2304 \ + ::: input_size 83886080 167772160 335544320 671088640 \ + >> ${fn}.txt + +done diff --git a/VA/dpu/task.c b/VA/dpu/task.c index 9622911..91b1176 100644 --- a/VA/dpu/task.c +++ b/VA/dpu/task.c @@ -10,7 +10,7 @@ #include <perfcounter.h> #include <barrier.h> -#include "../support/common.h" +#include "common.h" __host dpu_arguments_t DPU_INPUT_ARGUMENTS; diff --git a/VA/host/app.c b/VA/host/app.c index 1a2cdfd..27a64f2 100644 --- a/VA/host/app.c +++ b/VA/host/app.c @@ -7,15 +7,31 @@ #include <stdlib.h> #include <stdbool.h> #include <string.h> + +#if ASPECTC +extern "C" { +#endif + #include <dpu.h> #include <dpu_log.h> +#include <dpu_management.h> +#include <dpu_target_macros.h> + +#if ENERGY +#include <dpu_probe.h> +#endif + +#if ASPECTC +} +#endif + #include <unistd.h> #include <getopt.h> #include <assert.h> -#include "../support/common.h" -#include "../support/timer.h" -#include "../support/params.h" +#include "common.h" +#include "timer.h" +#include "params.h" // Define the DPU Binary path as DPU_BINARY here #ifndef DPU_BINARY @@ -25,13 +41,6 @@ #define XSTR(x) STR(x) #define STR(x) #x -#if ENERGY -#include <dpu_probe.h> -#endif - -#include <dpu_management.h> -#include <dpu_target_macros.h> - // Pointer declaration static T *A; static T *B; @@ -39,19 +48,19 @@ static T *C; static T *C2; // Create input arrays -static void read_input(T *A, T *B, unsigned int nr_elements) +static void read_input(T *A, T *B, unsigned long int nr_elements) { srand(0); - for (unsigned int i = 0; i < nr_elements; i++) { + for (unsigned long int i = 0; i < nr_elements; i++) { A[i] = (T) (rand()); B[i] = (T) (rand()); } } // Compute output in the host -static void vector_addition_host(T *C, T *A, T *B, unsigned int nr_elements) +static void vector_addition_host(T *C, T *A, T *B, unsigned long int nr_elements) { - for (unsigned int i = 0; i < nr_elements; i++) { + for (unsigned long int i = 0; i < nr_elements; i++) { C[i] = A[i] + B[i]; } } @@ -79,31 +88,37 @@ int main(int argc, char **argv) // Allocate DPUs and load binary #if !WITH_ALLOC_OVERHEAD DPU_ASSERT(dpu_alloc(NR_DPUS, NULL, &dpu_set)); +#if DFATOOL_TIMING timer.time[0] = 0; // alloc #endif +#endif #if !WITH_LOAD_OVERHEAD DPU_ASSERT(dpu_load(dpu_set, DPU_BINARY, NULL)); DPU_ASSERT(dpu_get_nr_dpus(dpu_set, &nr_of_dpus)); DPU_ASSERT(dpu_get_nr_ranks(dpu_set, &nr_of_ranks)); assert(nr_of_dpus == NR_DPUS); +#if DFATOOL_TIMING timer.time[1] = 0; // load #endif +#endif #if !WITH_FREE_OVERHEAD +#if DFATOOL_TIMING timer.time[6] = 0; // free #endif +#endif unsigned int i = 0; - const unsigned int input_size = + const unsigned long int input_size = p.exp == 0 ? p.input_size * NR_DPUS : p.input_size; - const unsigned int input_size_8bytes = ((input_size * sizeof(T)) % 8) != 0 ? roundup(input_size, 8) : input_size; // Input size per DPU (max.), 8-byte aligned - const unsigned int input_size_dpu = divceil(input_size, NR_DPUS); // Input size per DPU (max.) - const unsigned int input_size_dpu_8bytes = ((input_size_dpu * sizeof(T)) % 8) != 0 ? roundup(input_size_dpu, 8) : input_size_dpu; // Input size per DPU (max.), 8-byte aligned + const unsigned long int input_size_8bytes = ((input_size * sizeof(T)) % 8) != 0 ? roundup(input_size, 8) : input_size; // Input size per DPU (max.), 8-byte aligned + const unsigned long int input_size_dpu = divceil(input_size, NR_DPUS); // Input size per DPU (max.) + const unsigned long int input_size_dpu_8bytes = ((input_size_dpu * sizeof(T)) % 8) != 0 ? roundup(input_size_dpu, 8) : input_size_dpu; // Input size per DPU (max.), 8-byte aligned // Input/output allocation - A = malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); - B = malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); - C = malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); - C2 = malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); + A = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); + B = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); + C = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); + C2 = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T)); T *bufferA = A; T *bufferB = B; T *bufferC = C2; @@ -192,14 +207,14 @@ int main(int argc, char **argv) input_size_dpu_8bytes * sizeof(T); input_arguments[i].transfer_size = input_size_dpu_8bytes * sizeof(T); - input_arguments[i].kernel = kernel; + input_arguments[i].kernel = (enum kernels)kernel; } input_arguments[nr_of_dpus - 1].size = (input_size_8bytes - input_size_dpu_8bytes * (NR_DPUS - 1)) * sizeof(T); input_arguments[nr_of_dpus - 1].transfer_size = input_size_dpu_8bytes * sizeof(T); - input_arguments[nr_of_dpus - 1].kernel = kernel; + input_arguments[nr_of_dpus - 1].kernel = (enum kernels)kernel; // Copy input arrays i = 0; @@ -306,22 +321,22 @@ int main(int argc, char **argv) printf("[" ANSI_COLOR_GREEN "OK" ANSI_COLOR_RESET "] Outputs are equal\n"); if (rep >= p.n_warmup) { - printf - ("[::] VA-UPMEM | n_dpus=%d n_ranks=%d n_tasklets=%d e_type=%s block_size_B=%d n_elements=%d n_elements_per_dpu=%d", + dfatool_printf + ("[::] VA-UPMEM | n_dpus=%d n_ranks=%d n_tasklets=%d e_type=%s block_size_B=%d n_elements=%lu n_elements_per_dpu=%lu", nr_of_dpus, nr_of_ranks, NR_TASKLETS, XSTR(T), BLOCK_SIZE, input_size, input_size / NR_DPUS); - printf + dfatool_printf (" b_with_alloc_overhead=%d b_with_load_overhead=%d b_with_free_overhead=%d numa_node_rank=%d ", WITH_ALLOC_OVERHEAD, WITH_LOAD_OVERHEAD, WITH_FREE_OVERHEAD, numa_node_rank); - printf + dfatool_printf ("| latency_alloc_us=%f latency_load_us=%f latency_cpu_us=%f latency_write_us=%f latency_kernel_us=%f latency_read_us=%f latency_free_us=%f", timer.time[0], timer.time[1], timer.time[2], timer.time[3], timer.time[4], timer.time[5], timer.time[6]); - printf + dfatool_printf (" throughput_cpu_MBps=%f throughput_upmem_kernel_MBps=%f throughput_upmem_total_MBps=%f", input_size * 3 * sizeof(T) / timer.time[2], input_size * 3 * sizeof(T) / @@ -330,7 +345,7 @@ int main(int argc, char **argv) (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5] + timer.time[6])); - printf + dfatool_printf (" throughput_upmem_wxr_MBps=%f throughput_upmem_lwxr_MBps=%f throughput_upmem_alwxr_MBps=%f", input_size * 3 * sizeof(T) / (timer.time[3] + timer.time[4] + @@ -342,7 +357,7 @@ int main(int argc, char **argv) (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5])); - printf + dfatool_printf (" throughput_cpu_MOpps=%f throughput_upmem_kernel_MOpps=%f throughput_upmem_total_MOpps=%f", input_size / timer.time[2], input_size / (timer.time[4]), @@ -352,7 +367,7 @@ int main(int argc, char **argv) timer.time[4] + timer.time[5] + timer.time[6])); - printf + dfatool_printf (" throughput_upmem_wxr_MOpps=%f throughput_upmem_lwxr_MOpps=%f throughput_upmem_alwxr_MOpps=%f\n", input_size / (timer.time[3] + timer.time[4] + diff --git a/VA/support/common.h b/VA/include/common.h index cee09e2..6ce6e23 100755..100644 --- a/VA/support/common.h +++ b/VA/include/common.h @@ -1,14 +1,20 @@ #ifndef _COMMON_H_ #define _COMMON_H_ +enum kernels { + kernel1 = 0, + nr_kernels = 1, +}; + // Structures used by both the host and the dpu to communicate information typedef struct { + /* + * Size per DPU cannot exceed 32 bit, as each DPU only has 64 MiB of memory + * (i.e., only needs 26 bit for addressing). + */ uint32_t size; uint32_t transfer_size; - enum kernels { - kernel1 = 0, - nr_kernels = 1, - } kernel; + enum kernels kernel; } dpu_arguments_t; // Transfer size between MRAM and WRAM diff --git a/VA/include/dfatool_host.ah b/VA/include/dfatool_host.ah new file mode 100644 index 0000000..e74f466 --- /dev/null +++ b/VA/include/dfatool_host.ah @@ -0,0 +1,29 @@ +#pragma once + +#include <sys/time.h> +#include "dfatool_host_dpu.ah" + +aspect DfatoolHostTiming : public DfatoolHostDPUTiming { + unsigned long n_rows; + unsigned int element_size; + + virtual int getKernel() { return 1; } + + DfatoolHostTiming() { + element_size = sizeof(T); + } + + advice call("% input_params(...)") : after() { + Params* p = tjp->result(); + n_rows = p->input_size; + printf("[>>] VA | n_dpus=%u n_rows=%lu\n", NR_DPUS, n_rows); + } + + advice call("% vector_addition_host(...)") : after() { + printf("[--] VA | n_dpus=%u n_rows=%lu\n", n_dpus, n_rows); + } + + advice execution("% main(...)") : after() { + printf("[<<] VA | n_dpus=%u n_rows=%lu\n", NR_DPUS, n_rows); + } +}; diff --git a/VA/support/params.h b/VA/include/params.h index 47c10ef..31327d8 100644 --- a/VA/support/params.h +++ b/VA/include/params.h @@ -4,7 +4,7 @@ #include "common.h" typedef struct Params { - unsigned int input_size; + unsigned long int input_size; int n_warmup; int n_reps; int exp; @@ -19,7 +19,7 @@ static void usage() "\n -h help" "\n -w <W> # of untimed warmup iterations (default=1)" "\n -e <E> # of timed repetition iterations (default=3)" - "\n -x <X> Weak (0) or strong (1) scaling (default=0)" + "\n -x <X> Weak (0) or strong (1) scaling (default=1)" "\n" "\nBenchmark-specific options:" "\n -i <I> input size (default=2621440 elements)" "\n"); @@ -31,7 +31,7 @@ struct Params input_params(int argc, char **argv) p.input_size = 2621440; p.n_warmup = 1; p.n_reps = 3; - p.exp = 0; + p.exp = 1; int opt; while ((opt = getopt(argc, argv, "hi:w:e:x:")) >= 0) { @@ -41,7 +41,7 @@ struct Params input_params(int argc, char **argv) exit(0); break; case 'i': - p.input_size = atoi(optarg); + p.input_size = atol(optarg); break; case 'w': p.n_warmup = atoi(optarg); diff --git a/VA/include/timer.h b/VA/include/timer.h new file mode 100644 index 0000000..7b80823 --- /dev/null +++ b/VA/include/timer.h @@ -0,0 +1,5 @@ +#pragma once + +#define N_TIMERS 7 +#include "../../include/timer_base.h" +#undef N_TIMERS diff --git a/VA/support/timer.h b/VA/support/timer.h deleted file mode 100755 index df68334..0000000 --- a/VA/support/timer.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2016 University of Cordoba and University of Illinois - * All rights reserved. - * - * Developed by: IMPACT Research Group - * University of Cordoba and University of Illinois - * http://impact.crhc.illinois.edu/ - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * with the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * > Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimers. - * > Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimers in the - * documentation and/or other materials provided with the distribution. - * > Neither the names of IMPACT Research Group, University of Cordoba, - * University of Illinois nor the names of its contributors may be used - * to endorse or promote products derived from this Software without - * specific prior written permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH - * THE SOFTWARE. - * - */ - -#include <sys/time.h> - -typedef struct Timer { - - struct timeval startTime[7]; - struct timeval stopTime[7]; - double time[7]; - -} Timer; - -void start(Timer *timer, int i, int rep) -{ - if (rep == 0) { - timer->time[i] = 0.0; - } - gettimeofday(&timer->startTime[i], NULL); -} - -void stop(Timer *timer, int i) -{ - gettimeofday(&timer->stopTime[i], NULL); - timer->time[i] += - (timer->stopTime[i].tv_sec - - timer->startTime[i].tv_sec) * 1000000.0 + - (timer->stopTime[i].tv_usec - timer->startTime[i].tv_usec); -} - -void print(Timer *timer, int i, int REP) -{ - printf("Time (ms): %f\t", timer->time[i] / (1000 * REP)); -} - -void printall(Timer *timer, int maxt) -{ - for (int i = 0; i <= maxt; i++) { - printf(" timer%d_us=%f", i, timer->time[i]); - } - printf("\n"); -} |