BS: Add AspectC++ support

7 files changed, 90 insertions, 100 deletions

diff --git a/BS/Makefile b/BS/Makefile
index f9c3002..f5f0c67 100644
--- a/BS/Makefile
+++ b/BS/Makefile
@@ -7,17 +7,34 @@ WITH_LOAD_OVERHEAD ?= 0
 WITH_FREE_OVERHEAD ?= 0
 WITH_DPUINFO ?= 0
 
-COMMON_INCLUDES := support
 HOST_SOURCES := $(wildcard host/*.c)
 DPU_SOURCES := $(wildcard dpu/*.c)
 
-COMMON_FLAGS := -Wall -Wextra  -g -I${COMMON_INCLUDES}
-HOST_FLAGS := ${COMMON_FLAGS} -std=c11 -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DINPUT_SIZE=${INPUT_SIZE} -DPROBLEM_SIZE=${PROBLEM_SIZE} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DWITH_DPUINFO=${WITH_DPUINFO}
+aspectc ?= 0
+aspectc_timing ?= 0
+dfatool_timing ?= 1
+
+HOST_CC := ${CC}
+
+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} -DINPUT_SIZE=${INPUT_SIZE} -DPROBLEM_SIZE=${PROBLEM_SIZE} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DWITH_DPUINFO=${WITH_DPUINFO} -DASPECTC=${aspectc} -DDFATOOL_TIMING=${dfatool_timing}
 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
+ifeq (${verbose}, 1)
 	QUIET =
 endif
 
@@ -26,10 +43,12 @@ all: bin/bs_host bin/bs_dpu
 bin:
 	${QUIET}mkdir -p bin
 
-bin/bs_host: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
-	${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
+bin/bs_host: ${HOST_SOURCES} include 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/bs_dpu: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
+bin/bs_dpu: ${DPU_SOURCES} include bin
 	${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
 
 clean:
diff --git a/BS/host/app.c b/BS/host/app.c
index 217ea99..22ad81a 100644
--- a/BS/host/app.c
+++ b/BS/host/app.c
@@ -7,20 +7,28 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <dpu.h>
-#include <dpu_log.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <assert.h>
 #include <time.h>
 
-#if ENERGY
-#include <dpu_probe.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
+
 #define XSTR(x) STR(x)
 #define STR(x) #x
 
@@ -96,17 +104,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
@@ -122,15 +130,15 @@ int main(int argc, char **argv)
 
 	assert(num_querys % (NR_DPUS * NR_TASKLETS) == 0 && "Input dimension");	// Allocate input and querys vectors
 
-	DTYPE *input = malloc((input_size) * sizeof(DTYPE));
-	DTYPE *querys = malloc((num_querys) * sizeof(DTYPE));
+	DTYPE *input = (DTYPE*)malloc((input_size) * sizeof(DTYPE));
+	DTYPE *querys = (DTYPE*)malloc((num_querys) * sizeof(DTYPE));
 
 	// Create an input file with arbitrary data
 	create_test_file(input, querys, input_size, num_querys);
 
 	// Create kernel arguments
 	uint64_t slice_per_dpu = num_querys / NR_DPUS;
-	dpu_arguments_t input_arguments = { input_size, slice_per_dpu, 0 };
+	dpu_arguments_t input_arguments = { input_size, slice_per_dpu, (enum kernel)0 };
 
 	for (unsigned int rep = 0; rep < p.n_warmup + p.n_reps; rep++) {
 		// Perform input transfers
@@ -322,21 +330,21 @@ 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
 				    ("[::] BS-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, input_size);
-				printf
+				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
+				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], timer.time[3],
 				     timer.time[4], timer.time[5],
 				     timer.time[6]);
-				printf
+				dfatool_printf
 				    (" throughput_cpu_MBps=%f throughput_upmem_kernel_MBps=%f throughput_upmem_total_MBps=%f",
 				     num_querys * sizeof(DTYPE) / timer.time[2],
 				     num_querys * sizeof(DTYPE) /
@@ -345,7 +353,7 @@ int main(int argc, char **argv)
 				     (timer.time[0] + timer.time[1] +
 				      timer.time[3] + timer.time[4] +
 				      timer.time[5] + timer.time[6]));
-				printf
+				dfatool_printf
 				    (" throughput_upmem_wxr_MBps=%f throughput_upmem_lwxr_MBps=%f throughput_upmem_alwxr_MBps=%f",
 				     num_querys * sizeof(DTYPE) /
 				     (timer.time[3] + timer.time[4] +
@@ -357,7 +365,7 @@ int main(int argc, char **argv)
 				     (timer.time[0] + timer.time[1] +
 				      timer.time[3] + timer.time[4] +
 				      timer.time[5]));
-				printf
+				dfatool_printf
 				    (" throughput_cpu_MOpps=%f throughput_upmem_kernel_MOpps=%f throughput_upmem_total_MOpps=%f",
 				     num_querys / timer.time[2],
 				     num_querys / (timer.time[4]),
@@ -367,7 +375,7 @@ int main(int argc, char **argv)
 						   timer.time[4] +
 						   timer.time[5] +
 						   timer.time[6]));
-				printf
+				dfatool_printf
 				    (" throughput_upmem_wxr_MOpps=%f throughput_upmem_lwxr_MOpps=%f throughput_upmem_alwxr_MOpps=%f\n",
 				     num_querys / (timer.time[3] +
 						   timer.time[4] +
diff --git a/BS/support/common.h b/BS/include/common.h
index 54adc39..d0b2865 100755..100644
--- a/BS/support/common.h
+++ b/BS/include/common.h
@@ -27,13 +27,15 @@
 #define INPUT_SIZE 2048576
 #endif
 
+enum kernel {
+	kernel1 = 0,
+	nr_kernels = 1,
+};
+
 typedef struct {
 	uint64_t input_size;
 	uint64_t slice_per_dpu;
-	enum kernels {
-		kernel1 = 0,
-		nr_kernels = 1,
-	} kernel;
+	enum kernel kernel;
 } dpu_arguments_t;
 
 // Structures used by both the host and the dpu to communicate information
diff --git a/BS/include/dfatool_host.ah b/BS/include/dfatool_host.ah
new file mode 100644
index 0000000..2f55c40
--- /dev/null
+++ b/BS/include/dfatool_host.ah
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <sys/time.h>
+#include "dfatool_host_dpu.ah"
+
+aspect DfatoolHostTiming : public DfatoolHostDPUTiming {
+
+	virtual int getKernel() { return 1; }
+
+	DfatoolHostTiming() {
+		element_size = sizeof(uint32_t);
+	}
+
+	advice call("% input_params(...)"): after() {
+		Params* p = tjp->result();
+		input_size = INPUT_SIZE + p->num_querys;
+		printf("[>>] BS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+	}
+
+	advice call("% binarySearch(...)") : after() {
+		printf("[--] BS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+	}
+
+	advice execution("% main(...)") : after() {
+		printf("[<<] BS | n_dpus=%u n_elements=%lu\n", NR_DPUS, input_size);
+	}
+};
diff --git a/BS/support/params.h b/BS/include/params.h
index c91202f..f970eda 100644
--- a/BS/support/params.h
+++ b/BS/include/params.h
@@ -20,7 +20,7 @@ void usage()
 		"\n    -e <E>    # of timed repetition iterations (default=3)"
 		"\n"
 		"\nBenchmark-specific options:"
-		"\n    -i <I>    problem size (default=2 queries)" "\n");
+		"\n    -i <I>    problem size (default=%d queries)" "\n", PROBLEM_SIZE);
 }
 
 struct Params input_params(int argc, char **argv)
diff --git a/BS/include/timer.h b/BS/include/timer.h
new file mode 100644
index 0000000..7b80823
--- /dev/null
+++ b/BS/include/timer.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#define N_TIMERS 7
+#include "../../include/timer_base.h"
+#undef N_TIMERS
diff --git a/BS/support/timer.h b/BS/support/timer.h
deleted file mode 100755
index 256447a..0000000
--- a/BS/support/timer.h
+++ /dev/null
@@ -1,71 +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");
-}