Changeset 00f5fde for libcfa/src/device

Timestamp:

Jan 12, 2022, 9:30:48 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

42daeb4

Parents:

1959528 (diff), 07a1e7a (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.

git-author:

Peter A. Buhr <pabuhr@…> (01/12/22 18:35:04)

git-committer:

Peter A. Buhr <pabuhr@…> (01/12/22 21:30:48)

Message:

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

Location:

libcfa/src/device

Files:

• cpu.cfa (modified) (1 diff)
• cpu.hfa (modified) (1 diff)

libcfa/src/device/cpu.cfa

@@ -427 +427 @@
                         unsigned c = pairings[i].cpu;
                         unsigned llc_id = pairings[i].id;
-                        unsigned width = maps[llc_id].raw->width;
                         unsigned start = maps[llc_id].start;
-                        unsigned self  = start + (maps[llc_id].count++);
-                        entries[c].count = width;
+                        entries[c].count = maps[llc_id].raw->width;
                         entries[c].start = start;
-                        entries[c].self  = self;
+                        entries[c].self  = start + (maps[llc_id].count++);
+                        entries[c].cache = llc_id;
                 }
 

libcfa/src/device/cpu.hfa

@@ -16 +16 @@
 #include <stddef.h>
 
+// Map from cpu entry to a structure detailling cpus with common topologies
+// Note that the cpu-groups are contiguous so the indexing is different from
+// the cpu indexing
 struct cpu_map_entry_t {
+        // Where this particular cpu is in the group
         unsigned self;
+
+        // Starting index of the cpus with the same topology
         unsigned start;
+
+        // Number of cpus with the same topology
         unsigned count;
+
+        // Index of the cache this entry describes
+        unsigned cache;
 };