Changeset dd4e2d7

Timestamp:

May 8, 2020, 2:42:15 PM (5 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:

6c12fd28

Parents:

0335620

Message:

Added option to change the length of the array of ready sqe

Files:

• benchmark/io/readv.cfa (modified) (3 diffs)
• libcfa/src/concurrency/io.cfa (modified) (5 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel.hfa (modified) (2 diffs)
• libcfa/src/concurrency/kernel_private.hfa (modified) (1 diff)

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:
@@ -70 +71 @@
                         {"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:us", options, &idx);
+                int opt = getopt_long(argc, argv, "d:t:p:b:usl:", options, &idx);
 
                 const char * arg = optarg ? optarg : "";
@@ -116 +118 @@
                         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

libcfa/src/concurrency/io.cfa

@@ -20 +20 @@
 
 #if !defined(HAVE_LINUX_IO_URING_H)
-        void __kernel_io_startup( cluster &, int, bool ) {
+        void __kernel_io_startup( cluster &, unsigned, bool ) {
                 // Nothing to do without io_uring
         }
@@ -205 +205 @@
 // I/O Startup / Shutdown logic
 //=============================================================================================
-        void __kernel_io_startup( cluster & this, int io_flags, bool main_cluster ) {
+        void __kernel_io_startup( cluster & this, unsigned io_flags, bool main_cluster ) {
                 this.io = malloc();
 
@@ -280 +280 @@
 
                 if( io_flags & CFA_CLUSTER_IO_POLLER_THREAD_SUBMITS ) {
-                        sq.ready_cnt = 32;
+                        sq.ready_cnt = max(io_flags >> CFA_CLUSTER_IO_BUFFLEN_OFFSET, 8);
                         sq.ready = alloc_align( 64, sq.ready_cnt );
                         for(i; sq.ready_cnt) {
@@ -753 +753 @@
                                 __atomic_fetch_add( &ring.submit_q.stats.look_avg.cnt,   1,     __ATOMIC_RELAXED );
                         #endif
+
+                        __cfadbg_print_safe( io, "Kernel I/O : Added %u to ready for %p\n", idx, active_thread() );
                 }
                 else {
@@ -781 +783 @@
 
                         unlock(ring.submit_q.lock);
-                }
-                // Make sure that idx was submitted
-                // Be careful to not get false positive if we cycled the entire list or that someone else submitted for us
-                __cfadbg_print_safe( io, "Kernel I/O : Performed io_submit for %p, returned %d\n", active_thread(), ret );
+
+                        __cfadbg_print_safe( io, "Kernel I/O : Performed io_submit for %p, returned %d\n", active_thread(), ret );
+                }
         }
 

libcfa/src/concurrency/kernel.cfa

@@ -256 +256 @@
 }
 
-void ?{}(cluster & this, const char name[], Duration preemption_rate, int io_flags) with( this ) {
+void ?{}(cluster & this, const char name[], Duration preemption_rate, unsigned io_flags) with( this ) {
         this.name = name;
         this.preemption_rate = preemption_rate;

libcfa/src/concurrency/kernel.hfa

@@ -119 +119 @@
 #define CFA_CLUSTER_IO_POLLER_THREAD_SUBMITS 1 << 1 // 0x2
 // #define CFA_CLUSTER_IO_POLLER_KERNEL_SIDE 1 << 2 // 0x4
+#define CFA_CLUSTER_IO_BUFFLEN_OFFSET        16
 
 //-----------------------------------------------------------------------------
@@ -160 +161 @@
 extern Duration default_preemption();
 
-void ?{} (cluster & this, const char name[], Duration preemption_rate, int flags);
+void ?{} (cluster & this, const char name[], Duration preemption_rate, unsigned flags);
 void ^?{}(cluster & this);
 
-static inline void ?{} (cluster & this)                                      { this{"Anonymous Cluster", default_preemption(), 0}; }
-static inline void ?{} (cluster & this, Duration preemption_rate)            { this{"Anonymous Cluster", preemption_rate, 0}; }
-static inline void ?{} (cluster & this, const char name[])                   { this{name, default_preemption(), 0}; }
-static inline void ?{} (cluster & this, int flags)                           { this{"Anonymous Cluster", default_preemption(), flags}; }
-static inline void ?{} (cluster & this, Duration preemption_rate, int flags) { this{"Anonymous Cluster", preemption_rate, flags}; }
-static inline void ?{} (cluster & this, const char name[], int flags)        { this{name, default_preemption(), flags}; }
+static inline void ?{} (cluster & this)                                           { this{"Anonymous Cluster", default_preemption(), 0}; }
+static inline void ?{} (cluster & this, Duration preemption_rate)                 { this{"Anonymous Cluster", preemption_rate, 0}; }
+static inline void ?{} (cluster & this, const char name[])                        { this{name, default_preemption(), 0}; }
+static inline void ?{} (cluster & this, unsigned flags)                           { this{"Anonymous Cluster", default_preemption(), flags}; }
+static inline void ?{} (cluster & this, Duration preemption_rate, unsigned flags) { this{"Anonymous Cluster", preemption_rate, flags}; }
+static inline void ?{} (cluster & this, const char name[], unsigned flags)        { this{name, default_preemption(), flags}; }
 
 static inline [cluster *&, cluster *& ] __get( cluster & this ) __attribute__((const)) { return this.node.[next, prev]; }

libcfa/src/concurrency/kernel_private.hfa

@@ -77 +77 @@
 //-----------------------------------------------------------------------------
 // I/O
-void __kernel_io_startup     ( cluster &, int, bool );
+void __kernel_io_startup     ( cluster &, unsigned, bool );
 void __kernel_io_finish_start( cluster & );
 void __kernel_io_prepare_stop( cluster & );