TS: dos2unix; indent -linuxHEADmain

3 files changed, 143 insertions, 126 deletions

diff --git a/TS/support/common.h b/TS/support/common.h
index b120bb1..7585b90 100755
--- a/TS/support/common.h
+++ b/TS/support/common.h
@@ -14,30 +14,30 @@
 #define DTYPE int32_t
 #define DTYPE_MAX INT32_MAX
 
-typedef struct  {
+typedef struct {
 	uint32_t ts_length;
-    uint32_t query_length;
-    DTYPE query_mean;
-    DTYPE query_std;
-    uint32_t slice_per_dpu;
-    int32_t exclusion_zone;
-    enum kernels {
+	uint32_t query_length;
+	DTYPE query_mean;
+	DTYPE query_std;
+	uint32_t slice_per_dpu;
+	int32_t exclusion_zone;
+	enum kernels {
 		kernel1 = 0,
 		nr_kernels = 1,
 	} kernel;
-}dpu_arguments_t;
+} dpu_arguments_t;
 
-typedef struct  {
-    DTYPE minValue;
-    uint32_t minIndex;
-    DTYPE maxValue;
-    uint32_t maxIndex;
-}dpu_result_t;
+typedef struct {
+	DTYPE minValue;
+	uint32_t minIndex;
+	DTYPE maxValue;
+	uint32_t maxIndex;
+} dpu_result_t;
 
 #ifndef ENERGY
 #define ENERGY 0
 #endif
-#define PRINT 0 
+#define PRINT 0
 
 #define ANSI_COLOR_RED     "\x1b[31m"
 #define ANSI_COLOR_GREEN   "\x1b[32m"
diff --git a/TS/support/params.h b/TS/support/params.h
index 4668604..b7d9763 100644
--- a/TS/support/params.h
+++ b/TS/support/params.h
@@ -5,54 +5,63 @@
 
 // Params ---------------------------------------------------------------------
 typedef struct Params {
-  unsigned long  input_size_n;
-  unsigned long  input_size_m;
-  int  n_warmup;
-  int  n_reps;
-}Params;
+	unsigned long input_size_n;
+	unsigned long input_size_m;
+	int n_warmup;
+	int n_reps;
+} Params;
 
-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"
-    "\nBenchmark-specific options:"
-    "\n    -n <n>    n (TS length. Default=64K elements)"
-    "\n    -m <m>    m (Query length. Default=256 elements)"
-    "\n");
-  }
+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"
+		"\nBenchmark-specific options:"
+		"\n    -n <n>    n (TS length. Default=64K elements)"
+		"\n    -m <m>    m (Query length. Default=256 elements)" "\n");
+}
 
-  struct Params input_params(int argc, char **argv) {
-    struct Params p;
-    p.input_size_n  = 1 << 16;
-    p.input_size_m  = 1 << 8;
+struct Params input_params(int argc, char **argv)
+{
+	struct Params p;
+	p.input_size_n = 1 << 16;
+	p.input_size_m = 1 << 8;
 
-    p.n_warmup      = 1;
-    p.n_reps        = 3;
+	p.n_warmup = 1;
+	p.n_reps = 3;
 
-    int opt;
-    while((opt = getopt(argc, argv, "hw:e:n:m:")) >= 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 'n': p.input_size_n  = atol(optarg); break;
-        case 'm': p.input_size_m  = atol(optarg); break;
-        default:
-        fprintf(stderr, "\nUnrecognized option!\n");
-        usage();
-        exit(0);
-      }
-    }
-    assert(NR_DPUS > 0 && "Invalid # of dpus!");
+	int opt;
+	while ((opt = getopt(argc, argv, "hw:e:n:m:")) >= 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 'n':
+			p.input_size_n = atol(optarg);
+			break;
+		case 'm':
+			p.input_size_m = atol(optarg);
+			break;
+		default:
+			fprintf(stderr, "\nUnrecognized option!\n");
+			usage();
+			exit(0);
+		}
+	}
+	assert(NR_DPUS > 0 && "Invalid # of dpus!");
 
-    return p;
-  }
+	return p;
+}
 #endif
diff --git a/TS/support/timer.h b/TS/support/timer.h
index ff1ae1b..c569de7 100755
--- a/TS/support/timer.h
+++ b/TS/support/timer.h
@@ -1,66 +1,74 @@
-/*

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

-}

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