Changeset df7597e0

Timestamp:

Jun 17, 2021, 10:32:53 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

07b4970

Parents:

cf85f96

Message:

Fix the cpu-based ready to actually use cpu_info
rather then being a stupider work stealing approach.

File:

• libcfa/src/concurrency/ready_queue.cfa (modified) (3 diffs)

libcfa/src/concurrency/ready_queue.cfa

@@ -256 +256 @@
                 /* paranoid */ verify(cpu * READYQ_SHARD_FACTOR < lanes.count);
 
-                const int start = cpu * READYQ_SHARD_FACTOR;
+                const cpu_map_entry_t & map = cpu_info.llc_map[cpu];
+                /* paranoid */ verify(map.start * READYQ_SHARD_FACTOR < lanes.count);
+                /* paranoid */ verify(map.self * READYQ_SHARD_FACTOR < lanes.count);
+                /* paranoid */ verifyf((map.start + map.count) * READYQ_SHARD_FACTOR <= lanes.count, "have %u lanes but map can go up to %u", lanes.count, (map.start + map.count) * READYQ_SHARD_FACTOR);
+
+                const int start = map.self * READYQ_SHARD_FACTOR;
                 unsigned i;
                 do {
@@ -288 +293 @@
                 const int cpu = __kernel_getcpu();
                 /* paranoid */ verify(cpu >= 0);
+                /* paranoid */ verify(cpu < cpu_info.hthrd_count);
                 /* paranoid */ verify(cpu * READYQ_SHARD_FACTOR < lanes.count);
-                /* paranoid */ verify(cpu < cpu_info.hthrd_count);
+
+                const cpu_map_entry_t & map = cpu_info.llc_map[cpu];
+                /* paranoid */ verify(map.start * READYQ_SHARD_FACTOR < lanes.count);
+                /* paranoid */ verify(map.self * READYQ_SHARD_FACTOR < lanes.count);
+                /* paranoid */ verifyf((map.start + map.count) * READYQ_SHARD_FACTOR <= lanes.count, "have %u lanes but map can go up to %u", lanes.count, (map.start + map.count) * READYQ_SHARD_FACTOR);
 
                 processor * const proc = kernelTLS().this_processor;
-                const int start = cpu * READYQ_SHARD_FACTOR;
+                const int start = map.self * READYQ_SHARD_FACTOR;
 
                 // Did we already have a help target
@@ -303 +313 @@
                         }
                         proc->rdq.cutoff = min;
-                        proc->rdq.target = __tls_rand() % lanes.count;
+                        proc->rdq.target = (map.start * READYQ_SHARD_FACTOR) + (__tls_rand() % (map.count* READYQ_SHARD_FACTOR));
                 }
                 else {