Changes in / [a3cadfc:180f249]

Files:

• benchmark/Makefile.am (modified) (2 diffs)
• benchmark/mutexStmt/lock1.cfa (added)
• benchmark/mutexStmt/lock2.cfa (added)
• benchmark/mutexStmt/lock4.cfa (added)
• benchmark/mutexStmt/lock8.cfa (added)
• benchmark/mutexStmt/monitor1.cfa (added)
• benchmark/mutexStmt/monitor2.cfa (added)
• benchmark/mutexStmt/monitor4.cfa (added)
• benchmark/mutexStmt/no_stmt_lock1.cfa (added)
• benchmark/mutexStmt/no_stmt_lock2.cfa (added)
• benchmark/mutexStmt/no_stmt_lock4.cfa (added)
• benchmark/mutexStmt/no_stmt_lock8.cfa (added)
• libcfa/src/concurrency/locks.hfa (modified) (2 diffs)
• libcfa/src/concurrency/mutex_stmt.hfa (modified) (1 diff)
• src/Concurrency/Keywords.cc (modified) (1 diff)
• tests/concurrent/mutexstmt/locks.cfa (modified) (2 diffs)

benchmark/Makefile.am

@@ -197 +197 @@
         $(srcdir)/fixcsv.sh $@
 
+# use --no-print-directory to generate csv appropriately
+mutexStmt.csv:
+        echo "building $@"
+        echo "1-lock,2-lock,4-lock,8-lock,1-no-stmt-lock,2-no-stmt-lock,4-no-stmt-lock,8-no-stmt-lock,1-monitor,2-monitor,4-monitor" > $@
+        +make mutexStmt-lock1.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-lock2.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-lock4.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-lock8.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-no-stmt-lock1.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-no-stmt-lock2.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-no-stmt-lock4.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-no-stmt-lock8.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-monitor1.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-monitor2.runquiet >> $@ && echo -n ',' >> $@
+        +make mutexStmt-monitor4.runquiet >> $@
+        $(srcdir)/fixcsv.sh $@
+
 schedint.csv:
         echo "building $@"
@@ -355 +372 @@
         chmod a+x a.out
 
+mutexStmt$(EXEEXT) :                \
+        mutexStmt-lock1.run                 \
+        mutexStmt-lock2.run                 \
+        mutexStmt-lock4.run                 \
+        mutexStmt-lock8.run                 \
+        mutexStmt-no-stmt-lock1.run \
+        mutexStmt-no-stmt-lock2.run \
+        mutexStmt-no-stmt-lock4.run \
+        mutexStmt-no-stmt-lock8.run \
+        mutexStmt-monitor1.run      \
+        mutexStmt-monitor2.run      \
+        mutexStmt-monitor4.run
+
+mutexStmt-lock1$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock1.cfa
+
+mutexStmt-lock2$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock2.cfa
+
+mutexStmt-lock4$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock4.cfa
+
+mutexStmt-lock8$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock8.cfa
+
+mutexStmt-monitor1$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor1.cfa
+
+mutexStmt-monitor2$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor2.cfa
+
+mutexStmt-monitor4$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor4.cfa
+
+mutexStmt-no-stmt-lock1$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock1.cfa
+
+mutexStmt-no-stmt-lock2$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock2.cfa
+
+mutexStmt-no-stmt-lock4$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock4.cfa
+
+mutexStmt-no-stmt-lock8$(EXEEXT):
+        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock8.cfa
+
 ## =========================================================================================================
 

libcfa/src/concurrency/locks.hfa

@@ -324 +324 @@
         }
 
-        // linear backoff bounded by spin_count
-        spin = spin_start;
-        int spin_counter = 0;
-        int yield_counter = 0;
-        for ( ;; ) {
-                if(try_lock_contention(this)) return true;
-                if(spin_counter < spin_count) {
-                        for (int i = 0; i < spin; i++) Pause();
-                        if (spin < spin_end) spin += spin;
-                        else spin_counter++;
-                } else if (yield_counter < yield_count) {
-                        // after linear backoff yield yield_count times
-                        yield_counter++;
-                        yield();
-                } else { break; }
-        }
-
-        // block until signalled
-        while (block(this)) if(try_lock_contention(this)) return true;
-
-        // this should never be reached as block(this) always returns true
-        return false;
-}
-
-static inline bool lock_improved(linear_backoff_then_block_lock & this) with(this) {
-        // if owner just return
-        if (active_thread() == owner) return true;
-        size_t compare_val = 0;
-        int spin = spin_start;
-        // linear backoff
-        for( ;; ) {
-                compare_val = 0;
-                if (internal_try_lock(this, compare_val)) return true;
-                if (2 == compare_val) break;
-                for (int i = 0; i < spin; i++) Pause();
-                if (spin >= spin_end) break;
-                spin += spin;
-        }
-
-        // linear backoff bounded by spin_count
-        spin = spin_start;
-        int spin_counter = 0;
-        int yield_counter = 0;
-        for ( ;; ) {
-                compare_val = 0;
-                if(internal_try_lock(this, compare_val)) return true;
-                if (2 == compare_val) break;
-                if(spin_counter < spin_count) {
-                        for (int i = 0; i < spin; i++) Pause();
-                        if (spin < spin_end) spin += spin;
-                        else spin_counter++;
-                } else if (yield_counter < yield_count) {
-                        // after linear backoff yield yield_count times
-                        yield_counter++;
-                        yield();
-                } else { break; }
-        }
-
         if(2 != compare_val && try_lock_contention(this)) return true;
         // block until signalled
@@ -402 +344 @@
 static inline void on_notify(linear_backoff_then_block_lock & this, struct thread$ * t ) { unpark(t); }
 static inline size_t on_wait(linear_backoff_then_block_lock & this) { unlock(this); return 0; }
-static inline void on_wakeup(linear_backoff_then_block_lock & this, size_t recursion ) { lock_improved(this); }
+static inline void on_wakeup(linear_backoff_then_block_lock & this, size_t recursion ) { lock(this); }
 
 //-----------------------------------------------------------------------------

libcfa/src/concurrency/mutex_stmt.hfa

@@ -40 +40 @@
         }
     }
-
-    static inline L * __get_pointer( L & lock ) {
-        return &lock;
-    }
 }

src/Concurrency/Keywords.cc

@@ -1208 +1208 @@
                         new ListInit(
                                 map_range < std::list<Initializer*> > ( args, [](Expression * var ){
-                                        return new SingleInit( new UntypedExpr(
-                                                new NameExpr( "__get_pointer" ),
-                                                { var }
-                                        ) );
+                                        return new SingleInit( new AddressExpr( var ) );
                                 })
                         )

tests/concurrent/mutexstmt/locks.cfa

@@ -4 +4 @@
 const unsigned int num_times = 10000;
 
-owner_lock m1, m2, m3, m4, m5;
+single_acquisition_lock m1, m2, m3, m4, m5;
 
 thread T_Mutex {};
@@ -65 +65 @@
         printf("Start Test: single lock mutual exclusion\n");
         {
-                T_Mutex t[1];
+                T_Mutex t[10];
         }
         printf("End Test: single lock mutual exclusion\n");