Changeset 26fd986 for benchmark/schedint

Timestamp:

Jan 21, 2020, 6:14:34 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:

5518719

Parents:

c12869e

Message:

update benchmarks for concurrency paper

Location:

benchmark/schedint

Files:

• JavaThread.java (modified) (1 diff)
• cfa1.cfa (modified) (3 diffs)
• cfa2.cfa (modified) (3 diffs)
• cfa4.cfa (modified) (3 diffs)
• pthreads.c (modified) (2 diffs)
• rust.rs (modified) (1 diff)
• upp.cc (modified) (2 diffs)

benchmark/schedint/JavaThread.java

@@ -63 +63 @@
                 synchronized(m) {
                         s.start();
-                        while( !Monitor.go ) {
+                        while( ! Monitor.go ) { // waiter must start first
                                 Thread.yield();
                         }

benchmark/schedint/cfa1.cfa

@@ -7 +7 @@
 
 volatile int go = 0;
+
 condition c;
 monitor M {} m1;
@@ -13 +14 @@
         signal( c );
 }
-
 void __attribute__((noinline)) wait( M & mutex p1 ) {
         go = 1;
@@ -19 +19 @@
                 wait( c );
         }
-        go = 0;
 }
 
 thread T {};
 void main( T & ) {
-        while ( go == 0 ) { yield(); }
+        while ( go == 0 ) { yield(); } // waiter must start first
         BENCH(
-                while ( go == 1 ) { call( m1 ); },
+                for ( times ) { call( m1 ); },
                 result
         )

benchmark/schedint/cfa2.cfa

@@ -7 +7 @@
 
 volatile int go = 0;
+
 condition c;
 monitor M {} m1, m2;
@@ -13 +14 @@
         signal( c );
 }
-
 void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2 ) {
         go = 1;
@@ -19 +19 @@
                 wait( c );
         }
-        go = 0;
 }
 
 thread T {};
 void main( T & ) {
-        while ( go == 0 ) { yield(); }
+        while ( go == 0 ) { yield(); } // waiter must start first
         BENCH(
-                while ( go == 1 ) { call( m1, m2 ); },
+                for ( times ) { call( m1, m2 ); },
                 result
         )

benchmark/schedint/cfa4.cfa

@@ -4 +4 @@
 #include <stdio.h>
 
-#include "bench.h"
+#include "../bench.h"
 
 volatile int go = 0;
+
 condition c;
 monitor M {} m1, m2, m3, m4;
@@ -13 +14 @@
         signal( c );
 }
-
 void __attribute__((noinline)) wait( M & mutex p1, M & mutex p2, M & mutex p3, M & mutex p4 ) {
         go = 1;
@@ -19 +19 @@
                 wait( c );
         }
-        go = 0;
 }
 
 thread T {};
 void main( T & ) {
-        while ( go == 0 ) { yield(); }
+        while ( go == 0 ) { yield(); } // waiter must start first
         BENCH(
-                while ( go == 1 ) { call( m1, m2, m3, m4 ); },
+                for ( times ) { call( m1, m2, m3, m4 ); },
                 result
         )

benchmark/schedint/pthreads.c

@@ -6 +6 @@
 volatile int go = 0;
 
+pthread_mutex_t m;
 pthread_cond_t c;
-pthread_mutex_t m;
 
 void __attribute__((noinline)) call() {
-        pthread_mutex_lock(&m);
-        pthread_cond_signal(&c);
-        pthread_mutex_unlock(&m);
+        pthread_mutex_lock( &m );
+        pthread_cond_signal( &c );
+        pthread_mutex_unlock( &m );
 }
 
-int  __attribute__((noinline)) wait() {
+void __attribute__((noinline)) wait() {
         pthread_mutex_lock(&m);
         go = 1;
+        for ( size_t i = 0; i < times; i++ ) {
+                pthread_cond_wait( &c, &m );
+        }
+        go = 0;
+        pthread_mutex_unlock( &m );
+}
+
+void * thread_main( __attribute__((unused)) void * arg ) {
+        while ( go == 0 ) { sched_yield(); } // waiter must start first
+        // barging for lock acquire => may not execute N times
         BENCH(
-                for (size_t i = 0; i < times; i++) {
-                        pthread_cond_wait(&c, &m);
-                },
+                while ( go == 1 ) { call(); },
                 result
         )
         printf( "%g\n", result );
-        go = 0;
-        pthread_mutex_unlock(&m);
-        return 0;
-}
-
-void* thread_main(__attribute__((unused)) void * arg ) {
-        while(go == 0) { sched_yield(); }
-        while(go == 1) { call(); }
         return NULL;
 }
@@ -39 +39 @@
         BENCH_START()
         pthread_t thread;
-        if (pthread_create(&thread, NULL, thread_main, NULL) < 0) {
+        if ( pthread_create( &thread, NULL, thread_main, NULL ) < 0 ) {
                 perror( "failure" );
                 return 1;
         }
         wait();
-        if (pthread_join( thread, NULL) < 0) {
+        if ( pthread_join( thread, NULL ) < 0 ) {
                 perror( "failure" );
                 return 1;

benchmark/schedint/rust.rs

@@ -18 +18 @@
 
         let th = thread::spawn( move || {
-                while *m2.lock().unwrap() == 0 {
+                while *m2.lock().unwrap() == 0 { // waiter must start first
                         thread::yield_now();
                 }

benchmark/schedint/upp.cc

@@ -11 +11 @@
                 cond.signal();
         }
+        void __attribute__((noinline)) wait() {
+                go = 1;
+                for ( size_t i = 0; i < times; i++ ) {
+                        cond.wait();
+                }
+        }
+} m;
 
-        int __attribute__((noinline)) wait() {
-                go = 1;
+_Task T {
+        void main() {
+                while ( go == 0 ) { yield(); } // waiter must start first
                 BENCH(
-                        for (size_t i = 0; i < times; i++) {
-                                cond.wait();
+                        for ( size_t i = 0; i < times; i++ ) {
+                                m.call();
                         },
                         result
                 )
                 printf( "%g\n", result );
-                go = 0;
-                return 0;
-        }
-};
-
-M m;
-
-_Task T {
-        void main() {
-                while(go == 0) { yield(); }
-                while(go == 1) { m.call(); }
-
         }
 };
@@ -39 +35 @@
         BENCH_START()
         T t;
-        return m.wait();
+        m.wait();
 }