Changeset 5bcdc8c

Timestamp:

Aug 11, 2020, 3:00:21 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

cd02108

Parents:

7f6e9eb

Message:

Upgraded yield benchmark to use new parseargs

Location:

benchmark

Files:

• benchcltr.hfa (modified) (2 diffs)
• readyQ/yield.cfa (modified) (1 diff)

benchmark/benchcltr.hfa

@@ -22 +22 @@
         {"procstat",     no_argument      , 0, 'P'}, \
         {"viewhalts",    no_argument      , 0, 'V'},
-
-#define BENCH_DECL \
-        double duration = 5; \
-        int nprocs = 1; \
-        int nthreads = 1;
 
 #define BENCH_OPT_CASE \
@@ -60 +55 @@
                 break;
 
+double duration = 5;
+int nprocs = 1;
+int nthreads = 1;
 bool silent = false;
+bool continuous = false;
 bool procstats = false;
 bool viewhalts = false;
 
+#define BENCH_OPT_CFA \
+        {'d', "duration",  "Duration of the experiments in seconds", duration }, \
+        {'t', "nthreads",  "Number of threads to use", nthreads }, \
+        {'p', "nprocs",    "Number of processors to use", nprocs }, \
+        {'S', "nostats",   "Don't print statistics", silent, parse_settrue }, \
+        {'C', "constats",  "Regularly print statistics", continuous, parse_settrue }, \
+        {'P', "procstat",  "Print statistics for each processors", procstats, parse_settrue }, \
+        {'V', "viewhalts", "Visualize halts, prints timestamp and Processor id for each halt.", viewhalts, parse_settrue },
+
 #ifdef __cforall
+#include <parseargs.hfa>
+
 struct cluster * the_benchmark_cluster = 0p;
 struct BenchCluster {

benchmark/readyQ/yield.cfa

@@ -43 +43 @@
 
 int main(int argc, char * argv[]) {
-        BENCH_DECL
         unsigned num_io = 1;
         io_context_params params;
 
-        for(;;) {
-                static struct option options[] = {
-                        BENCH_OPT_LONG
-                        {0, 0, 0, 0}
-                };
+        cfa_option opt[] = {
+                BENCH_OPT_CFA
+        };
+        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
 
-                int idx = 0;
-                int opt = getopt_long(argc, argv, BENCH_OPT_SHORT, options, &idx);
-
-                const char * arg = optarg ? optarg : "";
-                char * end;
-                switch(opt) {
-                        case -1:
-                                goto run;
-                        BENCH_OPT_CASE
-                        default: /* ? */
-                                fprintf( stderr, "Unkown option '%c'\n", opt);
-                        usage:
-                                bench_usage( argv );
-                                exit(1);
-                }
-        }
-        run:
+        char **left;
+        parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]...\ncforall yield benchmark", left );
 
         {