From 1b0bc8c6ce08eb934d05f068db0ee02a1a3497dd Mon Sep 17 00:00:00 2001 From: xin Date: Tue, 22 Jan 2019 15:02:53 -0600 Subject: [PATCH 01/15] fix make error for buiding without conceputual --- src/workload/codes-conc-addon.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/workload/codes-conc-addon.c b/src/workload/codes-conc-addon.c index 73592e9f..6b1d2ae8 100644 --- a/src/workload/codes-conc-addon.c +++ b/src/workload/codes-conc-addon.c @@ -8,7 +8,7 @@ #include #include - +#ifdef USE_CONC /* list of available benchmarks begin */ extern struct codes_conceptual_bench bisect_bench; extern struct codes_conceptual_bench cosmoflow_bench; @@ -16,9 +16,11 @@ extern struct codes_conceptual_bench hotpotato_bench; extern struct codes_conceptual_bench latencyall_bench; extern struct codes_conceptual_bench latency_bench; /* list of available benchmarks end */ +#endif static struct codes_conceptual_bench const * bench_array_default[] = { +#ifdef USE_CONC /* default benchmarks begin */ &bisect_bench, &cosmoflow_bench, @@ -26,6 +28,7 @@ static struct codes_conceptual_bench const * bench_array_default[] = &latencyall_bench, &latency_bench, /* default benchmarks end */ +#endif NULL }; From 2bafea6dddf8b7d14c21d13c4f28224ac0131919 Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Tue, 22 Jan 2019 15:09:29 -0600 Subject: [PATCH 02/15] Delete bisect.c --- scripts/conceptual_benchmarks/bisect.c | 1277 ------------------------ 1 file changed, 1277 deletions(-) delete mode 100644 scripts/conceptual_benchmarks/bisect.c diff --git a/scripts/conceptual_benchmarks/bisect.c b/scripts/conceptual_benchmarks/bisect.c deleted file mode 100644 index 26595494..00000000 --- a/scripts/conceptual_benchmarks/bisect.c +++ /dev/null @@ -1,1277 +0,0 @@ -/********************************************************************** - * This file was generated by coNCePTuaL on Mon Jan 7 23:10:02 2019 - * using the c_mpi backend (C + MPI). - * Do not modify this file; modify /Users/xin/macworkspace/codes-dev/codes/scripts/conceptual_benchmarks/bisect.ncptl instead. - * - * Entire source program - * --------------------- - * ################################################### - * # Measure random bisection-bandwidth patterns # - * # By Scott Pakin # - * # # - * # Inspired by Hoefler, Schneider, and Lumsdaine's # - * # "Multistage Switches are not Crossbars" paper # - * ################################################### - * - * Require language version "1.5". - * - * nummsgs is "Number of messages per trial" and comes from "--nummsgs" or "-n" with default 100. - * wups is "Number of warmup messages" and comes from "--wups" or "-w" with default 3. - * msgsize is "Message size in bytes" and comes from "--bytes" or "-b" with default 1M. - * numtrials is "Number of bisection patterns" and comes from "--trials" or "-t" with default 5000. - * rounding is "Round measurements to the nearest N" and comes from "--round" or "-r" with default 5. - * - * For each trial in {1, ..., numtrials} { - * task 0 is assigned to processor 0 then - * task 0 outputs "Testing random bisection pattern " and trial and "/" and numtrials then - * all tasks are assigned to a random processor then - * tasks src such that src is even send wups msgsize-byte messages to task src+1 then - * all tasks synchronize then - * all tasks reset their counters then - * tasks src such that src is even send nummsgs msgsize-byte messages to task src+1 then - * all tasks synchronize then - * all tasks log a histogram of rounding*round(total_bytes*1E6/(elapsed_usecs*1M)/rounding) as "Bandwidth (MiB/s)" - * } - **********************************************************************/ - -/***************** - * Include files * - *****************/ - -/* Header files needed by all C-based backends */ -#include -#include -#include - -/* Header files specific to the c_mpi backend */ -#include -#include - -/********** - * Macros * - **********/ - -/* Define the maximum loop trip count that we're willing to unroll fully. */ -#define CONC_MAX_UNROLL 5 - -/* Specify the minimum number of trial iterations in each FOR