HST-L: Add AspectC++ support

9 files changed, 207 insertions, 149 deletions

diff --git a/HST-L/Makefile b/HST-L/Makefile
index 1888b0a..45ba86c 100644
--- a/HST-L/Makefile
+++ b/HST-L/Makefile
@@ -3,15 +3,35 @@ NR_TASKLETS ?= 16
 NR_HISTO ?= 1
 BL ?= 10
 ENERGY ?= 0
+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} -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DBL=${BL} -DNR_HISTO=${NR_HISTO}
-HOST_FLAGS := ${COMMON_FLAGS} -std=c11 -O3 `dpu-pkg-config --cflags --libs dpu` -DENERGY=${ENERGY}
+aspectc ?= 0
+aspectc_timing ?= 0
+dfatool_timing ?= 1
+
+HOST_CC := ${CC}
+
+COMMON_FLAGS := -Wall -Wextra -g -Iinclude -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DBL=${BL} -DNR_HISTO=${NR_HISTO}
+HOST_FLAGS := ${COMMON_FLAGS} -O3 `dpu-pkg-config --cflags --libs dpu` -DENERGY=${ENERGY} -DWITH_ALLOC_OVERHEAD=${WITH_ALLOC_OVERHEAD} -DWITH_LOAD_OVERHEAD=${WITH_LOAD_OVERHEAD} -DWITH_FREE_OVERHEAD=${WITH_FREE_OVERHEAD} -DASPECTC=${aspectc} -DDFATOOL_TIMING=${dfatool_timing}
 DPU_FLAGS := ${COMMON_FLAGS} -O2
 
+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
@@ -23,10 +43,12 @@ all: bin/host_code bin/dpu_code
 bin:
 	${QUIET}mkdir -p bin
 
-bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
-	${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
+bin/host_code: ${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/dpu_code: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
+bin/dpu_code: ${DPU_SOURCES} include bin
 	${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
 
 clean:
diff --git a/HST-L/dpu/task.c b/HST-L/dpu/task.c
index 356b2f9..26021bd 100644
--- a/HST-L/dpu/task.c
+++ b/HST-L/dpu/task.c
@@ -12,7 +12,7 @@
 #include <atomic_bit.h>
 #include <mutex.h>
 
-#include "../support/common.h"
+#include "common.h"
 
 __host dpu_arguments_t DPU_INPUT_ARGUMENTS;
 
diff --git a/HST-L/host/app.c b/HST-L/host/app.c
index b9c07f9..ac7381b 100644
--- a/HST-L/host/app.c
+++ b/HST-L/host/app.c
@@ -8,15 +8,29 @@
 #include <stdbool.h>
 #include <string.h>
 #include <math.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
@@ -26,10 +40,6 @@
 #define XSTR(x) STR(x)
 #define STR(x) #x
 
-#if ENERGY
-#include <dpu_probe.h>
-#endif
-
 // Pointer declaration
 static T* A;
 static unsigned int* histo_host;
@@ -89,17 +99,29 @@ int main(int argc, char **argv) {
     DPU_ASSERT(dpu_probe_init("energy_probe", &probe));
 #endif
 
+    // Timer declaration
+    Timer timer;
+
     // Allocate DPUs and load binary
+#if !WITH_ALLOC_OVERHEAD
     DPU_ASSERT(dpu_alloc(NR_DPUS, NULL, &dpu_set));
+    zero(&timer, 0); // aloc
+#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));
-    printf("Allocated %d DPU(s)\n", nr_of_dpus);
+    assert(nr_of_dpus == NR_DPUS);
+    zero(&timer, 1); // load
+#endif
+#if !WITH_FREE_OVERHEAD
+    zero(&timer, 6); // free
+#endif
 
     unsigned int i = 0;
     unsigned int input_size; // Size of input image
     unsigned int dpu_s = p.dpu_s;
     if(p.exp == 0)
-        input_size = p.input_size * nr_of_dpus; // Size of input image
+        input_size = p.input_size * NR_DPUS; // Size of input image
     else if(p.exp == 1)
         input_size = p.input_size; // Size of input image
 	else
@@ -107,20 +129,20 @@ int main(int argc, char **argv) {
 
     const unsigned int input_size_8bytes = 
         ((input_size * sizeof(T)) % 8) != 0 ? roundup(input_size, 8) : input_size; // Input size per DPU (max.), 8-byte aligned
-    const unsigned int input_size_dpu = divceil(input_size, nr_of_dpus); // Input size per DPU (max.)
+    const unsigned int input_size_dpu = divceil(input_size, NR_DPUS); // Input size per DPU (max.)
     const unsigned int input_size_dpu_8bytes = 
         ((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_of_dpus * sizeof(T));
+    A = (T*)malloc(input_size_dpu_8bytes * NR_DPUS * sizeof(T));
     T *bufferA = A;
-    histo_host = malloc(p.bins * sizeof(unsigned int));
-    histo = malloc(nr_of_dpus * p.bins * sizeof(unsigned int));
+    histo_host = (unsigned int*)malloc(p.bins * sizeof(unsigned int));
+    histo = (unsigned int*)malloc(NR_DPUS * p.bins * sizeof(unsigned int));
 
     // Create an input file with arbitrary data
     read_input(A, p);
     if(p.exp == 0){
-        for(unsigned int j = 1; j < nr_of_dpus; j++){
+        for(unsigned int j = 1; j < NR_DPUS; j++){
             memcpy(&A[j * input_size_dpu_8bytes], &A[0], input_size_dpu_8bytes * sizeof(T));
         }
     }
@@ -129,40 +151,59 @@ int main(int argc, char **argv) {
             memcpy(&A[j * p.input_size], &A[0], p.input_size * sizeof(T));
     }
 
-    // Timer declaration
-    Timer timer;
-
-    printf("NR_TASKLETS\t%d\tBL\t%d\tinput_size\t%u\n", NR_TASKLETS, BL, input_size);
-
     // Loop over main kernel
     for(int rep = 0; rep < p.n_warmup + p.n_reps; rep++) {
-        memset(histo_host, 0, p.bins * sizeof(unsigned int));
-        memset(histo, 0, nr_of_dpus * p.bins * sizeof(unsigned int));
 
-        // Compute output on CPU (performance comparison and verification purposes)
-        if(rep >= p.n_warmup)
+#if WITH_ALLOC_OVERHEAD
+        if(rep >= p.n_warmup) {
             start(&timer, 0, 0);
-        histogram_host(histo_host, A, p.bins, p.input_size, 1, nr_of_dpus);
-        if(rep >= p.n_warmup)
+        }
+        DPU_ASSERT(dpu_alloc(NR_DPUS, NULL, &dpu_set));
+        if(rep >= p.n_warmup) {
             stop(&timer, 0);
-
-        printf("Load input data\n");
-        if(rep >= p.n_warmup)
+        }
+#endif
+#if WITH_LOAD_OVERHEAD
+        if(rep >= p.n_warmup) {
             start(&timer, 1, 0);
+        }
+        DPU_ASSERT(dpu_load(dpu_set, DPU_BINARY, NULL));
+        if(rep >= p.n_warmup) {
+            stop(&timer, 1);
+        }
+        DPU_ASSERT(dpu_get_nr_dpus(dpu_set, &nr_of_dpus));
+        assert(nr_of_dpus == NR_DPUS);
+#endif
+
+        memset(histo_host, 0, p.bins * sizeof(unsigned int));
+        memset(histo, 0, NR_DPUS * p.bins * sizeof(unsigned int));
+
+        // Compute output on CPU (performance comparison and verification purposes)
+        if(rep >= p.n_warmup) {
+            start(&timer, 2, 0);
+        }
+        histogram_host(histo_host, A, p.bins, p.input_size, 1, NR_DPUS);
+        if(rep >= p.n_warmup) {
+            stop(&timer, 2);
+        }
+
+        if(rep >= p.n_warmup) {
+            start(&timer, 3, 0);
+        }
         // Input arguments
         unsigned int kernel = 0;
         i = 0;
 	    dpu_arguments_t input_arguments[NR_DPUS];
-	    for(i=0; i<nr_of_dpus-1; i++) {
+	    for(i=0; i<NR_DPUS-1; i++) {
 	        input_arguments[i].size=input_size_dpu_8bytes * sizeof(T); 
 	        input_arguments[i].transfer_size=input_size_dpu_8bytes * sizeof(T); 
 	        input_arguments[i].bins=p.bins;
-	        input_arguments[i].kernel=kernel;
+	        input_arguments[i].kernel = (enum kernels)kernel;
 	    }
-	    input_arguments[nr_of_dpus-1].size=(input_size_8bytes - input_size_dpu_8bytes * (NR_DPUS-1)) * sizeof(T); 
-	    input_arguments[nr_of_dpus-1].transfer_size=input_size_dpu_8bytes * sizeof(T); 
-	    input_arguments[nr_of_dpus-1].bins=p.bins;
-	    input_arguments[nr_of_dpus-1].kernel=kernel;
+	    input_arguments[NR_DPUS-1].size=(input_size_8bytes - input_size_dpu_8bytes * (NR_DPUS-1)) * sizeof(T); 
+	    input_arguments[NR_DPUS-1].transfer_size=input_size_dpu_8bytes * sizeof(T); 
+	    input_arguments[NR_DPUS-1].bins=p.bins;
+	    input_arguments[NR_DPUS-1].kernel = (enum kernels)kernel;
 
         // Copy input arrays
         i = 0;
@@ -174,13 +215,13 @@ int main(int argc, char **argv) {
             DPU_ASSERT(dpu_prepare_xfer(dpu, bufferA + input_size_dpu_8bytes * i));
         }
         DPU_ASSERT(dpu_push_xfer(dpu_set, DPU_XFER_TO_DPU, DPU_MRAM_HEAP_POINTER_NAME, 0, input_size_dpu_8bytes * sizeof(T), DPU_XFER_DEFAULT));
-        if(rep >= p.n_warmup)
-            stop(&timer, 1);
+        if(rep >= p.n_warmup) {
+            stop(&timer, 3);
+        }
 
-        printf("Run program on DPU(s) \n");
         // Run DPU kernel
         if(rep >= p.n_warmup) {
-            start(&timer, 2, 0);
+            start(&timer, 4, 0);
             #if ENERGY
             DPU_ASSERT(dpu_probe_start(&probe));
             #endif
@@ -188,7 +229,7 @@ int main(int argc, char **argv) {
 
         DPU_ASSERT(dpu_launch(dpu_set, DPU_SYNCHRONOUS));
         if(rep >= p.n_warmup) {
-            stop(&timer, 2);
+            stop(&timer, 4);
             #if ENERGY
             DPU_ASSERT(dpu_probe_stop(&probe));
             #endif
@@ -206,10 +247,10 @@ int main(int argc, char **argv) {
         }
 #endif
 
-        printf("Retrieve results\n");
         i = 0;
-        if(rep >= p.n_warmup)
-            start(&timer, 3, 0);
+        if(rep >= p.n_warmup) {
+            start(&timer, 5, 0);
+        }
         // PARALLEL RETRIEVE TRANSFER
         DPU_FOREACH(dpu_set, dpu, i) {
             DPU_ASSERT(dpu_prepare_xfer(dpu, histo + p.bins * i));
@@ -217,40 +258,60 @@ int main(int argc, char **argv) {
         DPU_ASSERT(dpu_push_xfer(dpu_set, DPU_XFER_FROM_DPU, DPU_MRAM_HEAP_POINTER_NAME, input_size_dpu_8bytes * sizeof(T), p.bins * sizeof(unsigned int), DPU_XFER_DEFAULT));
 
         // Final histogram merging
-        for(i = 1; i < nr_of_dpus; i++){
+        for(i = 1; i < NR_DPUS; i++){
             for(unsigned int j = 0; j < p.bins; j++){
                 histo[j] += histo[j + i * p.bins];
             }
         }
-        if(rep >= p.n_warmup)
-            stop(&timer, 3);
+        if(rep >= p.n_warmup) {
+            stop(&timer, 5);
+        }
+
+#if WITH_ALLOC_OVERHEAD
+#if WITH_FREE_OVERHEAD
+        if(rep >= p.n_warmup) {
+            start(&timer, 6, 0);
+        }
+#endif
+        DPU_ASSERT(dpu_free(dpu_set));
+#if WITH_FREE_OVERHEAD
+        if(rep >= p.n_warmup) {
+            stop(&timer, 6);
+        }
+#endif
+#endif
 
         if (rep >= p.n_warmup) {
-            printf("[::] HST-L NMC | n_dpus=%d n_tasklets=%d e_type=%s n_elements=%u n_bins=%d "
-                "| throughput_cpu_MBps=%f throughput_pim_MBps=%f throughput_MBps=%f",
-                nr_of_dpus, NR_TASKLETS, XSTR(T), input_size, p.bins,
-                input_size * sizeof(T) / timer.time[0],
+            dfatool_printf("[::] HST-L UPMEM | n_dpus=%d n_tasklets=%d e_type=%s n_elements=%d n_bins=%d ",
+                nr_of_dpus, NR_TASKLETS, XSTR(T), input_size, p.bins);
+            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]);
+            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[1] + timer.time[2] + timer.time[3]));
-            printf(" throughput_cpu_MOpps=%f throughput_pim_MOpps=%f throughput_MOpps=%f",
-                input_size / timer.time[0],
+                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]));
+            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]));
+            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[1] + timer.time[2] + timer.time[3]));
-            printall(&timer, 3);
+                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]));
+            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]));
         }
 
     }
 
