VA: Use common timer and timing aspect headers

10 files changed, 104 insertions, 106 deletions

diff --git a/VA/Makefile b/VA/Makefile
index a79969c..5d2df1c 100644
--- a/VA/Makefile
+++ b/VA/Makefile
@@ -8,7 +8,6 @@ WITH_LOAD_OVERHEAD ?= 0
 WITH_FREE_OVERHEAD ?= 0
 WITH_DPUINFO ?= 0
 
-COMMON_INCLUDES := support
 HOST_SOURCES := $(wildcard host/*.c)
 DPU_SOURCES := $(wildcard dpu/*.c)
 
@@ -18,12 +17,12 @@ dfatool_timing ?= 1
 
 HOST_CC := ${CC}
 
-COMMON_FLAGS := -Wall -Wextra -g -I${COMMON_INCLUDES}
+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 += -a support/dfatool_host.ah
+	ASPECTC_HOST_FLAGS += -ainclude/dfatool_host_dpu.ah -ainclude/dfatool_host.ah
 endif
 
 ASPECTC_HOST_FLAGS ?= -a0
@@ -45,8 +44,11 @@ all: bin/host_code bin/dpu_code
 bin:
 	${QUIET}mkdir -p bin
 
+# cp/rm are needed to work around AspectC++ not liking symlinks
 bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES} 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
 	${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
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 2455642..697731b 100644
--- a/VA/host/app.c
+++ b/VA/host/app.c
@@ -29,9 +29,9 @@ extern "C" {
 #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
diff --git a/VA/support/common.h b/VA/include/common.h
index 6ce6e23..6ce6e23 100755..100644
--- a/VA/support/common.h
+++ b/VA/include/common.h
diff --git a/VA/include/dfatool_host.ah b/VA/include/dfatool_host.ah
new file mode 100644
index 0000000..6818333
--- /dev/null
+++ b/VA/include/dfatool_host.ah
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <sys/time.h>
+#include "dfatool_host_dpu.ah"
+
+aspect DfatoolHostTiming : public DfatoolHostDPUTiming {
+	advice call("% input_params(...)") : after() {
+		Params* p = tjp->result();
+		printf("[==] VA | n_dpus=%u n_elements=%lu e_exp=%d \n", NR_DPUS, p->input_size, p->exp);
+	}
+
+	advice call("% vector_addition_host(...)") : after() {
+		printf("[--] VA | n_dpus=%u n_ranks=%u n_elements=%lu n_elements_per_dpu=%lu e_exp=%d \n", n_dpus, n_ranks, p.input_size, p.input_size / n_dpus, p.exp);
+	}
+};
diff --git a/VA/support/params.h b/VA/include/params.h
index 4f41adc..4f41adc 100644
--- a/VA/support/params.h
+++ b/VA/include/params.h
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 c0208d3..0000000
--- a/VA/support/timer.h
+++ /dev/null
@@ -1,86 +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>
-
-#if DFATOOL_TIMING
-
-typedef struct Timer {
-
-	struct timeval startTime[7];
-	struct timeval stopTime[7];
-	double time[7];
-
-} Timer;
-
-#define dfatool_printf(fmt, ...) do { printf(fmt, __VA_ARGS__); } while (0)
-
-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);
-}
-
-#else
-
-#define dfatool_printf(fmt, ...) do {} while (0)
-
-typedef int Timer;
-
-void start(Timer *timer, int i, int rep)
-{
-	(void)timer;
-	(void)i;
-	(void)rep;
-}
-
-void stop(Timer *timer, int i)
-{
-	(void)timer;
-	(void)i;
-}
-
-#endif
diff --git a/VA/support/dfatool_host.ah b/include/dfatool_host_dpu.ah
index f207ea2..1056a94 100644
--- a/VA/support/dfatool_host.ah
+++ b/include/dfatool_host_dpu.ah
@@ -2,7 +2,7 @@
 
 #include <sys/time.h>
 
-aspect DfatoolHostTiming {
+aspect DfatoolHostDPUTiming {
 	struct timeval starttime;
 	struct timeval stoptime;
 	uint32_t n_ranks = 0;
@@ -10,11 +10,6 @@ aspect DfatoolHostTiming {
 
 	double const M_to_Mi = 1.048576; /* 2^20 / 1e6 */
 
-	advice call("% input_params(...)") : after() {
-		Params* p = tjp->result();
-		printf("[--] n_dpus=%u n_elements=%lu e_exp=%d \n", NR_DPUS, p->input_size, p->exp);
-	}
-
 	advice call("% dpu_get_nr_dpus(...)") : after() {
 		n_dpus = **(tjp->arg<1>());
 	}
@@ -28,7 +23,9 @@ aspect DfatoolHostTiming {
 		tjp->proceed();
 		gettimeofday(&stoptime, NULL);
 		n_dpus = *(tjp->arg<0>());
-		printf("[::] dpu_alloc | n_dpus=%u | latency_us=%f\n",
+		printf("[::] dpu_alloc @ %s:%d | n_dpus=%u | latency_us=%f\n",
+			tjp->filename(),
+			tjp->line(),
 			n_dpus,
 			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
 		);
@@ -39,7 +36,9 @@ aspect DfatoolHostTiming {
 		tjp->proceed();
 		gettimeofday(&stoptime, NULL);
 		n_ranks = *(tjp->arg<0>());
-		printf("[::] dpu_alloc_ranks | n_ranks=%u | latency_us=%f\n",
+		printf("[::] dpu_alloc_ranks @ %s:%d | n_ranks=%u | latency_us=%f\n",
+			tjp->filename(),
+			tjp->line(),
 			n_ranks,
 			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
 		);
@@ -49,7 +48,9 @@ aspect DfatoolHostTiming {
 		gettimeofday(&starttime, NULL);
 		tjp->proceed();
 		gettimeofday(&stoptime, NULL);
-		printf("[::] dpu_load | n_dpus=%u n_ranks=%u | latency_us=%f\n",
+		printf("[::] dpu_load @ %s:%d | n_dpus=%u n_ranks=%u | latency_us=%f\n",
+			tjp->filename(),
+			tjp->line(),
 			n_dpus, n_ranks,
 			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
 		);
@@ -59,7 +60,9 @@ aspect DfatoolHostTiming {
 		gettimeofday(&starttime, NULL);
 		tjp->proceed();
 		gettimeofday(&stoptime, NULL);
-		printf("[::] dpu_free | n_dpus=%u n_ranks=%u | latency_us=%f\n",
+		printf("[::] dpu_free @ %s:%d | n_dpus=%u n_ranks=%u | latency_us=%f\n",
+			tjp->filename(),
+			tjp->line(),
 			n_dpus, n_ranks,
 			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
 		);
@@ -71,7 +74,9 @@ aspect DfatoolHostTiming {
 		gettimeofday(&stoptime, NULL);
 		double latency_us = (stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec);
 		unsigned long input_size = p.input_size;
-		printf("[::] dpu_launch | n_dpus=%u n_ranks=%u e_kernel=kernel%d n_elements=%lu | latency_us=%f throughput_Mrps=%f throughput_MiBps=%f\n",
+		printf("[::] dpu_launch @ %s:%d | n_dpus=%u n_ranks=%u e_kernel=kernel%d n_elements=%lu | latency_us=%f throughput_Mrps=%f throughput_MiBps=%f\n",
+			tjp->filename(),
+			tjp->line(),
 			n_dpus, n_ranks,
 			kernel + 1,
 			input_size,
@@ -88,14 +93,18 @@ aspect DfatoolHostTiming {
 		gettimeofday(&stoptime, NULL);
 		double time_us = (stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec);
 		if (*(tjp->arg<1>()) == DPU_XFER_TO_DPU) {
-			printf("[::] dpu_push_to_dpu | n_dpus=%u n_ranks=%u total_payload_B=%lu dpu_payload_B=%lu | latency_us=%f throughput_MiBps=%f\n",
+			printf("[::] dpu_push_to_dpu @ %s:%d | n_dpus=%u n_ranks=%u total_payload_B=%lu dpu_payload_B=%lu | latency_us=%f throughput_MiBps=%f\n",
+				tjp->filename(),
+				tjp->line(),
 				n_dpus, n_ranks,
 				payload_size * n_dpus, payload_size,
 				time_us,
 				payload_size * n_dpus / (time_us * M_to_Mi)
 			);
 		} else if (*(tjp->arg<1>()) == DPU_XFER_FROM_DPU) {
-			printf("[::] dpu_push_from_dpu | n_dpus=%u n_ranks=%u total_payload_B=%lu dpu_payload_B=%lu | latency_us=%f throughput_MiBps=%f\n",
+			printf("[::] dpu_push_from_dpu @ %s:%d | n_dpus=%u n_ranks=%u total_payload_B=%lu dpu_payload_B=%lu | latency_us=%f throughput_MiBps=%f\n",
+				tjp->filename(),
+				tjp->line(),
 				n_dpus, n_ranks,
 				payload_size * n_dpus, payload_size,
 				time_us,
diff --git a/include/timer_base.h b/include/timer_base.h
new file mode 100644
index 0000000..fed8bec
--- /dev/null
+++ b/include/timer_base.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <sys/time.h>
+
+#if DFATOOL_TIMING
+
+typedef struct Timer {
+
+	struct timeval startTime[N_TIMERS];
+	struct timeval stopTime[N_TIMERS];
+	double time[N_TIMERS];
+
+} Timer;
+
+#define dfatool_printf(fmt, ...) do { printf(fmt, __VA_ARGS__); } while (0)
+
+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);
+}
+
+#else
+
+#define dfatool_printf(fmt, ...) do {} while (0)
+
+typedef int Timer;
+
+void start(Timer *timer, int i, int rep)
+{
+	(void)timer;
+	(void)i;
+	(void)rep;
+}
+
+void stop(Timer *timer, int i)
+{
+	(void)timer;
+	(void)i;
+}
+
+#endif