From 29accf68f9f8914e83a271f58ceee088892503a1 Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Tue, 27 May 2025 11:45:23 +0200 Subject: SCAN-SSA: add dfatool support --- SCAN-SSA/Makefile | 29 +++++++++++++--- SCAN-SSA/dpu/task.c | 2 +- SCAN-SSA/host/app.c | 47 ++++++++++++++++---------- SCAN-SSA/host/omp.c | 6 ++-- SCAN-SSA/include/common.h | 71 ++++++++++++++++++++++++++++++++++++++++ SCAN-SSA/include/dfatool_host.ah | 29 ++++++++++++++++ SCAN-SSA/include/params.h | 56 +++++++++++++++++++++++++++++++ SCAN-SSA/include/timer.h | 5 +++ SCAN-SSA/support/common.h | 69 -------------------------------------- SCAN-SSA/support/params.h | 56 ------------------------------- SCAN-SSA/support/timer.h | 64 ------------------------------------ 11 files changed, 218 insertions(+), 216 deletions(-) create mode 100644 SCAN-SSA/include/common.h create mode 100644 SCAN-SSA/include/dfatool_host.ah create mode 100644 SCAN-SSA/include/params.h create mode 100644 SCAN-SSA/include/timer.h delete mode 100644 SCAN-SSA/support/common.h delete mode 100644 SCAN-SSA/support/params.h delete mode 100644 SCAN-SSA/support/timer.h diff --git a/SCAN-SSA/Makefile b/SCAN-SSA/Makefile index 319f2da..c741138 100644 --- a/SCAN-SSA/Makefile +++ b/SCAN-SSA/Makefile @@ -9,14 +9,31 @@ HOST_SOURCES := $(wildcard host/app.c) OMP_SOURCES := $(wildcard host/omp.c) DPU_SOURCES := $(wildcard dpu/*.c) -COMMON_INCLUDES := support -COMMON_FLAGS = -Wall -Wextra -O2 -I${COMMON_INCLUDES} -DNR_DPUS=${NR_DPUS} -DNR_TASKLETS=${NR_TASKLETS} -DBL=${BL} -D${TYPE} -DUNROLL=${UNROLL} -HOST_FLAGS = ${COMMON_FLAGS} -std=c11 `dpu-pkg-config --cflags --libs dpu` +aspectc ?= 0 +aspectc_timing ?= 0 +dfatool_timing ?= 1 + +HOST_CC := ${CC} + +COMMON_FLAGS = -Wall -Wextra -O2 -Iinclude -DNR_DPUS=${NR_DPUS} -DNR_TASKLETS=${NR_TASKLETS} -DBL=${BL} -D${TYPE} -DUNROLL=${UNROLL} +HOST_FLAGS = ${COMMON_FLAGS} `dpu-pkg-config --cflags --libs dpu` -DDFATOOL_TIMING=${dfatool_timing} -DASPECTC=${aspectc} DPU_FLAGS = ${COMMON_FLAGS} +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 @@ -29,7 +46,9 @@ bin/dpu_code: ${DPU_SOURCES} bin ${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} ${DPU_SOURCES} -o $@ bin/host_code: ${HOST_SOURCES} bin - ${QUIET}${CC} ${HOST_FLAGS} ${HOST_SOURCES} -o $@ + ${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/omp_code: ${OMP_SOURCES} ${QUIET}${CC} ${HOST_FLAGS} -fopenmp ${OMP_SOURCES} -o $@ diff --git a/SCAN-SSA/dpu/task.c b/SCAN-SSA/dpu/task.c index 15411a4..76f393d 100644 --- a/SCAN-SSA/dpu/task.c +++ b/SCAN-SSA/dpu/task.c @@ -11,7 +11,7 @@ #include #include -#include "../support/common.h" +#include "common.h" __host dpu_arguments_t DPU_INPUT_ARGUMENTS; __host dpu_results_t DPU_RESULTS[NR_TASKLETS]; diff --git a/SCAN-SSA/host/app.c b/SCAN-SSA/host/app.c index 25471fe..8675f17 100644 --- a/SCAN-SSA/host/app.c +++ b/SCAN-SSA/host/app.c @@ -7,15 +7,29 @@ #include #include #include + +#if ASPECTC +extern "C" { +#endif + #include #include + +#if ENERGY +#include +#endif + +#if ASPECTC +} +#endif + #include #include #include -#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,15 +39,13 @@ #define XSTR(x) STR(x) #define STR(x) #x -#if ENERGY -#include -#endif - // Pointer declaration static T* A; static T* C; static T* C2; +unsigned int kernel; + // Create input arrays static void read_input(T* A, unsigned int nr_elements, unsigned int nr_elements_round) { srand(0); @@ -95,9 +107,9 @@ int main(int argc, char **argv) { (input_size_dpu_ % (NR_TASKLETS * REGS) != 0) ? roundup(input_size_dpu_, (NR_TASKLETS * REGS)) : input_size_dpu_; // Input size per DPU (max.), 8-byte aligned // Input/output allocation - A = malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); - C = malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); - C2 = malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); + A = (T*) malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); + C = (T*) malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); + C2 = (T*) malloc(input_size_dpu_round * nr_of_dpus * sizeof(T)); T *bufferA = A; T *bufferC = C2; @@ -124,8 +136,8 @@ int main(int argc, char **argv) { start(&timer, 1, 0); // Input arguments const unsigned int input_size_dpu = input_size_dpu_round; - unsigned int kernel = 0; - dpu_arguments_t input_arguments = {input_size_dpu * sizeof(T), kernel, 0}; + kernel = 0; + dpu_arguments_t input_arguments = {(uint32_t)(input_size_dpu * sizeof(T)), (enum kernels)kernel, 0}; // Copy input arrays i = 0; DPU_FOREACH(dpu_set, dpu, i) { @@ -170,7 +182,7 @@ int main(int argc, char **argv) { //printf("Retrieve results\n"); dpu_results_t results[nr_of_dpus]; - T* results_scan = malloc(nr_of_dpus * sizeof(T)); + T* results_scan = (T*) malloc(nr_of_dpus * sizeof(T)); i = 0; accum = 0; @@ -207,7 +219,7 @@ int main(int argc, char **argv) { dpu_arguments_t input_arguments_2[NR_DPUS]; for(i=0; i #include -#include "../support/common.h" -#include "../support/timer.h" -#include "../support/params.h" +#include "common.h" +#include "timer.h" +#include "params.h" #define XSTR(x) STR(x) #define STR(x) #x diff --git a/SCAN-SSA/include/common.h b/SCAN-SSA/include/common.h new file mode 100644 index 0000000..f395cc5 --- /dev/null +++ b/SCAN-SSA/include/common.h @@ -0,0 +1,71 @@ +#ifndef _COMMON_H_ +#define _COMMON_H_ + +// Transfer size between MRAM and WRAM +#ifdef BL +#define BLOCK_SIZE_LOG2 BL +#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2) +#else +#define BLOCK_SIZE_LOG2 8 +#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2) +#define BL BLOCK_SIZE_LOG2 +#endif + +// Data type +#ifdef UINT32 +#define T uint32_t +#define DIV 2 // Shift right to divide by sizeof(T) +#elif UINT64 +#define T uint64_t +#define DIV 3 // Shift right to divide by sizeof(T) +#elif INT32 +#define T int32_t +#define DIV 2 // Shift right to divide by sizeof(T) +#elif INT64 +#define T int64_t +#define DIV 3 // Shift right to divide by sizeof(T) +#elif FLOAT +#define T float +#define DIV 2 // Shift right to divide by sizeof(T) +#elif DOUBLE +#define T double +#define DIV 3 // Shift right to divide by sizeof(T) +#elif CHAR +#define T char +#define DIV 0 // Shift right to divide by sizeof(T) +#elif SHORT +#define T short +#define DIV 1 // Shift right to divide by sizeof(T) +#endif + +#define REGS (BLOCK_SIZE >> DIV) + +enum kernels { + kernel1 = 0, + kernel2 = 1, + nr_kernels = 2, +}; + +// Structures used by both the host and the dpu to communicate information +typedef struct { + uint32_t size; + enum kernels kernel; + T t_count; +} dpu_arguments_t; + +typedef struct { + T t_count; +} dpu_results_t; + +#ifndef ENERGY +#define ENERGY 0 +#endif +#define PRINT 0 + +#define ANSI_COLOR_RED "\x1b[31m" +#define ANSI_COLOR_GREEN "\x1b[32m" +#define ANSI_COLOR_RESET "\x1b[0m" + +#define divceil(n, m) (((n)-1) / (m) + 1) +#define roundup(n, m) ((n / m) * m + m) +#endif diff --git a/SCAN-SSA/include/dfatool_host.ah b/SCAN-SSA/include/dfatool_host.ah new file mode 100644 index 0000000..6d2fad5 --- /dev/null +++ b/SCAN-SSA/include/dfatool_host.ah @@ -0,0 +1,29 @@ +#pragma once + +#include +#include "dfatool_host_dpu.ah" + +aspect DfatoolHostTiming : public DfatoolHostDPUTiming { + unsigned long n_elements; + unsigned int element_size; + + virtual int getKernel() { return 1; } + + DfatoolHostTiming() { + element_size = sizeof(T); + } + + advice call("% input_params(...)") : after() { + Params* p = tjp->result(); + n_elements = p->input_size; + printf("[>>] SCAN-RSS | n_dpus=%u n_elements=%lu\n", NR_DPUS, n_elements); + } + + advice call("% scan_host(...)") : after() { + printf("[--] SCAN-RSS | n_dpus=%u n_elements=%lu\n", n_dpus, n_elements); + } + + advice execution("% main(...)") : after() { + printf("[<<] SCAN-RSS | n_dpus=%u n_elements=%lu\n", NR_DPUS, n_elements); + } +}; diff --git a/SCAN-SSA/include/params.h b/SCAN-SSA/include/params.h new file mode 100644 index 0000000..a96b33f --- /dev/null +++ b/SCAN-SSA/include/params.h @@ -0,0 +1,56 @@ +#ifndef _PARAMS_H_ +#define _PARAMS_H_ + +#include "common.h" + +typedef struct Params { + unsigned int input_size; + int n_warmup; + int n_reps; + int exp; +}Params; + +static void usage() { + fprintf(stderr, + "\nUsage: ./program [options]" + "\n" + "\nGeneral options:" + "\n -h help" + "\n -w # of untimed warmup iterations (default=1)" + "\n -e # of timed repetition iterations (default=3)" + "\n -x Weak (0) or strong (1) scaling (default=1)" + "\n" + "\nBenchmark-specific options:" + "\n -i input size (default=3932160 elements)" + "\n"); +} + +struct Params input_params(int argc, char **argv) { + struct Params p; + p.input_size = 3932160; + p.n_warmup = 1; + p.n_reps = 3; + p.exp = 1; + + int opt; + while((opt = getopt(argc, argv, "hi:w:e:x:")) >= 0) { + switch(opt) { + case 'h': + usage(); + exit(0); + break; + case 'i': p.input_size = atoi(optarg); break; + case 'w': p.n_warmup = atoi(optarg); break; + case 'e': p.n_reps = atoi(optarg); break; + case 'x': p.exp = atoi(optarg); break; + default: + fprintf(stderr, "\nUnrecognized option!\n"); + usage(); + exit(0); + } + } + assert(NR_DPUS > 0 && "Invalid # of dpus!"); + + return p; +} +#endif diff --git a/SCAN-SSA/include/timer.h b/SCAN-SSA/include/timer.h new file mode 100644 index 0000000..5b8eba3 --- /dev/null +++ b/SCAN-SSA/include/timer.h @@ -0,0 +1,5 @@ +#pragma once + +#define N_TIMERS 7 +#include "../../include/timer_base.h" +#undef N_TIMERS diff --git a/SCAN-SSA/support/common.h b/SCAN-SSA/support/common.h deleted file mode 100644 index 0bdf7ca..0000000 --- a/SCAN-SSA/support/common.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef _COMMON_H_ -#define _COMMON_H_ - -// Transfer size between MRAM and WRAM -#ifdef BL -#define BLOCK_SIZE_LOG2 BL -#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2) -#else -#define BLOCK_SIZE_LOG2 8 -#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2) -#define BL BLOCK_SIZE_LOG2 -#endif - -// Data type -#ifdef UINT32 -#define T uint32_t -#define DIV 2 // Shift right to divide by sizeof(T) -#elif UINT64 -#define T uint64_t -#define DIV 3 // Shift right to divide by sizeof(T) -#elif INT32 -#define T int32_t -#define DIV 2 // Shift right to divide by sizeof(T) -#elif INT64 -#define T int64_t -#define DIV 3 // Shift right to divide by sizeof(T) -#elif FLOAT -#define T float -#define DIV 2 // Shift right to divide by sizeof(T) -#elif DOUBLE -#define T double -#define DIV 3 // Shift right to divide by sizeof(T) -#elif CHAR -#define T char -#define DIV 0 // Shift right to divide by sizeof(T) -#elif SHORT -#define T short -#define DIV 1 // Shift right to divide by sizeof(T) -#endif - -#define REGS (BLOCK_SIZE >> DIV) - -// Structures used by both the host and the dpu to communicate information -typedef struct { - uint32_t size; - enum kernels { - kernel1 = 0, - kernel2 = 1, - nr_kernels = 2, - } kernel; - T t_count; -} dpu_arguments_t; - -typedef struct { - T t_count; -} dpu_results_t; - -#ifndef ENERGY -#define ENERGY 0 -#endif -#define PRINT 0 - -#define ANSI_COLOR_RED "\x1b[31m" -#define ANSI_COLOR_GREEN "\x1b[32m" -#define ANSI_COLOR_RESET "\x1b[0m" - -#define divceil(n, m) (((n)-1) / (m) + 1) -#define roundup(n, m) ((n / m) * m + m) -#endif diff --git a/SCAN-SSA/support/params.h b/SCAN-SSA/support/params.h deleted file mode 100644 index 9f6aacc..0000000 --- a/SCAN-SSA/support/params.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _PARAMS_H_ -#define _PARAMS_H_ - -#include "common.h" - -typedef struct Params { - unsigned int input_size; - int n_warmup; - int n_reps; - int exp; -}Params; - -static void usage() { - fprintf(stderr, - "\nUsage: ./program [options]" - "\n" - "\nGeneral options:" - "\n -h help" - "\n -w # of untimed warmup iterations (default=1)" - "\n -e # of timed repetition iterations (default=3)" - "\n -x Weak (0) or strong (1) scaling (default=0)" - "\n" - "\nBenchmark-specific options:" - "\n -i input size (default=3932160 elements)" - "\n"); -} - -struct Params input_params(int argc, char **argv) { - struct Params p; - p.input_size = 3932160; - p.n_warmup = 1; - p.n_reps = 3; - p.exp = 0; - - int opt; - while((opt = getopt(argc, argv, "hi:w:e:x:")) >= 0) { - switch(opt) { - case 'h': - usage(); - exit(0); - break; - case 'i': p.input_size = atoi(optarg); break; - case 'w': p.n_warmup = atoi(optarg); break; - case 'e': p.n_reps = atoi(optarg); break; - case 'x': p.exp = atoi(optarg); break; - default: - fprintf(stderr, "\nUnrecognized option!\n"); - usage(); - exit(0); - } - } - assert(NR_DPUS > 0 && "Invalid # of dpus!"); - - return p; -} -#endif diff --git a/SCAN-SSA/support/timer.h b/SCAN-SSA/support/timer.h deleted file mode 100644 index 5411254..0000000 --- a/SCAN-SSA/support/timer.h +++ /dev/null @@ -1,64 +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 - -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 printall(Timer *timer, int maxt) { - for (int i = 0; i <= maxt; i++) { - printf(" timer%d_us=%f", i, timer->time[i]); - } - printf("\n"); -} -- cgit v1.2.3