-    // Print timing results
-    printf("CPU ");
-    print(&timer, 0, p.n_reps);
-    printf("CPU-DPU ");
-    print(&timer, 1, p.n_reps);
-    printf("DPU Kernel ");
-    print(&timer, 2, p.n_reps);
-    printf("DPU-CPU ");
-    print(&timer, 3, p.n_reps);
-
     #if ENERGY
     double energy;
     DPU_ASSERT(dpu_probe_get(&probe, DPU_ENERGY, DPU_AVERAGE, &energy));
@@ -279,10 +340,10 @@ int main(int argc, char **argv) {
         }
     else
         for (unsigned int j = 0; j < p.bins; j++) {
-            if(nr_of_dpus * histo_host[j] != histo[j]){ 
+            if(NR_DPUS * histo_host[j] != histo[j]){ 
                 status = false;
 #if PRINT
-                printf("%u - %u: %u -- %u\n", j, j, nr_of_dpus * histo_host[j], histo[j]);
+                printf("%u - %u: %u -- %u\n", j, j, NR_DPUS * histo_host[j], histo[j]);
 #endif
             }
         }
@@ -296,7 +357,10 @@ int main(int argc, char **argv) {
     free(A);
     free(histo_host);
     free(histo);
+
+#if !WITH_ALLOC_OVERHEAD
     DPU_ASSERT(dpu_free(dpu_set));
+#endif
 	
     return status ? 0 : -1;
 }
diff --git a/HST-L/support/common.h b/HST-L/include/common.h
index 30df40d..438825e 100755..100644
--- a/HST-L/support/common.h
+++ b/HST-L/include/common.h
@@ -20,15 +20,17 @@
 #define DEPTH 12
 #define ByteSwap16(n) (((((unsigned int)n) << 8) & 0xFF00) | ((((unsigned int)n) >> 8) & 0x00FF))
 
+enum kernels {
+	kernel1 = 0,
+	nr_kernels = 1,
+} kernel;
+
 // Structures used by both the host and the dpu to communicate information 
 typedef struct {
     uint32_t size;
     uint32_t transfer_size;
     uint32_t bins;
-	enum kernels {
-	    kernel1 = 0,
-	    nr_kernels = 1,
-	} kernel;
+	enum kernels kernel;
 } dpu_arguments_t;
 
 #ifndef ENERGY
diff --git a/HST-L/include/dfatool_host.ah b/HST-L/include/dfatool_host.ah
new file mode 100644
index 0000000..db4e441
--- /dev/null
+++ b/HST-L/include/dfatool_host.ah
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <sys/time.h>
+#include "dfatool_host_dpu.ah"
+
+aspect DfatoolHostTiming : public DfatoolHostDPUTiming {
+	unsigned long n_pixels;
+	unsigned int n_bins;
+	unsigned int element_size;
+
+	virtual int getKernel() { return 1; }
+
+	DfatoolHostTiming() {
+		element_size = sizeof(T);
+	}
+
+	advice call("% input_params(...)") : after() {
+		Params* p = tjp->result();
+		n_pixels = p->input_size;
+		n_bins = p->bins;
+		printf("[>>] HST-L | n_dpus=%u n_pixels=%lu n_bins=%u\n", NR_DPUS, n_pixels, n_bins);
+	}
+
+	advice call("% histogram_host(...)") : after() {
+		printf("[--] HST-L | n_dpus=%u n_pixels=%lu n_bins=%u\n", NR_DPUS, n_pixels, n_bins);
+	}
+
+	advice execution("% main(...)") : after() {
+		printf("[<<] HST-L | n_dpus=%u n_pixels=%lu n_bins=%u\n", NR_DPUS, n_pixels, n_bins);
+	}
+};
diff --git a/HST-L/support/params.h b/HST-L/include/params.h
index e29449b..d0c3129 100644
--- a/HST-L/support/params.h
+++ b/HST-L/include/params.h
@@ -21,7 +21,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, 2) scaling (default=0)"
+        "\n    -x <X>    Weak (0) or strong (1, 2) scaling (default=1)"
         "\n"
         "\nBenchmark-specific options:"
         "\n    -i <I>    input size (default=1536*1024 elements)"
