Changeset c34ebf2

Timestamp:

Jun 25, 2020, 1:34:34 PM (3 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:

8e27ac45

Parents:

c953163

Message:

Processors now have their own print stats flag

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (6 diffs)
• kernel.hfa (modified) (2 diffs)
• stats.cfa (modified) (4 diffs)
• stats.hfa (modified) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -240 +240 @@
         runner.proc = &this;
 
+        #if !defined(__CFA_NO_STATISTICS__)
+                print_stats = false;
+                print_halts = false;
+        #endif
+
         idle{};
 
@@ -293 +298 @@
         #if !defined(__CFA_NO_STATISTICS__)
                 if(this.print_stats) {
-                        __print_stats( this.stats );
+                        __print_stats( this.stats, true, this.name, (void*)&this );
                 }
                 free( this.stats );
@@ -563 +568 @@
         #if !defined(__CFA_NO_STATISTICS__)
                 __tally_stats(proc->cltr->stats, &local_stats);
+                if(proc->print_stats) {
+                        __print_stats( &local_stats, true, proc->name, (void*)proc );
+                }
         #endif
 
@@ -853 +861 @@
                 id = -1u;
 
+                #if !defined(__CFA_NO_STATISTICS__)
+                        print_stats = false;
+                        print_halts = false;
+                #endif
+
                 runner{ &this };
                 __cfadbg_print_safe(runtime_core, "Kernel : constructed main processor context %p\n", &runner);
@@ -1004 +1017 @@
         }
 
+        #if !defined(__CFA_NO_STATISTICS__)
+                if(this->print_halts) {
+                        printf("%d - %lld 0\n", this->id, rdtscl());
+                }
+        #endif
+
         wait( idle );
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                if(this->print_halts) {
+                        printf("%d - %lld 1\n", this->id, rdtscl());
+                }
+        #endif
 }
 
@@ -1190 +1215 @@
         return true;
 }
+
+//-----------------------------------------------------------------------------
+// Statistics
+#if !defined(__CFA_NO_STATISTICS__)
+        void print_halts( processor & this ) {
+                this.print_halts = true;
+                printf("Processor : %d - %s (%p)\n", this.id, this.name, (void*)&this);
+        }
+#endif
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/kernel.hfa

@@ -104 +104 @@
         // Link lists fields
         Link(processor) link;
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                bool print_stats;
+                bool print_halts;
+        #endif
 
 #ifdef __CFA_DEBUG__
@@ -227 +232 @@
                 this.print_stats = true;
         }
+
+        static inline void print_stats_at_exit( processor & this ) {
+                this.print_stats = true;
+        }
+
+        void print_halts( processor & this );
 #endif
 

libcfa/src/concurrency/stats.cfa

@@ -73 +73 @@
         }
 
-        void __print_stats( struct __stats_t * stats ) with( *stats ) {
+        void __print_stats( struct __stats_t * stats, bool cluster, const char * name, void * id ) with( *stats ) {
 
                 double push_sur = (100.0 * ((double)ready.pick.push.success) / ready.pick.push.attempt);
@@ -108 +108 @@
 
                 __cfaabi_bits_print_safe( STDOUT_FILENO,
-                        "----- Ready Q Stats -----\n"
+                        "----- %s \"%s\" (%p) - Ready Q Stats -----\n"
                         "- total threads run      : %'15lu\n"
                         "- total threads scheduled: %'15lu\n"
@@ -121 +121 @@
                         "-- schedule wake         : %'15lu\n"
                         "-- wake on exit          : %'15lu\n"
-                        #if defined(HAVE_LINUX_IO_URING_H)
-                                "\n"
-                                "----- I/O Stats -----\n"
+                        "\n"
+                        , cluster ? "Cluster" : "Processor",  name, id
+                        , ready.pick.pop.success
+                        , ready.pick.push.success
+                        , push_len, push_sur, ready.pick.push.attempt
+                        , pop_len , pop_sur , ready.pick.pop .attempt
+                        , lpush_len, lpush_sur, ready.pick.push.local
+                        , lpop_len , lpop_sur , ready.pick.pop .local
+                        , ready.threads.migration
+                        , ready.sleep.halts, ready.sleep.cancels, ready.sleep.wakes, ready.sleep.exits
+                );
+                #if defined(HAVE_LINUX_IO_URING_H)
+                        __cfaabi_bits_print_safe( STDOUT_FILENO,
+                                "----- %s \"%s\" (%p) - I/O Stats -----\n"
                                 "- total submit calls     : %'15lu\n"
                                 "- avg ready entries      : %'18.2lf\n"
@@ -136 +147 @@
                                 "- total wait calls       : %'15lu   (%'lu slow, %'lu fast)\n"
                                 "- avg completion/wait    : %'18.2lf\n"
-                        #endif
-                        , ready.pick.pop.success
-                        , ready.pick.push.success
-                        , push_len, push_sur, ready.pick.push.attempt
-                        , pop_len , pop_sur , ready.pick.pop .attempt
-                        , lpush_len, lpush_sur, ready.pick.push.local
-                        , lpop_len , lpop_sur , ready.pick.pop .local
-                        , ready.threads.migration
-                        , ready.sleep.halts, ready.sleep.cancels, ready.sleep.wakes, ready.sleep.exits
-                        #if defined(HAVE_LINUX_IO_URING_H)
+                                "\n"
+                                , cluster ? "Cluster" : "Processor",  name, id
                                 , io.submit_q.submit_avg.cnt
-                                , avgrdy
-                                , avgcsm
-                                , avgavl
+                                , avgrdy, avgcsm, avgavl
                                 , io.submit_q.look_avg.cnt
-                                , lavgv
-                                , lavgb
+                                , lavgv, lavgb
                                 , io.submit_q.alloc_avg.cnt
-                                , aavgv
-                                , aavgb
+                                , aavgv, aavgb
                                 , io.complete_q.completed_avg.slow_cnt + io.complete_q.completed_avg.fast_cnt
                                 , io.complete_q.completed_avg.slow_cnt,  io.complete_q.completed_avg.fast_cnt
                                 , ((double)io.complete_q.completed_avg.val) / (io.complete_q.completed_avg.slow_cnt + io.complete_q.completed_avg.fast_cnt)
-                        #endif
-                );
+                        );
+                #endif
         }
 #endif

libcfa/src/concurrency/stats.hfa

@@ -7 +7 @@
         static inline void __init_stats( struct __stats_t * ) {}
         static inline void __tally_stats( struct __stats_t *, struct __stats_t * ) {}
-        static inline void __print_stats( struct __stats_t * ) {}
+        static inline void __print_stats( struct __stats_t *, bool, const char *, void * ) {}
 #else
         struct __attribute__((aligned(64))) __stats_readQ_t {
@@ -96 +96 @@
         void __init_stats ( struct __stats_t * );
         void __tally_stats( struct __stats_t *, struct __stats_t * );
-        void __print_stats( struct __stats_t * );
+        void __print_stats( struct __stats_t *, bool, const char *, void * );
 #endif