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.am

    r09f357e r4f7b418  
    1111## Created On       : Sun May 31 09:08:15 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon Jan 20 11:50:13 2020
    14 ## Update Count     : 244
     13## Last Modified On : Sat Jan 25 09:20:44 2020
     14## Update Count     : 255
    1515###############################################################################
    1616
     
    7575.ONESHELL:              # use one shell to execute recipe
    7676.NOTPARALLEL:
    77 .PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv signal.csv
    78 
    79 ## =========================================================================================================
    80 
    81 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
     77.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     78
     79## =========================================================================================================
     80
     81all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
    8282
    8383basic_loop_DURATION = 15000000000
     
    8989ctxswitch_rust_thread_DURATION = $(ctxswitch_pthread_DURATION)
    9090ctxswitch_cfa_generator_DURATION = 5000000000
     91ctxswitch_nodejs_await_DURATION = 5000000
    9192ctxswitch_DURATION = 100000000
    9293
    93 mutex_java_DURATION = 10000000
     94#mutex_java_DURATION = 10000000
    9495mutex_DURATION = 50000000
    9596
    96 signal_pthread_DURATION = 1000000
    97 signal_java_DURATION = $(signal_pthread_DURATION)
    98 signal_rust_DURATION = $(signal_pthread_DURATION)
    99 signal_DURATION = 10000000
    100 
    101 waitfor_DURATION = 10000000
     97schedint_pthread_DURATION = 1000000
     98schedint_java_DURATION = $(schedint_pthread_DURATION)
     99schedint_rust_DURATION = $(schedint_pthread_DURATION)
     100schedint_DURATION = 10000000
     101
     102schedext_DURATION = 10000000
    102103
    103104creation_pthread_DURATION = 250000
    104 creation_rust_DURATION = ${creation_pthread_DURATION}
     105creation_rust_thread_DURATION = ${creation_pthread_DURATION}
     106creation_java_thread_DURATION = ${creation_pthread_DURATION}
    105107creation_cfa_coroutine_DURATION = 100000000
    106108creation_cfa_coroutine_eager_DURATION = 10000000
     
    151153        +make mutex.csv
    152154        -+make mutex.diff.csv
    153         +make signal.csv
    154         -+make signal.diff.csv
     155        +make schedint.csv
     156        -+make schedint.diff.csv
    155157@DOifskipcompile@
    156158        cat compile.csv
     
    163165        cat mutex.csv
    164166        -cat mutex.diff.csv
    165         cat signal.csv
    166         -cat signal.diff.csv
     167        cat schedint.csv
     168        -cat schedint.diff.csv
    167169
    168170compile.csv:
     
    198200        $(srcdir)/fixcsv.sh $@
    199201
    200 signal.csv:
    201         echo "signal-1,signal-2,waitfor-1,waitfor-2" > $@
    202         +make signal-cfa1.runquiet >> $@ && echo -n ',' >> $@
    203         +make signal-cfa2.runquiet >> $@ && echo -n ',' >> $@
    204         +make waitfor-cfa1.runquiet >> $@ && echo -n ',' >> $@
    205         +make waitfor-cfa2.runquiet >> $@
     202schedint.csv:
     203        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
     204        +make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
     205        +make schedint-cfa2.runquiet >> $@ && echo -n ',' >> $@
     206        +make schedext-cfa1.runquiet >> $@ && echo -n ',' >> $@
     207        +make schedext-cfa2.runquiet >> $@
    206208        $(srcdir)/fixcsv.sh $@
    207209
     
    247249        ctxswitch-python_coroutine.run  \
    248250        ctxswitch-nodejs_coroutine.run  \
     251        ctxswitch-nodejs_await.run      \
    249252        ctxswitch-goroutine_thread.run  \
    250253        ctxswitch-rust_thread.run       \
     
    293296        echo "#!/bin/sh" > a.out
    294297        echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
     298        chmod a+x a.out
     299
     300ctxswitch-nodejs_await$(EXEEXT):
     301        echo "#!/bin/sh" > a.out
     302        echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
    295303        chmod a+x a.out
    296304
     
    351359## =========================================================================================================
    352360
    353 signal$(EXEEXT) :               \
    354         signal-cfa1.run         \
    355         signal-cfa2.run         \
    356         signal-cfa4.run         \
    357         signal-upp.run          \
    358         signal-rust.run         \
    359         signal-java.run         \
    360         signal-pthread.run
    361 
    362 signal-pthread$(EXEEXT):
     361schedint$(EXEEXT) :             \
     362        schedint-cfa1.run       \
     363        schedint-cfa2.run       \
     364        schedint-cfa4.run       \
     365        schedint-upp.run        \
     366        schedint-rust.run       \
     367        schedint-java.run       \
     368        schedint-pthread.run
     369
     370schedint-cfa1$(EXEEXT):
     371        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
     372
     373schedint-cfa2$(EXEEXT):
     374        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
     375
     376schedint-cfa4$(EXEEXT):
     377        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
     378
     379schedint-upp$(EXEEXT):
     380        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedint/upp.cc
     381
     382schedint-rust$(EXEEXT):
     383        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/schedint/rust.rs
     384
     385schedint-java$(EXEEXT):
     386        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     387        echo "#!/bin/sh" > a.out
     388        echo "java JavaThread" >> a.out
     389        chmod a+x a.out
     390
     391schedint-pthread$(EXEEXT):
    363392        $(BENCH_V_CC)$(COMPILE) $(srcdir)/schedint/pthreads.c
    364393
    365 signal-upp$(EXEEXT):
    366         $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedint/upp.cc
    367 
    368 signal-cfa1$(EXEEXT):
    369         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa1.cfa
    370 
    371 signal-cfa2$(EXEEXT):
    372         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa2.cfa
    373 
    374 signal-cfa4$(EXEEXT):
    375         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedint/cfa4.cfa
    376 
    377 signal-rust$(EXEEXT):
    378         $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/schedint/rust.rs
    379 
    380 signal-java$(EXEEXT):
    381         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    382         echo "#!/bin/sh" > a.out
    383         echo "java JavaThread" >> a.out
    384         chmod a+x a.out
    385 
    386 ## =========================================================================================================
    387 
    388 waitfor$(EXEEXT) :              \
    389         waitfor-cfa1.run        \
    390         waitfor-cfa2.run        \
    391         waitfor-cfa4.run        \
    392         waitfor-upp.run
    393 
    394 waitfor-upp$(EXEEXT):
     394## =========================================================================================================
     395
     396schedext$(EXEEXT) :             \
     397        schedext-cfa1.run       \
     398        schedext-cfa2.run       \
     399        schedext-cfa4.run       \
     400        schedext-upp.run        \
     401        schedext-goroutine.run
     402
     403schedext-cfa1$(EXEEXT):
     404        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
     405
     406schedext-cfa2$(EXEEXT):
     407        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
     408
     409schedext-cfa4$(EXEEXT):
     410        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
     411
     412schedext-upp$(EXEEXT):
    395413        $(BENCH_V_UPP)$(UPPCOMPILE) $(srcdir)/schedext/upp.cc
    396414
    397 waitfor-cfa1$(EXEEXT):
    398         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa1.cfa
    399 
    400 waitfor-cfa2$(EXEEXT):
    401         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa2.cfa
    402 
    403 waitfor-cfa4$(EXEEXT):
    404         $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/schedext/cfa4.cfa
     415schedext-goroutine$(EXEEXT):
     416        $(BENCH_V_GOC)go build -o a.out $(srcdir)/schedext/goroutine.go
     417
    405418
    406419## =========================================================================================================
    407420
    408421creation$(EXEEXT) :                             \
     422        creation-cfa_generator.run              \
    409423        creation-cfa_coroutine.run              \
    410424        creation-cfa_coroutine_eager.run        \
     
    419433        creation-pthread.run
    420434
     435creation-cfa_generator$(EXEEXT):
     436        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_gen.cfa
     437
    421438creation-cfa_coroutine$(EXEEXT):
    422439        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/creation/cfa_cor.cfa
     
    450467        $(BENCH_V_RUSTC)rustc -C opt-level=3 -o a.out $(srcdir)/creation/rust_thrd.rs
    451468
    452 creation-java$(EXEEXT):
     469creation-java_thread$(EXEEXT):
    453470        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    454471        echo "#!/bin/sh" > a.out
Note: See TracChangeset for help on using the changeset viewer.