summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RED/host/app.c53
-rw-r--r--[-rwxr-xr-x]RED/include/common.h18
-rw-r--r--RED/include/dfatool_host.ah29
-rw-r--r--RED/include/params.h4
-rw-r--r--[-rwxr-xr-x]RED/include/timer.h69
5 files changed, 76 insertions, 97 deletions
diff --git a/RED/host/app.c b/RED/host/app.c
index 885ddb8..cb7a6ac 100644
--- a/RED/host/app.c
+++ b/RED/host/app.c
@@ -7,8 +7,24 @@
#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>
@@ -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;
@@ -70,17 +79,17 @@ int main(int argc, char **argv) {
// Allocate DPUs and load binary
#if !WITH_ALLOC_OVERHEAD
DPU_ASSERT(dpu_alloc(NR_DPUS, NULL, &dpu_set));
- timer.time[0] = 0; // alloc
+ zero(&timer, 0); // alloc
#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);
- timer.time[1] = 0; // load
+ zero(&timer, 1); // load
#endif
#if !WITH_FREE_OVERHEAD
- timer.time[6] = 0; // free
+ zero(&timer, 6); // free
#endif
#if ENERGY
@@ -102,7 +111,7 @@ int main(int argc, char **argv) {
((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));
+ A = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T));
T *bufferA = A;
T count = 0;
T count_host = 0;
@@ -168,12 +177,12 @@ int main(int argc, char **argv) {
// Input arguments
unsigned int kernel = 0;
dpu_arguments_t input_arguments[NR_DPUS];
- for(int j=0; j<NR_DPUS-1; i++) {
+ for(int j=0; j<NR_DPUS-1; j++) {
input_arguments[j].size=input_size_dpu_8bytes * sizeof(T);
- input_arguments[j].kernel=kernel;
+ input_arguments[j].kernel=(enum kernels)kernel;
}
input_arguments[NR_DPUS-1].size=(input_size_8bytes - input_size_dpu_8bytes * (NR_DPUS-1)) * sizeof(T);
- input_arguments[NR_DPUS-1].kernel=kernel;
+ input_arguments[NR_DPUS-1].kernel=(enum kernels)kernel;
// Copy input arrays
i = 0;
DPU_FOREACH(dpu_set, dpu, i) {
@@ -218,7 +227,7 @@ int main(int argc, char **argv) {
//printf("Retrieve results\n");
dpu_results_t results[NR_DPUS];
- T* results_count = malloc(NR_DPUS * sizeof(T));
+ T* results_count = (T*)malloc(NR_DPUS * sizeof(T));
if(rep >= p.n_warmup)
start(&timer, 5, 0);
i = 0;
@@ -302,11 +311,11 @@ int main(int argc, char **argv) {
if (status) {
printf("[" ANSI_COLOR_GREEN "OK" ANSI_COLOR_RESET "] Outputs are equal\n");
if (rep >= p.n_warmup) {
- printf("[::] RED UPMEM | n_dpus=%d n_ranks=%d n_tasklets=%d e_type=%s block_size_B=%d n_elements=%d",
+ dfatool_printf("[::] RED UPMEM | n_dpus=%d n_ranks=%d n_tasklets=%d e_type=%s block_size_B=%d n_elements=%d",
NR_DPUS, nr_of_ranks, NR_TASKLETS, XSTR(T), BLOCK_SIZE, input_size);
- printf(" b_with_alloc_overhead=%d b_with_load_overhead=%d b_with_free_overhead=%d numa_node_rank=%d ",
+ 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("| 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",
+ 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],
@@ -314,19 +323,19 @@ int main(int argc, char **argv) {
timer.time[4],
timer.time[5],
timer.time[6]);
- printf(" throughput_cpu_MBps=%f throughput_upmem_kernel_MBps=%f throughput_upmem_total_MBps=%f",
+ dfatool_printf(" throughput_cpu_MBps=%f throughput_upmem_kernel_MBps=%f throughput_upmem_total_MBps=%f",
input_size * sizeof(T) / timer.time[2],
input_size * sizeof(T) / (timer.time[4]),
input_size * sizeof(T) / (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5] + timer.time[6]));
- printf(" throughput_upmem_wxr_MBps=%f throughput_upmem_lwxr_MBps=%f throughput_upmem_alwxr_MBps=%f",
+ dfatool_printf(" throughput_upmem_wxr_MBps=%f throughput_upmem_lwxr_MBps=%f throughput_upmem_alwxr_MBps=%f",
input_size * sizeof(T) / (timer.time[3] + timer.time[4] + timer.time[5]),
input_size * sizeof(T) / (timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5]),
input_size * sizeof(T) / (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5]));
- printf(" throughput_cpu_MOpps=%f throughput_upmem_kernel_MOpps=%f throughput_upmem_total_MOpps=%f",
+ 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]),
input_size / (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5] + timer.time[6]));
- printf(" throughput_upmem_wxr_MOpps=%f throughput_upmem_lwxr_MOpps=%f throughput_upmem_alwxr_MOpps=%f\n",
+ 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] + timer.time[5]),
input_size / (timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5]),
input_size / (timer.time[0] + timer.time[1] + timer.time[3] + timer.time[4] + timer.time[5]));
diff --git a/RED/include/common.h b/RED/include/common.h
index 121bf31..6cc1ae2 100755..100644
--- a/RED/include/common.h
+++ b/RED/include/common.h
@@ -38,19 +38,21 @@
#define DIV 1 // Shift right to divide by sizeof(T)
#endif
+enum kernels {
+ kernel1 = 0,
+ nr_kernels = 1,
+};
+
// Structures used by both the host and the dpu to communicate information
typedef struct {
- uint32_t size;
- enum kernels {
- kernel1 = 0,
- nr_kernels = 1,
- } kernel;
- T t_count;
+ uint32_t size;
+ enum kernels kernel;
+ T t_count;
} dpu_arguments_t;
typedef struct {
- uint64_t cycles;
- T t_count;
+ uint64_t cycles;
+ T t_count;
} dpu_results_t;
#ifndef PERF
diff --git a/RED/include/dfatool_host.ah b/RED/include/dfatool_host.ah
new file mode 100644
index 0000000..88dfbd8
--- /dev/null
+++ b/RED/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("[>>] RED | n_dpus=%u n_elements=%lu\n", NR_DPUS, n_elements);
+ }
+
+ advice call("% reduction_host(...)") : after() {
+ printf("[--] RED | n_dpus=%u n_elements=%lu\n", n_dpus, n_elements);
+ }
+
+ advice execution("% main(...)") : after() {
+ printf("[<<] RED | n_dpus=%u n_elements=%lu\n", NR_DPUS, n_elements);
+ }
+};
diff --git a/RED/include/params.h b/RED/include/params.h
index 97bc50a..ee90908 100644
--- a/RED/include/params.h
+++ b/RED/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=6553600 elements)"
@@ -30,7 +30,7 @@ struct Params input_params(int argc, char **argv) {
p.input_size = 6553600;
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/RED/include/timer.h b/RED/include/timer.h
index 4d597b9..5b8eba3 100755..100644
--- a/RED/include/timer.h
+++ b/RED/include/timer.h
@@ -1,66 +1,5 @@
-/*
- * 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.
- *
- */
+#pragma once
-#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");
-}
+#define N_TIMERS 7
+#include "../../include/timer_base.h"
+#undef N_TIMERS
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-25 10:20:32 +0000