@@ -36,7 +36,7 @@ struct Params input_params(int argc, char **argv) {
     p.bins          = 256;
     p.n_warmup      = 1;
     p.n_reps        = 3;
-    p.exp           = 0;
+    p.exp           = 1;
     p.file_name     = "./input/image_VanHateren.iml";
     p.dpu_s         = 64;
 
diff --git a/HST-L/include/timer.h b/HST-L/include/timer.h
new file mode 100644
index 0000000..5b8eba3
--- /dev/null
+++ b/HST-L/include/timer.h
@@ -0,0 +1,5 @@
+#pragma once

+

+#define N_TIMERS 7

+#include "../../include/timer_base.h"

+#undef N_TIMERS

diff --git a/HST-L/support/timer.h b/HST-L/support/timer.h
deleted file mode 100755
index 5c00213..0000000
--- a/HST-L/support/timer.h
+++ /dev/null
@@ -1,66 +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[4];

-    struct timeval stopTime[4];

-    double         time[4];

-

-}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");

-}

diff --git a/README.md b/README.md
index edaca76..6100fc6 100644
--- a/README.md
+++ b/README.md
@@ -70,11 +70,11 @@ The following benchmark adjustments have been made:
 
 CPU and DPU benchmarks in this repository have been adjusted as follows:
 
-* BFS: DL
-* BS: DLN
+* BFS: ADL
+* BS: ADLN
 * COUNT: DLN (new benchmark, based on SEL)
-* GEMV: DLN
-* HST-L: D
+* GEMV: ADLN
+* HST-L: AD
 * HST-S: DLN
 * MLP: –
 * NW: –