Changeset 5434d04
- Timestamp:
- Oct 30, 2017, 6:24:31 PM (6 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- e1e8408, fa477f7
- Parents:
- 2ba0bc7 (diff), 8a48f4b (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. - Files:
-
- 1 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
src/benchmark/Makefile.am
r2ba0bc7 r5434d04 97 97 98 98 mutex-function$(EXEEXT): 99 @BACKEND_CC@ mutex/function.c -DBENCH_N=500000000-I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}99 @BACKEND_CC@ mutex/function.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} 100 100 101 101 mutex-pthread_lock$(EXEEXT): 102 @BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000-I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}102 @BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} 103 103 104 104 mutex-upp$(EXEEXT): 105 u++ mutex/upp.cc -DBENCH_N=50000000-I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags}105 u++ mutex/upp.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} 106 106 107 107 mutex-cfa1$(EXEEXT): 108 ${CC} mutex/cfa1.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}108 ${CC} mutex/cfa1.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 109 109 110 110 mutex-cfa2$(EXEEXT): 111 ${CC} mutex/cfa2.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}111 ${CC} mutex/cfa2.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 112 112 113 113 mutex-cfa4$(EXEEXT): 114 ${CC} mutex/cfa4.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}114 ${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 115 115 116 116 ## ========================================================================================================= … … 122 122 123 123 signal-upp$(EXEEXT): 124 u++ schedint/upp.cc -DBENCH_N=5000000 0-I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags}124 u++ schedint/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} 125 125 126 126 signal-cfa1$(EXEEXT): -
src/benchmark/Makefile.in
r2ba0bc7 r5434d04 510 510 511 511 mutex-function$(EXEEXT): 512 @BACKEND_CC@ mutex/function.c -DBENCH_N=500000000-I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}512 @BACKEND_CC@ mutex/function.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} 513 513 514 514 mutex-pthread_lock$(EXEEXT): 515 @BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000-I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}515 @BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} 516 516 517 517 mutex-upp$(EXEEXT): 518 u++ mutex/upp.cc -DBENCH_N=50000000-I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags}518 u++ mutex/upp.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} 519 519 520 520 mutex-cfa1$(EXEEXT): 521 ${CC} mutex/cfa1.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}521 ${CC} mutex/cfa1.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 522 522 523 523 mutex-cfa2$(EXEEXT): 524 ${CC} mutex/cfa2.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}524 ${CC} mutex/cfa2.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 525 525 526 526 mutex-cfa4$(EXEEXT): 527 ${CC} mutex/cfa4.c -DBENCH_N=5000000-I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}527 ${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} 528 528 529 529 signal$(EXEEXT) :\ … … 534 534 535 535 signal-upp$(EXEEXT): 536 u++ schedint/upp.cc -DBENCH_N=5000000 0-I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags}536 u++ schedint/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} 537 537 538 538 signal-cfa1$(EXEEXT): -
src/benchmark/mutex/function.c
r2ba0bc7 r5434d04 3 3 #include "bench.h" 4 4 5 void __attribute__((noinline)) call() {} 5 void __attribute__((noinline)) do_call() { 6 asm volatile (""); 7 } 6 8 7 9 int main(int argc, char* argv[]) { 8 10 BENCH( 9 11 for (size_t i = 0; i < n; i++) { 10 call();12 do_call(); 11 13 }, 12 14 result -
src/benchmark/schedext/cfa1.c
r2ba0bc7 r5434d04 40 40 argc = margc; 41 41 argv = margv; 42 processor p;43 42 T t; 44 43 return wait(m1); -
src/benchmark/schedext/cfa2.c
r2ba0bc7 r5434d04 40 40 argc = margc; 41 41 argv = margv; 42 processor p;43 42 T t; 44 43 return wait(m1, m2); -
src/benchmark/schedext/cfa4.c
r2ba0bc7 r5434d04 40 40 argc = margc; 41 41 argv = margv; 42 processor p;43 42 T t; 44 43 return wait(m1, m2, m3, m4); -
src/benchmark/schedext/upp.cc
r2ba0bc7 r5434d04 39 39 argc = margc; 40 40 argv = margv; 41 uProcessor p;42 41 T t; 43 42 return m.wait(); -
src/benchmark/schedint/cfa1.c
r2ba0bc7 r5434d04 43 43 argc = margc; 44 44 argv = margv; 45 processor p;46 45 T t; 47 46 return wait(m1); -
src/benchmark/schedint/cfa2.c
r2ba0bc7 r5434d04 43 43 argc = margc; 44 44 argv = margv; 45 processor p;46 45 T t; 47 46 return wait(m1, m2); -
src/benchmark/schedint/cfa4.c
r2ba0bc7 r5434d04 43 43 argc = margc; 44 44 argv = margv; 45 processor p;46 45 T t; 47 46 return wait(m1, m2, m3, m4); -
src/benchmark/schedint/upp.cc
r2ba0bc7 r5434d04 42 42 argc = margc; 43 43 argv = margv; 44 uProcessor p;45 44 T t; 46 45 return m.wait(); -
src/libcfa/concurrency/monitor.c
r2ba0bc7 r5434d04 21 21 #include "kernel_private.h" 22 22 23 #include "bits/algorithms.h" 24 23 25 //----------------------------------------------------------------------------- 24 26 // Forward declarations … … 291 293 292 294 // Sort monitors based on address -> TODO use a sort specialized for small numbers 293 qsort(this.m, count);295 __libcfa_small_sort(this.m, count); 294 296 295 297 // Save previous thread context … … 492 494 set_owner( monitors, count, signallee ); 493 495 496 LIB_DEBUG_PRINT_BUFFER_DECL( "Kernel : signal_block condition %p (s: %p)\n", this, signallee ); 497 494 498 //Everything is ready to go to sleep 495 499 BlockInternal( locks, count, &signallee, 1 ); … … 498 502 // WE WOKE UP 499 503 504 505 LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : signal_block returned\n" ); 500 506 501 507 //We are back, restore the masks and recursions … … 869 875 short size = 0; 870 876 for( int i = 0; i < mask.size; i++ ) { 871 qsort( mask.clauses[i].list, mask.clauses[i].size );877 __libcfa_small_sort( mask.clauses[i].list, mask.clauses[i].size ); 872 878 for( int j = 0; j < mask.clauses[i].size; j++) { 873 879 insert_unique( storage, size, mask.clauses[i].list[j] ); … … 875 881 } 876 882 // TODO insertion sort instead of this 877 qsort( storage, size );883 __libcfa_small_sort( storage, size ); 878 884 return size; 879 885 } -
tools/stat.py
r2ba0bc7 r5434d04 14 14 content.remove(max(content)) 15 15 content.remove(min(content)) 16 print "median {0} avg {1} stddev {2}".format( numpy.median(content), numpy.mean(content), numpy.std(content) ) 16 med = numpy.around( numpy.median(content), decimals=1) 17 avg = numpy.around( numpy.mean (content), decimals=2) 18 std = numpy.around( numpy.std (content), decimals=2) 19 print "median {0} avg {1} stddev {2}".format( med, avg, std ) 17 20 18 21
Note: See TracChangeset
for help on using the changeset viewer.