Changeset b7d94ac5

Timestamp:

Jul 5, 2021, 4:58:31 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:

e49b6f5

Parents:

8f1a99e

Message:

Last step tools and benchmark

Files:

• benchmark/readyQ/rq_bench.hfa (modified) (3 diffs)
• tools/gdb/utils-gdb.py (modified) (4 diffs)
• tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json (modified) (1 diff)

benchmark/readyQ/rq_bench.hfa

@@ -93 +93 @@
 
 struct __attribute__((aligned(128))) bench_sem {
-        struct $thread * volatile ptr;
+        struct thread$ * volatile ptr;
 };
 
@@ -105 +105 @@
         bool wait(bench_sem & this) {
                 for() {
-                        struct $thread * expected = this.ptr;
+                        struct thread$ * expected = this.ptr;
                         if(expected == 1p) {
                                 if(__atomic_compare_exchange_n(&this.ptr, &expected, 0p, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
@@ -124 +124 @@
         bool post(bench_sem & this) {
                 for() {
-                        struct $thread * expected = this.ptr;
+                        struct thread$ * expected = this.ptr;
                         if(expected == 1p) return false;
                         if(expected == 0p) {

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/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"}
                                         ]