Changeset e2f601f for tests/zombies/linked-list-perf

Timestamp:

May 13, 2021, 3:49:30 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

aff7e86, c457dc41

Parents:

8cd5434 (diff), 69914cbc (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:

tests/zombies/linked-list-perf

Files:

• experiment.koad (modified) (1 diff)
• mike-old.hfa (added)

tests/zombies/linked-list-perf/experiment.koad

@@ -49 +49 @@
 #elif defined IMPL_CFA_MIKE_OLD
 
+        #include "mike-old.hfa"
+        struct S {
+                int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD
+                DLISTED_MGD_IMPL_IN(S)
+        };
+        DLISTED_MGD_IMPL_OUT(S)
+
+#elif defined IMPL_CFA_MIKE_POC
+
+        #include "mike-proto-list.hfa"
+        struct S {
+                int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD
+                inline dlink(S);
+        };
+        P9_EMBEDDED( S, dlink(S) )
+
+#elif defined IMPL_CFA_MIKE_NEW
+
         #include <containers/list.hfa>
-        struct S {
-                int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD
-                DLISTED_MGD_IMPL_IN(S)
-        };
-        DLISTED_MGD_IMPL_OUT(S)
-
-#elif defined IMPL_CFA_MIKE_POC
-
-        #include "mike-proto-list.hfa"
-        struct S {
-                int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD
-                inline dlink(S);
-        };
-        P9_EMBEDDED( S, dlink(S) )
-
-#elif defined IMPL_CFA_MIKE_NEW
-
-        #include <containers/list2.hfa>
         struct S {
                 int f[64]; // FIXME: make "is volatile" consistent; given bug #TBD