Changeset 27c9767 for libcfa/src/device/cpu.cfa

Timestamp:

Jun 15, 2021, 4:46:07 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

5e2ed05

Parents:

cb5c392 (diff), 45fde9f (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) (2 diffs)

libcfa/src/device/cpu.cfa

@@ -253 +253 @@
         }
 
-        #if defined(__CFA_WITH_VERIFY__)
-                // Check widths are consistent
-                for(i; 1~cpus) {
-                        for(j; cache_levels) {
-                                verify(raw[0][j].width == raw[i][j].width);
-                        }
-                }
-        #endif
-
         return raw;
 }
@@ -349 +340 @@
                 [maps, map_cnt] =  distinct_llcs(cpus, cache_levels - llc, raw);
 
-                /* paranoid */ verify((map_cnt * raw[0][cache_levels - llc].width) == cpus);
+                #if defined(__CFA_WITH_VERIFY__)
+                {
+                        unsigned width = 0;
+                        for(i; map_cnt) {
+                                const char * _;
+                                width += read_width(maps[i], strlen(maps[i]), &_);
+                        }
+                        verify(width == cpus);
+                }
+                #endif
 
                 // Get mappings from cpu to cache instance