TRNS: refactor AspectC++ and timer headers

4 files changed, 0 insertions, 297 deletions

diff --git a/TRNS/support/common.h b/TRNS/support/common.h
deleted file mode 100755
index 6a94c62..0000000
--- a/TRNS/support/common.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-// Transfer size between MRAM and WRAM
-#ifdef BL
-#define BLOCK_SIZE_LOG2 BL
-#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2)
-#else
-#define BLOCK_SIZE_LOG2 8
-#define BLOCK_SIZE (1 << BLOCK_SIZE_LOG2)
-#define BL BLOCK_SIZE_LOG2
-#endif
-
-// Data type
-#define T int64_t
-
-enum kernels {
-	kernel1 = 0,
-	kernel2 = 1,
-	nr_kernels = 2,
-};
-
-// Structures used by both the host and the dpu to communicate information 
-typedef struct {
-    uint32_t m;
-    uint32_t n;
-    uint32_t M_;
-	enum kernels kernel;
-} dpu_arguments_t;
-
-#ifndef ENERGY
-#define ENERGY 0
-#endif
-#define PRINT 0 
-
-#define ANSI_COLOR_RED     "\x1b[31m"
-#define ANSI_COLOR_GREEN   "\x1b[32m"
-#define ANSI_COLOR_RESET   "\x1b[0m"
-
-#define divceil(n, m) (((n)-1) / (m) + 1)
-#define roundup(n, m) ((n / m) * m + m)
-#endif
diff --git a/TRNS/support/dfatool_host.ah b/TRNS/support/dfatool_host.ah
deleted file mode 100644
index c884c9d..0000000
--- a/TRNS/support/dfatool_host.ah
+++ /dev/null
@@ -1,101 +0,0 @@
-#pragma once
-
-#include <sys/time.h>
-
-aspect DfatoolHostTiming {
-	struct timeval starttime;
-	struct timeval stoptime;
-	uint32_t n_ranks = 0;
-	uint32_t n_dpus = 0;
-
-	double const M_to_Mi = 1.048576; /* 2^20 / 1e6 */
-
-	advice call("% dpu_get_nr_dpus(...)") : after() {
-		n_dpus = **(tjp->arg<1>());
-	}
-
-	advice call("% dpu_get_nr_ranks(...)") : after() {
-		n_ranks = **(tjp->arg<1>());
-	}
-
-	advice call("% dpu_alloc(...)") : around() {
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		gettimeofday(&stoptime, NULL);
-		n_dpus = *(tjp->arg<0>());
-		printf("[::] dpu_alloc | n_dpus=%u | latency_us=%f\n",
-			n_dpus,
-			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
-		);
-	}
-
-	advice call("% dpu_alloc_ranks(...)") : around() {
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		gettimeofday(&stoptime, NULL);
-		n_ranks = *(tjp->arg<0>());
-		printf("[::] dpu_alloc_ranks | n_ranks=%u | latency_us=%f\n",
-			n_ranks,
-			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
-		);
-	}
-
-	advice call("% dpu_load(...)") : around() {
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		gettimeofday(&stoptime, NULL);
-		printf("[::] dpu_load | n_dpus=%u n_ranks=%u | latency_us=%f\n",
-			n_dpus, n_ranks,
-			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
-		);
-	}
-
-	advice call("% dpu_free(...)") : around() {
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		gettimeofday(&stoptime, NULL);
-		printf("[::] dpu_free | n_dpus=%u n_ranks=%u | latency_us=%f\n",
-			n_dpus, n_ranks,
-			(stoptime.tv_sec - starttime.tv_sec) * 1000000.0 + (stoptime.tv_usec - starttime.tv_usec)
-		);
-	}
-
-	advice call("% dpu_launch(...)") : around() {
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		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.M_ * p.m * p.N_ * p.n;
-		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",
-			n_dpus, n_ranks,
-			kernel + 1,
-			input_size,
-			latency_us,
-			input_size / latency_us,
-			input_size * sizeof(T) / (latency_us * M_to_Mi)
-		);
-	}
-
-	advice call("% dpu_push_xfer(...)") : around() {
-		size_t payload_size = *(tjp->arg<4>());
-		gettimeofday(&starttime, NULL);
-		tjp->proceed();
-		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",
-				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",
-				n_dpus, n_ranks,
-				payload_size * n_dpus, payload_size,
-				time_us,
-				payload_size * n_dpus / (time_us * M_to_Mi)
-			);
-		}
-	}
-};
diff --git a/TRNS/support/params.h b/TRNS/support/params.h
deleted file mode 100644
index 6b7e6f2..0000000
--- a/TRNS/support/params.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef _PARAMS_H_
-#define _PARAMS_H_
-
-#include "common.h"
-
-typedef struct Params {
-    unsigned int   M_;
-    unsigned int   m;
-    unsigned int   N_;
-    unsigned int   n;
-    int   n_warmup;
-    int   n_reps;
-    int  exp;
-}Params;
-
-static void usage() {
-    fprintf(stderr,
-        "\nUsage:  ./program [options]"
-        "\n"
-        "\nGeneral options:"
-        "\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"
-        "\nBenchmark-specific options:"
-        "\n    -m <I>    m (default=16 elements)"
-        "\n    -n <I>    n (default=8 elements)"
-        "\n    -o <I>    M_ (default=12288 elements)"
-        "\n    -p <I>    N_ (default=1 elements)"
-        "\n");
-}
-
-struct Params input_params(int argc, char **argv) {
-    struct Params p;
-    p.M_            = 12288;
-    p.m             = 16;
-    p.N_            = 1;
-    p.n             = 8;
-    p.n_warmup      = 1;
-    p.n_reps        = 3;
-    p.exp           = 0;
-
-    int opt;
-    while((opt = getopt(argc, argv, "hw:e:x:m:n:o:p:")) >= 0) {
-        switch(opt) {
-        case 'h':
-        usage();
-        exit(0);
-        break;
-        case 'w': p.n_warmup      = atoi(optarg); break;
-        case 'e': p.n_reps        = atoi(optarg); break;
-        case 'x': p.exp           = atoi(optarg); break;
-        case 'm': p.m             = atoi(optarg); break;
-        case 'n': p.n             = atoi(optarg); break;
-        case 'o': p.M_            = atoi(optarg); break;
-        case 'p': p.N_            = atoi(optarg); break;
-        default:
-            fprintf(stderr, "\nUnrecognized option!\n");
-            usage();
-            exit(0);
-        }
-    }
-    assert(NR_DPUS > 0 && "Invalid # of dpus!");
-
-    return p;
-}
-#endif
diff --git a/TRNS/support/timer.h b/TRNS/support/timer.h
deleted file mode 100755
index e04a202..0000000
--- a/TRNS/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[10];
-	struct timeval stopTime[10];
-	double time[10];
-
-} 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