MLP: dos2unix; indent -linux

3 files changed, 129 insertions, 113 deletions

diff --git a/MLP/support/common.h b/MLP/support/common.h
index 53b2f1c..4b5031b 100755
--- a/MLP/support/common.h
+++ b/MLP/support/common.h
@@ -3,21 +3,21 @@
 
 // Structures used by both the host and the dpu to communicate information 
 typedef struct {
-    uint32_t n_size;
-    uint32_t n_size_pad;
-    uint32_t nr_rows;
-    uint32_t max_rows;
+	uint32_t n_size;
+	uint32_t n_size_pad;
+	uint32_t nr_rows;
+	uint32_t max_rows;
 } dpu_arguments_t;
 
 // Specific information for each DPU
 struct dpu_info_t {
-  uint32_t rows_per_dpu;
-  uint32_t rows_per_dpu_pad;
-  uint32_t prev_rows_dpu;
+	uint32_t rows_per_dpu;
+	uint32_t rows_per_dpu_pad;
+	uint32_t prev_rows_dpu;
 };
 struct dpu_info_t *dpu_info;
 
-#define NUM_LAYERS 3 
+#define NUM_LAYERS 3
 #define max(x, y) (x > y ? x : y)
 #define min(x, y) (x < y ? x : y)
 
diff --git a/MLP/support/params.h b/MLP/support/params.h
index f9e790e..4bfc2fc 100644
--- a/MLP/support/params.h
+++ b/MLP/support/params.h
@@ -4,53 +4,62 @@
 #include "common.h"
 
 typedef struct Params {
-    unsigned int  m_size;
-    unsigned int  n_size;
-    unsigned int  n_warmup;
-    unsigned int  n_reps;
-}Params;
+	unsigned int m_size;
+	unsigned int n_size;
+	unsigned int n_warmup;
+	unsigned int n_reps;
+} 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"
-            "\nBenchmark-specific options:"
-            "\n    -m <I>    m_size (default=2048 elements)"
-            "\n    -n <I>    n_size (default=2048 elements)"
-            "\n");
+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"
+		"\nBenchmark-specific options:"
+		"\n    -m <I>    m_size (default=2048 elements)"
+		"\n    -n <I>    n_size (default=2048 elements)" "\n");
 }
 
-struct Params input_params(int argc, char **argv) {
-    struct Params p;
-    p.m_size        = 163840;
-    p.n_size        = 4096;
-    p.n_warmup      = 1;
-    p.n_reps        = 3;
+struct Params input_params(int argc, char **argv)
+{
+	struct Params p;
+	p.m_size = 163840;
+	p.n_size = 4096;
+	p.n_warmup = 1;
+	p.n_reps = 3;
 
-    int opt;
-    while((opt = getopt(argc, argv, "hm:n:w:e:")) >= 0) {
-        switch(opt) {
-            case 'h':
-                usage();
-                exit(0);
-                break;
-            case 'm': p.m_size        = atoi(optarg); break;
-            case 'n': p.n_size        = atoi(optarg); break;
-            case 'w': p.n_warmup      = atoi(optarg); break;
-            case 'e': p.n_reps        = atoi(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, "hm:n:w:e:")) >= 0) {
+		switch (opt) {
+		case 'h':
+			usage();
+			exit(0);
+			break;
+		case 'm':
+			p.m_size = atoi(optarg);
+			break;
+		case 'n':
+			p.n_size = atoi(optarg);
+			break;
+		case 'w':
+			p.n_warmup = atoi(optarg);
+			break;
+		case 'e':
+			p.n_reps = atoi(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/MLP/support/timer.h b/MLP/support/timer.h
index 886380a..961ed11 100755
--- a/MLP/support/timer.h
+++ b/MLP/support/timer.h
@@ -1,62 +1,69 @@
-/*

- * 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[5];

-    struct timeval stopTime[5];

-    double         time[5];

-

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

-    //printf("Time (ms): %f\t",((timer->stopTime[i].tv_sec - timer->startTime[i].tv_sec) * 1000000.0 +

-    //                  (timer->stopTime[i].tv_usec - timer->startTime[i].tv_usec)) / 1000);

- 

-}

-

-void print(Timer *timer, int i, int REP) { printf("%f\t", timer->time[i] / (1000 * REP)); }

+/*
+ * 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[5];
+	struct timeval stopTime[5];
+	double time[5];
+
+} 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);
+	//printf("Time (ms): %f\t",((timer->stopTime[i].tv_sec - timer->startTime[i].tv_sec) * 1000000.0 +
+	//                  (timer->stopTime[i].tv_usec - timer->startTime[i].tv_usec)) / 1000);
+
+}
+
+void print(Timer *timer, int i, int REP)
+{
+	printf("%f\t", timer->time[i] / (1000 * REP));
+}