Changeset 6ff08d8 for tools

Timestamp:

Jul 12, 2021, 1:44:35 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

605673f, 9345684

Parents:

cf444b6 (diff), a953c2e3 (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

Location:

tools

Files:

• gdb/utils-gdb.py (modified) (4 diffs)
• perf/process_stat_array.py (modified) (3 diffs)
• vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json (modified) (1 diff)

tools/gdb/utils-gdb.py

@@ -53 +53 @@
         return CfaTypes(cluster_ptr = gdb.lookup_type('struct cluster').pointer(),
                 processor_ptr = gdb.lookup_type('struct processor').pointer(),
-                thread_ptr = gdb.lookup_type('struct $thread').pointer(),
+                thread_ptr = gdb.lookup_type('struct thread$').pointer(),
                 int_ptr = gdb.lookup_type('int').pointer(),
                 thread_state = gdb.lookup_type('enum __Coroutine_State'),
@@ -163 +163 @@
 
 def thread_for_pthread(pthrd):
-        return tls_for_pthread(pthrd)['_X11this_threadVPS7$thread_1']
+        return tls_for_pthread(pthrd)['_X11this_threadVPS7thread$_1']
 
 def thread_for_proc(proc):
-        return tls_for_proc(proc)['_X11this_threadVPS7$thread_1']
+        return tls_for_proc(proc)['_X11this_threadVPS7thread$_1']
 
 
@@ -216 +216 @@
 
                 cfa_t = get_cfa_types()
-                root = cluster['_X7threadsS8__dllist_S7$thread__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
+                root = cluster['_X7threadsS8__dllist_S7thread$__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
 
                 if root == 0x0 or root.address == 0x0:
@@ -313 +313 @@
                 ))
                 tls = tls_for_proc( processor )
-                thrd = tls['_X11this_threadVPS7$thread_1']
+                thrd = tls['_X11this_threadVPS7thread$_1']
                 if thrd != 0x0:
                         tname = '{} {}'.format(thrd['self_cor']['name'].string(), str(thrd))

tools/perf/process_stat_array.py

@@ -31 +31 @@
                 with open(os.path.join(root, filename), 'r') as file:
                         for line in file:
-                                data = [int(x.strip()) for x in line.split(',')]
+                                # data = [int(x.strip()) for x in line.split(',')]
+                                data = [int(line.strip())]
                                 data = [me, *data]
                                 merged.append(data)
@@ -53 +54 @@
 
 # merge the data
-for (me, time, value) in merged:
+# for (me, time, value) in merged:
+for (me, value) in merged:
         # check now much this changes
         old = counters[me]
@@ -61 +63 @@
         # add change to the current
         curr = curr + change
-        single.append( (time, curr) )
+        single.append( value )
 
         pass
 
+print(single)
+
+# single = sorted(single)[:len(single)-100]
+# ms = max(single)
+# single = [float(x) / 2500.0 for x in single]
+
 #print
-for t, v in single:
-        print([t, v])
+# for t, v in single:
+#       print([t, v])
+# print(len(single))
+# print(max(single))
+# print(min(single))
+
+# bins = [0, 5.37751600e+04, 1.06903320e+05, 1.60031480e+05, 2.13159640e+05, 2.66287800e+05, 3.19415960e+05, 3.72544120e+05, 4.25672280e+05, 4.78800440e+05, 5.31928600e+05, 5.85056760e+05, 6.38184920e+05, 6.91313080e+05, 7.44441240e+05, 7.97569400e+05, 8.50697560e+05, 9.03825720e+05, 9.56953880e+05, 1.01008204e+06, 1.06321020e+06, 1.11633836e+06, 1.16946652e+06, 1.22259468e+06, 1.27572284e+06, 1.32885100e+06, 1.38197916e+06, 1.43510732e+06, 1.48823548e+06, 1.54136364e+06, 1.59449180e+06, 1.64761996e+06, 1.70074812e+06, 1.75387628e+06, 1.80700444e+06, 1.86013260e+06, 1.91326076e+06, 1.96638892e+06, 2.01951708e+06, 2.07264524e+06, 2.12577340e+06, 2.17890156e+06, 2.23202972e+06, 2.28515788e+06, 2.33828604e+06, 2.39141420e+06, 2.44454236e+06, 2.49767052e+06, 2.55079868e+06, 2.60392684e+06, 3.0e+06]
+# # bins = [float(x) / 2500.0 for x in bins]
+# # print([round(b, 2) for b in bins])
+
+# import numpy
+# # hist1, _ = numpy.histogram(single, density=True, bins=50)
+# hist2, _ = numpy.histogram(single, density=True, bins=bins)
+# # print(hist1)
+# print([1000.0 * h for h in hist2])
+# # for v in single:
+# #     print([v])

tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json

@@ -206 +206 @@
                                         "patterns": [
                                                         { "match": "(\\b|^|\\s)(void|bool|char|short|int|long|signed|unsigned|float|double)(\\b|$|\\s)", "name": "storage.type.built-in.primitive.cfa"},
-                                                        { "match": "(\\b|^|\\s)(zero_t|one_t|size_t|ssize_t|intptr_t|uintptr_t|\\$thread|\\$coroutine|\\$generator|\\$monitor)(\\b|$|\\s)", "name": "storage.type.built-in.cfa"},
+                                                        { "match": "(\\b|^|\\s)(zero_t|one_t|size_t|ssize_t|intptr_t|uintptr_t|thread\\$|coroutine\\$|generator\\$|monitor\\$)(\\b|$|\\s)", "name": "storage.type.built-in.cfa"},
                                                         { "match": "(\\b|^|\\s)(extern|static|inline|volatile|const|thread_local)(\\b|$|\\s)", "name": "storage.modifier.cfa"}
                                         ]