Changeset 295dd61 for libcfa/src/device/cpu.cfa

Timestamp:

Dec 6, 2021, 5:06:14 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

75873cf

Parents:

813dfd86 (diff), a83012bf (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/device/cpu.cfa (modified) (6 diffs)

libcfa/src/device/cpu.cfa

@@ -135 +135 @@
                 count++;
         }
-        iterate_dir(path, lambda);
+        int ret = iterate_dir(path, lambda);
+        if(ret == ENOTDIR) return 0;
 
         /* paranoid */ verifyf(count == max + 1, "Inconsistent %s count, counted %d, but max %s was %d", prefix, count, prefix, (int)max);
@@ -159 +160 @@
 
         const char * _;
-        int cnt = read_width(buff, r - 1, &_);
-        /* paranoid */ verify(cnt == count_prefix_dirs("/sys/devices/system/cpu", "cpu"));
-        return cnt;
+        return read_width(buff, r - 1, &_);;
 }
 
@@ -226 +225 @@
 
 struct raw_cache_instance {
-        idx_range_t range;
-        unsigned width;
-        unsigned char level;
+        idx_range_t range;      // A text description of the cpus covered
+        unsigned width;         // The number of cpus covered
+        unsigned char level;    // the cache level
         // FIXME add at least size and type
 };
@@ -235 +234 @@
 static void ^?{}(raw_cache_instance & this) { free(this.range);}
 
+// Returns a 2D array of instances of size [cpu count][cache levels]
+// where cache level doesn't include instruction caches
 raw_cache_instance ** build_raw_cache_table(unsigned cpus, unsigned idxs, unsigned cache_levels)
 {
         raw_cache_instance ** raw = alloc(cpus);
+
+        // TODO: this loop is broken, it only works if the present cpu start at 0 and are contiguous which is not guaranteed.
         for(i; cpus) {
-                raw[i] = alloc(cache_levels);
-                void addcache(unsigned fidx, unsigned char level, idx_range_t range, size_t len) {
-                        /* paranoid */ verifyf(level <= cache_levels, "Unexpected cache level %d on cpu %u index %u", (int)level, i, fidx);
-
-                        unsigned idx = cache_levels - level;
-                        raw_cache_instance & r = raw[i][idx];
-                        r.range = strndup(range, len);
-                        r.level = level;
-                        const char * end;
-                        r.width = read_width(range, len, &end);
-                }
-                foreach_cacheidx(i, idxs, addcache);
+                if (cache_levels > 0) {
+                        raw[i] = alloc(cache_levels);
+                        void addcache(unsigned fidx, unsigned char level, idx_range_t range, size_t len) {
+                                /* paranoid */ verifyf(level <= cache_levels, "Unexpected cache level %d on cpu %u index %u", (int)level, i, fidx);
+
+                                unsigned idx = cache_levels - level;
+                                raw_cache_instance & r = raw[i][idx];
+                                r.range = strndup(range, len);
+                                r.level = level;
+                                const char * end;
+                                r.width = read_width(range, len, &end);
+                        }
+                        foreach_cacheidx(i, idxs, addcache);
+                }
+                else {
+                        char buf[128];
+                        snprintf(buf, 128, "0-%u", cpus);
+                        raw[i] = alloc();
+                        raw[i]->range = strndup(buf, 128);
+                        raw[i]->level = 0;
+                        raw[i]->width = cpus;
+                }
         }
 
@@ -333 +346 @@
                 unsigned cache_levels = 0;
                 unsigned llc = 0;
-                {
+                if (idxs != 0) {
                         unsigned char prev = -1u;
                         void first(unsigned idx, unsigned char level, const char * map, size_t len) {
@@ -416 +429 @@
                 cpu_info.llc_map = entries;
                 cpu_info.hthrd_count = cpus;
+                cpu_info.llc_count = map_cnt;
         }