Changeset ae151cf for libcfa/src/concurrency/kernel/cluster.hfa

Timestamp:

Oct 2, 2022, 10:00:43 PM (6 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

815943f

Parents:

f704974 (diff), f92e7b9 (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:

• libcfa/src/concurrency/kernel/cluster.hfa (modified) (4 diffs)

libcfa/src/concurrency/kernel/cluster.hfa

@@ -21 +21 @@
 #include <limits.h>
 
+#include "clock.hfa"
+
 //-----------------------------------------------------------------------
 // Calc moving average based on existing average, before and current time.
-static inline unsigned long long moving_average(unsigned long long currtsc, unsigned long long instsc, unsigned long long old_avg) {
-        /* paranoid */ verifyf( old_avg < 15000000000000, "Suspiciously large previous average: %'llu (%llx)\n", old_avg, old_avg );
+static inline unsigned long long moving_average(unsigned long long currtsc, unsigned long long instsc, unsigned long long old_avg, bool strict) {
+        (void)strict; // disable the warning around the fact this is unused in release.
+        /* paranoid */ warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'ldms \n", old_avg, old_avg, program()`ms );
 
         const unsigned long long new_val = currtsc > instsc ? currtsc - instsc : 0;
@@ -31 +34 @@
         const unsigned long long old_weight = total_weight - new_weight;
         const unsigned long long ret = ((new_weight * new_val) + (old_weight * old_avg)) / total_weight;
+
+        /* paranoid */ warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'ldms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, instsc, new_val, new_val / 1000000, old_avg );
         return ret;
 }
 
-static inline void touch_tsc(__timestamp_t * tscs, size_t idx, unsigned long long ts_prev, unsigned long long ts_next) {
+static inline void touch_tsc(__timestamp_t * tscs, size_t idx, unsigned long long ts_prev, unsigned long long ts_next, bool strict) {
         if (ts_next == ULLONG_MAX) return;
         unsigned long long now = rdtscl();
         unsigned long long pma = __atomic_load_n(&tscs[ idx ].t.ma, __ATOMIC_RELAXED);
         __atomic_store_n(&tscs[ idx ].t.tv, ts_next, __ATOMIC_RELAXED);
-        __atomic_store_n(&tscs[ idx ].t.ma, moving_average(now, ts_prev, pma), __ATOMIC_RELAXED);
+        __atomic_store_n(&tscs[ idx ].t.ma, moving_average(now, ts_prev, pma, strict), __ATOMIC_RELAXED);
 }
 
@@ -51 +56 @@
         Data_t * data,
         __timestamp_t * tscs,
-        const unsigned shard_factor
+        const unsigned shard_factor,
+        bool strict
 ) {
         unsigned start = procid;
@@ -59 +65 @@
                 if(ptsc != ULLONG_MAX) {
                         /* paranoid */ verify( start + i < count );
-                        unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].t.ma);
+                        unsigned long long tsc = moving_average(ctsc, ptsc, tscs[start + i].t.ma, strict);
                         if(tsc > max) max = tsc;
                 }