From 935c98b276021d6e2811f4176b09d4e98c22fc98 Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Thu, 16 Jan 2025 08:20:48 +0100 Subject: HST-S: indent -linux --- HST-S/support/common.h | 16 +++--- HST-S/support/params.h | 124 ++++++++++++++++++++++++------------------- HST-S/support/timer.h | 140 ++++++++++++++++++++++++++----------------------- 3 files changed, 152 insertions(+), 128 deletions(-) (limited to 'HST-S/support') diff --git a/HST-S/support/common.h b/HST-S/support/common.h index 30df40d..e0cacbb 100755 --- a/HST-S/support/common.h +++ b/HST-S/support/common.h @@ -13,8 +13,8 @@ // Data type #define T uint32_t -#define DIV 2 // Shift right to divide by sizeof(T) -#define REGS (BLOCK_SIZE >> 2) // 32 bits +#define DIV 2 // Shift right to divide by sizeof(T) +#define REGS (BLOCK_SIZE >> 2) // 32 bits // Pixel depth #define DEPTH 12 @@ -22,19 +22,19 @@ // Structures used by both the host and the dpu to communicate information typedef struct { - uint32_t size; - uint32_t transfer_size; - uint32_t bins; + uint32_t size; + uint32_t transfer_size; + uint32_t bins; enum kernels { - kernel1 = 0, - nr_kernels = 1, + kernel1 = 0, + nr_kernels = 1, } kernel; } dpu_arguments_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/HST-S/support/params.h b/HST-S/support/params.h index e29449b..3028a50 100644 --- a/HST-S/support/params.h +++ b/HST-S/support/params.h @@ -4,64 +4,80 @@ #include "common.h" typedef struct Params { - unsigned int input_size; - unsigned int bins; - int n_warmup; - int n_reps; - const char *file_name; - int exp; - int dpu_s; -}Params; + unsigned int input_size; + unsigned int bins; + int n_warmup; + int n_reps; + const char *file_name; + int exp; + int dpu_s; +} Params; -static void usage() { - fprintf(stderr, - "\nUsage: ./program [options]" - "\n" - "\nGeneral options:" - "\n -h help" - "\n -w # of untimed warmup iterations (default=1)" - "\n -e # of timed repetition iterations (default=3)" - "\n -x Weak (0) or strong (1, 2) scaling (default=0)" - "\n" - "\nBenchmark-specific options:" - "\n -i input size (default=1536*1024 elements)" - "\n -b histogram size (default=256 bins)" - "\n -f input image file (default=../input/image_VanHateren.iml)" - "\n"); +static void usage() +{ + fprintf(stderr, + "\nUsage: ./program [options]" + "\n" + "\nGeneral options:" + "\n -h help" + "\n -w # of untimed warmup iterations (default=1)" + "\n -e # of timed repetition iterations (default=3)" + "\n -x Weak (0) or strong (1, 2) scaling (default=0)" + "\n" + "\nBenchmark-specific options:" + "\n -i input size (default=1536*1024 elements)" + "\n -b histogram size (default=256 bins)" + "\n -f input image file (default=../input/image_VanHateren.iml)" + "\n"); } -struct Params input_params(int argc, char **argv) { - struct Params p; - p.input_size = 1536 * 1024; - p.bins = 256; - p.n_warmup = 1; - p.n_reps = 3; - p.exp = 0; - p.file_name = "./input/image_VanHateren.iml"; - p.dpu_s = 64; +struct Params input_params(int argc, char **argv) +{ + struct Params p; + p.input_size = 1536 * 1024; + p.bins = 256; + p.n_warmup = 1; + p.n_reps = 3; + p.exp = 0; + p.file_name = "./input/image_VanHateren.iml"; + p.dpu_s = 64; - int opt; - while((opt = getopt(argc, argv, "hi:b:w:e:f:x:z:")) >= 0) { - switch(opt) { - case 'h': - usage(); - exit(0); - break; - case 'i': p.input_size = atoi(optarg); break; - case 'b': p.bins = atoi(optarg); break; - case 'w': p.n_warmup = atoi(optarg); break; - case 'e': p.n_reps = atoi(optarg); break; - case 'f': p.file_name = optarg; break; - case 'x': p.exp = atoi(optarg); break; - case 'z': p.dpu_s = 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, "hi:b:w:e:f:x:z:")) >= 0) { + switch (opt) { + case 'h': + usage(); + exit(0); + break; + case 'i': + p.input_size = atoi(optarg); + break; + case 'b': + p.bins = atoi(optarg); + break; + case 'w': + p.n_warmup = atoi(optarg); + break; + case 'e': + p.n_reps = atoi(optarg); + break; + case 'f': + p.file_name = optarg; + break; + case 'x': + p.exp = atoi(optarg); + break; + case 'z': + p.dpu_s = 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/HST-S/support/timer.h b/HST-S/support/timer.h index 4d597b9..df68334 100755 --- a/HST-S/support/timer.h +++ b/HST-S/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 - -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("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"); -} +/* + * 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 + +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("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"); +} -- cgit v1.2.3