Ignore:
Timestamp:
Feb 4, 2020, 11:29:22 AM (21 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
52142c2, 9f575ea, bdfc032
Parents:
09f357e (diff), e56eb455 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    r09f357e r4f7b418  
    426426ctxswitch_rust_thread_DURATION = $(ctxswitch_pthread_DURATION)
    427427ctxswitch_cfa_generator_DURATION = 5000000000
     428ctxswitch_nodejs_await_DURATION = 5000000
    428429ctxswitch_DURATION = 100000000
    429 mutex_java_DURATION = 10000000
     430
     431#mutex_java_DURATION = 10000000
    430432mutex_DURATION = 50000000
    431 signal_pthread_DURATION = 1000000
    432 signal_java_DURATION = $(signal_pthread_DURATION)
    433 signal_rust_DURATION = $(signal_pthread_DURATION)
    434 signal_DURATION = 10000000
    435 waitfor_DURATION = 10000000
     433schedint_pthread_DURATION = 1000000
     434schedint_java_DURATION = $(schedint_pthread_DURATION)
     435schedint_rust_DURATION = $(schedint_pthread_DURATION)
     436schedint_DURATION = 10000000
     437schedext_DURATION = 10000000
    436438creation_pthread_DURATION = 250000
    437 creation_rust_DURATION = ${creation_pthread_DURATION}
     439creation_rust_thread_DURATION = ${creation_pthread_DURATION}
     440creation_java_thread_DURATION = ${creation_pthread_DURATION}
    438441creation_cfa_coroutine_DURATION = 100000000
    439442creation_cfa_coroutine_eager_DURATION = 10000000
     
    454457        ctxswitch-cfa_thread2.run ctxswitch-upp_coroutine.run \
    455458        ctxswitch-upp_thread.run ctxswitch-python_coroutine.run \
    456         ctxswitch-nodejs_coroutine.run ctxswitch-goroutine_thread.run \
    457         ctxswitch-rust_thread.run ctxswitch-nodejs_coroutine.run \
    458         ctxswitch-java_thread.run ctxswitch-pthread.run \
    459         $(am__append_1)
     459        ctxswitch-nodejs_coroutine.run ctxswitch-nodejs_await.run \
     460        ctxswitch-goroutine_thread.run ctxswitch-rust_thread.run \
     461        ctxswitch-nodejs_coroutine.run ctxswitch-java_thread.run \
     462        ctxswitch-pthread.run $(am__append_1)
    460463testdir = $(top_srcdir)/tests
    461464all: all-am
     
    784787.ONESHELL:              # use one shell to execute recipe
    785788.NOTPARALLEL:
    786 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
    787 
    788 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
     789.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     790
     791all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
    789792
    790793%.run : %$(EXEEXT) ${REPEAT}
     
    825828        +make mutex.csv
    826829        -+make mutex.diff.csv
    827         +make signal.csv
    828         -+make signal.diff.csv
     830        +make schedint.csv
     831        -+make schedint.diff.csv
    829832@DOifskipcompile@
    830833        cat compile.csv
     
    837840        cat mutex.csv
    838841        -cat mutex.diff.csv
    839         cat signal.csv
    840         -cat signal.diff.csv
     842        cat schedint.csv
     843        -cat schedint.diff.csv
    841844
    842845compile.csv:
     
    872875        $(srcdir)/fixcsv.sh $@
    873876
    874 signal.csv:
    875         echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    876         +make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    877         +make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    878         +make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    879         +make waitfor-cfa2.runquiet >> $@
     877schedint.csv:
     878        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
     879        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
     880        +make schedint-cfa2.runquiet >> $@ && echo -n ',' >> $@
     881        +make schedext-cfa1.runquiet >> $@ && echo -n ',' >> $@
     882        +make schedext-cfa2.runquiet >> $@
    880883        $(srcdir)/fixcsv.sh $@
    881884
     
    935938        echo "#!/bin/sh" > a.out
    936939        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
     940        chmod a+x a.out
     941
     942ctxswitch-nodejs_await$(EXEEXT):
     943        echo "#!/bin/sh" > a.out
     944        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
    937945        chmod a+x a.out
    938946
     
    989997        chmod a+x a.out
    990998
    991 signal$(EXEEXT) :               \
    992         signal-cfa1.run         \
    993         signal-cfa2.run         \
    994         signal-cfa4.run         \
    995         signal-upp.run          \
    996         signal-rust.run         \
    997         signal-java.run         \
    998         signal-pthread.run
    999 
    1000 signal-pthread$(EXEEXT):
    1001         $(BENCH_V_CC)$(COMPILE) $(srcdir)/schedint/pthreads.c
    1002 
    1003 signal-upp$(EXEEXT):
     999schedint$(EXEEXT) :             \
     1000        schedint-cfa1.run       \
     1001        schedint-cfa2.run       \
     1002        schedint-cfa4.run       \
     1003        schedint-upp.run        \
     1004        schedint-rust.run       \
     1005        schedint-java.run       \
     1006        schedint-pthread.run
     1007
     1008schedint-cfa1$(EXEEXT):
     1009        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
     1010
     1011schedint-cfa2$(EXEEXT):
     1012        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
     1013
     1014schedint-cfa4$(EXEEXT):
     1015        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
     1016
     1017schedint-upp$(EXEEXT):
    10041018        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedint/upp.cc
    10051019
    1006 signal-cfa1$(EXEEXT):
    1007         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
    1008 
    1009 signal-cfa2$(EXEEXT):
    1010         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
    1011 
    1012 signal-cfa4$(EXEEXT):
    1013         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
    1014 
    1015 signal-rust$(EXEEXT):
     1020schedint-rust$(EXEEXT):
    10161021        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/schedint/rust.rs
    10171022
    1018 signal-java$(EXEEXT):
     1023schedint-java$(EXEEXT):
    10191024        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    10201025        echo "#!/bin/sh" > a.out
     
    10221027        chmod a+x a.out
    10231028
    1024 waitfor$(EXEEXT) :              \
    1025         waitfor-cfa1.run        \
    1026         waitfor-cfa2.run        \
    1027         waitfor-cfa4.run        \
    1028         waitfor-upp.run
    1029 
    1030 waitfor-upp$(EXEEXT):
     1029schedint-pthread$(EXEEXT):
     1030        $(BENCH_V_CC)$(COMPILE) $(srcdir)/schedint/pthreads.c
     1031
     1032schedext$(EXEEXT) :             \
     1033        schedext-cfa1.run       \
     1034        schedext-cfa2.run       \
     1035        schedext-cfa4.run       \
     1036        schedext-upp.run        \
     1037        schedext-goroutine.run
     1038
     1039schedext-cfa1$(EXEEXT):
     1040        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
     1041
     1042schedext-cfa2$(EXEEXT):
     1043        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
     1044
     1045schedext-cfa4$(EXEEXT):
     1046        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
     1047
     1048schedext-upp$(EXEEXT):
    10311049        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedext/upp.cc
    10321050
    1033 waitfor-cfa1$(EXEEXT):
    1034         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
    1035 
    1036 waitfor-cfa2$(EXEEXT):
    1037         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
    1038 
    1039 waitfor-cfa4$(EXEEXT):
    1040         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
     1051schedext-goroutine$(EXEEXT):
     1052        $(BENCH_V_GOC)go build -o a.out $(srcdir)/schedext/goroutine.go
    10411053
    10421054creation$(EXEEXT) :                             \
     1055        creation-cfa_generator.run              \
    10431056        creation-cfa_coroutine.run              \
    10441057        creation-cfa_coroutine_eager.run        \
     
    10531066        creation-pthread.run
    10541067
     1068creation-cfa_generator$(EXEEXT):
     1069        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_gen.cfa
     1070
    10551071creation-cfa_coroutine$(EXEEXT):
    10561072        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa
     
    10841100        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/creation/rust_thrd.rs
    10851101
    1086 creation-java$(EXEEXT):
     1102creation-java_thread$(EXEEXT):
    10871103        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    10881104        echo "#!/bin/sh" > a.out
Note: See TracChangeset for help on using the changeset viewer.