summaryrefslogtreecommitdiff
path: root/TS
diff options
context:
space:
mode:
Diffstat (limited to 'TS')
-rw-r--r--TS/Makefile25
-rw-r--r--TS/host/app.c46
-rw-r--r--[-rwxr-xr-x]TS/include/common.h (renamed from TS/support/common.h)10
-rw-r--r--TS/include/dfatool_host.ah25
-rw-r--r--TS/include/params.h (renamed from TS/support/params.h)0
-rw-r--r--TS/include/timer.h5
-rwxr-xr-xTS/support/timer.h74
7 files changed, 88 insertions, 97 deletions
diff --git a/TS/Makefile b/TS/Makefile
index ac081bd..8eedaf9 100644
--- a/TS/Makefile
+++ b/TS/Makefile
@@ -5,14 +5,29 @@ WITH_ALLOC_OVERHEAD ?= 0
WITH_LOAD_OVERHEAD ?= 0
WITH_FREE_OVERHEAD ?= 0
-COMMON_INCLUDES := support
HOST_SOURCES := $(wildcard host/*.c)
DPU_SOURCES := $(wildcard dpu/*.c)
-COMMON_FLAGS := -Wall -Wextra -g -I${COMMON_INCLUDES} -DBL=${BL}
-HOST_FLAGS := ${COMMON_FLAGS} -std=c11 -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -lm
+aspectc ?= 0
+aspectc_timing ?= 0
+dfatool_timing ?= 1
+
+COMMON_FLAGS := -Wall -Wextra -g -Iinclude -DBL=${BL}
+HOST_FLAGS := ${COMMON_FLAGS} -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DDFATOOL_TIMING=${dfatool_timing} -DASPECTC=${aspectc} -lm
DPU_FLAGS := ${COMMON_FLAGS} -O2 -DNR_TASKLETS=${NR_TASKLETS}
+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
@@ -25,7 +40,9 @@ bin:
${QUIET}mkdir -p bin
bin/ts_host: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
- ${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
+ ${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/ts_dpu: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
diff --git a/TS/host/app.c b/TS/host/app.c
index a19232b..a75cfe9 100644
--- a/TS/host/app.c
+++ b/TS/host/app.c
@@ -7,8 +7,18 @@
#include <stdlib.h>
#include <stdbool.h>
#include <string.h>
+
+#if ASPECTC
+extern "C" {
+#endif
+
#include <dpu.h>
#include <dpu_log.h>
+
+#if ASPECTC
+}
+#endif
+
#include <unistd.h>
#include <getopt.h>
#include <assert.h>
@@ -86,26 +96,26 @@ static void compute_ts_statistics(unsigned int timeSeriesLength,
unsigned int ProfileLength,
unsigned int queryLength)
{
- double *ACumSum = malloc(sizeof(double) * timeSeriesLength);
+ double *ACumSum = (double*)malloc(sizeof(double) * timeSeriesLength);
ACumSum[0] = tSeries[0];
for (uint64_t i = 1; i < timeSeriesLength; i++)
ACumSum[i] = tSeries[i] + ACumSum[i - 1];
- double *ASqCumSum = malloc(sizeof(double) * timeSeriesLength);
+ double *ASqCumSum = (double*)malloc(sizeof(double) * timeSeriesLength);
ASqCumSum[0] = tSeries[0] * tSeries[0];
for (uint64_t i = 1; i < timeSeriesLength; i++)
ASqCumSum[i] = tSeries[i] * tSeries[i] + ASqCumSum[i - 1];
- double *ASum = malloc(sizeof(double) * ProfileLength);
+ double *ASum = (double*)malloc(sizeof(double) * ProfileLength);
ASum[0] = ACumSum[queryLength - 1];
for (uint64_t i = 0; i < timeSeriesLength - queryLength; i++)
ASum[i + 1] = ACumSum[queryLength + i] - ACumSum[i];
- double *ASumSq = malloc(sizeof(double) * ProfileLength);
+ double *ASumSq = (double*)malloc(sizeof(double) * ProfileLength);
ASumSq[0] = ASqCumSum[queryLength - 1];
for (uint64_t i = 0; i < timeSeriesLength - queryLength; i++)
ASumSq[i + 1] = ASqCumSum[queryLength + i] - ASqCumSum[i];
- double *AMean_tmp = malloc(sizeof(double) * ProfileLength);
+ double *AMean_tmp = (double*)malloc(sizeof(double) * ProfileLength);
for (uint64_t i = 0; i < ProfileLength; i++)
AMean_tmp[i] = ASum[i] / queryLength;
- double *ASigmaSq = malloc(sizeof(double) * ProfileLength);
+ double *ASigmaSq = (double*)malloc(sizeof(double) * ProfileLength);
for (uint64_t i = 0; i < ProfileLength; i++)
ASigmaSq[i] = ASumSq[i] / queryLength - AMean[i] * AMean[i];
for (uint64_t i = 0; i < ProfileLength; i++) {
@@ -136,18 +146,24 @@ 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
#if ENERGY
struct dpu_probe_t probe;
@@ -195,8 +211,8 @@ int main(int argc, char **argv)
unsigned int kernel = 0;
dpu_arguments_t input_arguments =
- { ts_size, query_length, query_mean, query_std, slice_per_dpu, 0,
- kernel
+ { (uint32_t)ts_size, query_length, query_mean, query_std, slice_per_dpu, 0,
+ (enum kernels) kernel
};
uint32_t mem_offset;
@@ -400,22 +416,22 @@ int main(int argc, char **argv)
printf("[" ANSI_COLOR_GREEN "OK" ANSI_COLOR_RESET
"] results are equal\n");
if (rep >= p.n_warmup) {
- printf
+ dfatool_printf
("[::] TS UPMEM | n_dpus=%d n_ranks=%d n_tasklets=%d e_type=%s block_size_B=%d n_elements=%lu",
NR_DPUS, nr_of_ranks, NR_TASKLETS,
XSTR(DTYPE), BLOCK_SIZE, ts_size);
- printf
+ dfatool_printf
(" b_with_alloc_overhead=%d b_with_load_overhead=%d b_with_free_overhead=%d ",
WITH_ALLOC_OVERHEAD, WITH_LOAD_OVERHEAD,
WITH_FREE_OVERHEAD);
- printf("| latency_alloc_us=%f latency_load_us=%f latency_write_us=%f latency_kernel_us=%f latency_read_us=%f latency_free_us=%f latency_cpu_us=%f ", timer.time[0], // alloc
+ dfatool_printf("| latency_alloc_us=%f latency_load_us=%f latency_write_us=%f latency_kernel_us=%f latency_read_us=%f latency_free_us=%f latency_cpu_us=%f ", timer.time[0], // alloc
timer.time[1], // load
timer.time[2], // write
timer.time[3], // kernel
timer.time[4], // read
timer.time[5], // free
timer.time[6]); // CPU
- printf
+ dfatool_printf
(" throughput_cpu_MBps=%f throughput_upmem_kernel_MBps=%f throughput_upmem_total_MBps=%f",
ts_size * sizeof(DTYPE) / timer.time[6],
ts_size * sizeof(DTYPE) / (timer.time[3]),
@@ -425,7 +441,7 @@ int main(int argc, char **argv)
timer.time[3] +
timer.time[4] +
timer.time[5]));
- printf
+ dfatool_printf
(" throughput_upmem_wxr_MBps=%f throughput_upmem_lwxr_MBps=%f throughput_upmem_alwxr_MBps=%f",
ts_size * sizeof(DTYPE) / (timer.time[2] +
timer.time[3] +
@@ -439,14 +455,14 @@ int main(int argc, char **argv)
timer.time[2] +
timer.time[3] +
timer.time[4]));
- printf
+ dfatool_printf
(" throughput_cpu_MOpps=%f throughput_upmem_kernel_MOpps=%f throughput_upmem_total_MOpps=%f",
ts_size / timer.time[6],
ts_size / (timer.time[3]),
ts_size / (timer.time[0] + timer.time[1] +
timer.time[2] + timer.time[3] +
timer.time[4] + timer.time[5]));
- printf
+ dfatool_printf
(" throughput_upmem_wxr_MOpps=%f throughput_upmem_lwxr_MOpps=%f throughput_upmem_alwxr_MOpps=%f\n",
ts_size / (timer.time[2] + timer.time[3] +
timer.time[4]),
diff --git a/TS/support/common.h b/TS/include/common.h
index 7585b90..6d37bdc 100755..100644
--- a/TS/support/common.h
+++ b/TS/include/common.h
@@ -14,6 +14,11 @@
#define DTYPE int32_t
#define DTYPE_MAX INT32_MAX
+enum kernels {
+ kernel1 = 0,
+ nr_kernels = 1,
+} kernel;
+
typedef struct {
uint32_t ts_length;
uint32_t query_length;
@@ -21,10 +26,7 @@ typedef struct {
DTYPE query_std;
uint32_t slice_per_dpu;
int32_t exclusion_zone;
- enum kernels {
- kernel1 = 0,
- nr_kernels = 1,
- } kernel;
+ enum kernels kernel;
} dpu_arguments_t;
typedef struct {
diff --git a/TS/include/dfatool_host.ah b/TS/include/dfatool_host.ah
new file mode 100644
index 0000000..2a45918
--- /dev/null
+++ b/TS/include/dfatool_host.ah
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <sys/time.h>
+#include "dfatool_host_dpu.ah"
+
+aspect DfatoolHostTiming : public DfatoolHostDPUTiming {
+
+ DfatoolHostTiming() {
+ element_size = sizeof(DTYPE);
+ }
+
+ advice call("% input_params(...)") : after() {
+ Params* p = tjp->result();
+ input_size = p->input_size_n;
+ printf("[>>] TS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+ }
+
+ advice call("% streamp(...)") : before() {
+ printf("[--] TS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+ }
+
+ advice execution("% main(...)") : after() {
+ printf("[<<] TS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+ }
+};
diff --git a/TS/support/params.h b/TS/include/params.h
index b7d9763..b7d9763 100644
--- a/TS/support/params.h
+++ b/TS/include/params.h
diff --git a/TS/include/timer.h b/TS/include/timer.h
new file mode 100644
index 0000000..7b80823
--- /dev/null
+++ b/TS/include/timer.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define N_TIMERS 7
+#include "../../include/timer_base.h"
+#undef N_TIMERS
diff --git a/TS/support/timer.h b/TS/support/timer.h
deleted file mode 100755
index c569de7..0000000
--- a/TS/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("%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");
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-23 13:38:52 +0000