summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SCAN-SSA/Makefile29
-rw-r--r--SCAN-SSA/dpu/task.c2
-rw-r--r--SCAN-SSA/host/app.c47
-rw-r--r--SCAN-SSA/host/omp.c6
-rw-r--r--SCAN-SSA/include/common.h (renamed from SCAN-SSA/support/common.h)16
-rw-r--r--SCAN-SSA/include/dfatool_host.ah29
-rw-r--r--SCAN-SSA/include/params.h (renamed from SCAN-SSA/support/params.h)4
-rw-r--r--SCAN-SSA/include/timer.h5
-rw-r--r--SCAN-SSA/support/timer.h64
9 files changed, 102 insertions, 100 deletions
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 <handshake.h>
#include <barrier.h>
-#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 <stdlib.h>
#include <stdbool.h>
#include <string.h>
+
+#if ASPECTC
+extern "C" {
+#endif
+
#include <dpu.h>
#include <dpu_log.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,15 +39,13 @@
#define XSTR(x) STR(x)
#define STR(x) #x
-#if ENERGY
-#include <dpu_probe.h>
-#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<nr_of_dpus; i++) {
input_arguments_2[i].size=input_size_dpu * sizeof(T);
- input_arguments_2[i].kernel=kernel;
+ input_arguments_2[i].kernel=(enum kernels)kernel;
input_arguments_2[i].t_count=results_scan[i];
}
DPU_FOREACH(dpu_set, dpu, i) {
@@ -272,17 +284,16 @@ int main(int argc, char **argv) {
}
if (status) {
printf("[" ANSI_COLOR_GREEN "OK" ANSI_COLOR_RESET "] Outputs are equal\n");
- printf("[::] SCAN-SSA NMC | n_dpus=%d n_tasklets=%d e_type=%s block_size_B=%d b_unroll=%d n_elements=%u "
- "| throughput_cpu_MBps=%f throughput_pim_MBps=%f throughput_MBps=%f\n",
+ dfatool_printf("[::] SCAN-SSA NMC | n_dpus=%d n_tasklets=%d e_type=%s block_size_B=%d b_unroll=%d n_elements=%u "
+ "| throughput_cpu_MBps=%f throughput_pim_MBps=%f throughput_MBps=%f",
nr_of_dpus, NR_TASKLETS, XSTR(T), BLOCK_SIZE, UNROLL, input_size,
input_size * sizeof(T) / timer.time[0],
input_size * sizeof(T) / (timer.time[2] + timer.time[3] + timer.time[4]),
input_size * sizeof(T) / (timer.time[1] + timer.time[2] + timer.time[3] + timer.time[4] + timer.time[5]));
- printf(" throughput_cpu_MOpps=%f throughput_pim_MOpps=%f throughput_MOpps=%f\n",
+ dfatool_printf(" throughput_cpu_MOpps=%f throughput_pim_MOpps=%f throughput_MOpps=%f\n",
input_size / timer.time[0],
input_size / (timer.time[2] + timer.time[3] + timer.time[4]),
input_size / (timer.time[1] + timer.time[2] + timer.time[3] + timer.time[4] + timer.time[5]));
- printall(&timer, 5);
} else {
printf("[" ANSI_COLOR_RED "ERROR" ANSI_COLOR_RESET "] Outputs differ!\n");
}
diff --git a/SCAN-SSA/host/omp.c b/SCAN-SSA/host/omp.c
index efa5360..3e722dc 100644
--- a/SCAN-SSA/host/omp.c
+++ b/SCAN-SSA/host/omp.c
@@ -12,9 +12,9 @@
#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 XSTR(x) STR(x)
#define STR(x) #x
diff --git a/SCAN-SSA/support/common.h b/SCAN-SSA/include/common.h
index 0bdf7ca..f395cc5 100644
--- a/SCAN-SSA/support/common.h
+++ b/SCAN-SSA/include/common.h
@@ -40,15 +40,17 @@
#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 {
- kernel1 = 0,
- kernel2 = 1,
- nr_kernels = 2,
- } kernel;
- T t_count;
+ uint32_t size;
+ enum kernels kernel;
+ T t_count;
} dpu_arguments_t;
typedef struct {
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 <sys/time.h>
+#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/support/params.h b/SCAN-SSA/include/params.h
index 9f6aacc..a96b33f 100644
--- a/SCAN-SSA/support/params.h
+++ b/SCAN-SSA/include/params.h
@@ -18,7 +18,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=3932160 elements)"
@@ -30,7 +30,7 @@ struct Params input_params(int argc, char **argv) {
p.input_size = 3932160;
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) {
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/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 <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 printall(Timer *timer, int maxt) {
- for (int i = 0; i <= maxt; i++) {
- printf(" timer%d_us=%f", i, timer->time[i]);
- }
- printf("\n");
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-30 04:33:51 +0000