Changeset 2223c80 for benchmark

Timestamp:

May 13, 2020, 6:34:09 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

365cb03f, 9c438546

Parents:

856fe3e (diff), 979df46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• benchmark/io/readv.cfa (modified) (3 diffs)

benchmark/io/readv.cfa

@@ -59 +59 @@
         unsigned long int nthreads = 2;
         unsigned long int nprocs   = 1;
-        int flags = 0;
+        unsigned flags = 0;
+        unsigned sublen = 16;
 
         arg_loop:
         for(;;) {
                 static struct option options[] = {
-                        {"duration",   required_argument, 0, 'd'},
-                        {"nthreads",   required_argument, 0, 't'},
-                        {"nprocs",     required_argument, 0, 'p'},
-                        {"bufsize",    required_argument, 0, 'b'},
-                        {"userthread", no_argument      , 0, 'u'},
+                        {"duration",     required_argument, 0, 'd'},
+                        {"nthreads",     required_argument, 0, 't'},
+                        {"nprocs",       required_argument, 0, 'p'},
+                        {"bufsize",      required_argument, 0, 'b'},
+                        {"userthread",   no_argument      , 0, 'u'},
+                        {"submitthread", no_argument      , 0, 's'},
+                        {"submitlength", required_argument, 0, 'l'},
                         {0, 0, 0, 0}
                 };
 
                 int idx = 0;
-                int opt = getopt_long(argc, argv, "d:t:p:b:u", options, &idx);
+                int opt = getopt_long(argc, argv, "d:t:p:b:usl:", options, &idx);
 
                 const char * arg = optarg ? optarg : "";
@@ -113 +116 @@
                                 flags |= CFA_CLUSTER_IO_POLLER_USER_THREAD;
                                 break;
+                        case 's':
+                                flags |= CFA_CLUSTER_IO_POLLER_THREAD_SUBMITS;
+                                break;
+                        case 'l':
+                                sublen = strtoul(arg, &end, 10);
+                                if(*end != '\0' && sublen < 16) {
+                                        fprintf(stderr, "Submit length must be at least 16, was %s\n", arg);
+                                        goto usage;
+                                }
+                                flags |= (sublen << CFA_CLUSTER_IO_BUFFLEN_OFFSET);
+                                break;
                         // Other cases
                         default: /* ? */
@@ -123 +137 @@
                                 fprintf(stderr, "  -p, --nprocs=NPROCS      Number of kernel threads\n");
                                 fprintf(stderr, "  -b, --buflen=SIZE        Number of bytes to read per request\n");
+                                fprintf(stderr, "  -u, --userthread         If set, cluster uses user-thread to poll I/O\n");
+                                fprintf(stderr, "  -s, --submitthread       If set, cluster uses polling thread to submit I/O\n");
                                 exit(EXIT_FAILURE);
                 }