Changeset 2316525 for benchmark/schedext

Timestamp:

Jan 19, 2020, 4:16:27 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

f090750

Parents:

9e63a2b

Message:

update benchmarks for concurrency paper

Location:

benchmark/schedext

Files:

• cfa1.cfa (modified) (2 diffs)
• cfa2.cfa (modified) (2 diffs)
• cfa4.cfa (modified) (2 diffs)
• upp.cc (modified) (2 diffs)

benchmark/schedext/cfa1.cfa ¶

@@ -4 +4 @@
 #include <stdio.h>
 
-#include "bench.h"
+#include "../bench.h"
 
 volatile int go = 0;
 
-monitor M {};
-M m1;
+monitor M {} m1;
 
-void __attribute__((noinline)) call( M & mutex a1 ) {}
+void __attribute__((noinline)) call( M & mutex p1 ) {}
 
-int  __attribute__((noinline)) wait( M & mutex a1 ) {
+void __attribute__((noinline)) wait( M & mutex p1 ) {
         go = 1;
-        for ( i; times ) {
-                waitfor(call : a1);
+        for ( times ) {
+                waitfor( call : p1 );
         }
         go = 0;
-        return 0;
 }
 
 thread T {};
-void ^?{}( T & mutex this ) {}
 void main( T & ) {
-        while(go == 0) { yield(); }
+        while ( go == 0 ) { yield(); }
         BENCH(
-                while(go == 1) { call(m1); },
+                while ( go == 1 ) { call( m1 ); },
                 result
         )
@@ -36 +33 @@
         BENCH_START()
         T t;
-        return wait( m1 );
+        wait( m1 );
 }
 

benchmark/schedext/cfa2.cfa ¶

@@ -8 +8 @@
 volatile int go = 0;
 
-monitor M {};
-M m1, m2;
+monitor M {} m1, m2;
 
-void __attribute__((noinline)) call( M & mutex a1, M & mutex a2 ) {}
+void __attribute__((noinline)) call( M & mutex p1, M & mutex p2 ) {}
 
-int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2 ) {
+void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2 ) {
         go = 1;
-        for ( i; times ) {
-                waitfor(call : a1, a2);
+        for ( times ) {
+                waitfor( call : p1, p2 );
         }
         go = 0;
-        return 0;
 }
 
 thread T {};
-void ^?{}( T & mutex this ) {}
 void main( T & ) {
-        while(go == 0) { yield(); }
+        while( go == 0 ) { yield(); }
         BENCH(
-                while(go == 1) { call(m1, m2); },
+                while ( go == 1 ) { call( m1, m2 ); },
                 result
         )
@@ -36 +33 @@
         BENCH_START()
         T t;
-        return wait( m1, m2 );
+        wait( m1, m2 );
 }
 

benchmark/schedext/cfa4.cfa ¶

@@ -8 +8 @@
 volatile int go = 0;
 
-monitor M {};
-M m1, m2, m3, m4;
+monitor M {} m1, m2, m3, m4;
 
-void __attribute__((noinline)) call( M & mutex a1, M & mutex a2, M & mutex a3, M & mutex a4 ) {}
+void __attribute__((noinline)) call( M & mutex p1, M & mutex p2, M & mutex p3, M & mutex p4 ) {}
 
-int  __attribute__((noinline)) wait( M & mutex a1, M & mutex a2, M & mutex a3, M & mutex a4 ) {
+void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2, M & mutex p3, M & mutex p4 ) {
         go = 1;
-        for ( i; times ) {
-                waitfor( call : a1, a2, a3, a4 );
+        for ( times ) {
+                waitfor( call : p1, p2, p3, p4 );
         }
         go = 0;
-        return 0;
 }
 
 thread T {};
-void ^?{}( T & mutex this ) {}
 void main( T & ) {
-        while(go == 0) { yield(); }
+        while( go == 0 ) { yield(); }
         BENCH(
-                while(go == 1) { call(m1, m2, m3, m4); },
+                while( go == 1 ) { call( m1, m2, m3, m4 ); },
                 result
         )
@@ -36 +33 @@
         BENCH_START()
         T t;
-        return wait( m1, m2, m3, m4 );
+        wait( m1, m2, m3, m4 );
 }
 

benchmark/schedext/upp.cc ¶

@@ -11 +11 @@
         int __attribute__((noinline)) wait() {
                 go = 1;
-                for (size_t i = 0; i < times; i++) {
+                for ( size_t i = 0; i < times; i++ ) {
                         _Accept(call);
                 }
@@ -17 +17 @@
                 return 0;
         }
-};
-
-M m;
+} m;
 
 _Task T {
         void main() {
-                while(go == 0) { yield(); }
+                while ( go == 0 ) { yield(); }
                 BENCH(
-                        while(go == 1) { m.call(); },
+                        while ( go == 1 ) { m.call(); },
                         result
                 )