Ignore:
Timestamp:
Sep 27, 2021, 2:09:55 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum
Children:
cc287800
Parents:
4e28d2e9 (diff), 056cbdb (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

    r4e28d2e9 r949339b  
    2121include $(top_srcdir)/tools/build/cfa.make
    2222
    23 AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
     23AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
    2424AM_CFAFLAGS = -quiet -nodebug
    2525AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
    … …  
    197197        $(srcdir)/fixcsv.sh $@
    198198
     199# use --no-print-directory to generate csv appropriately
     200mutexStmt.csv:
     201        echo "building $@"
     202        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" > $@
     203        +make mutexStmt-lock1.runquiet >> $@ && echo -n ',' >> $@
     204        +make mutexStmt-lock2.runquiet >> $@ && echo -n ',' >> $@
     205        +make mutexStmt-lock4.runquiet >> $@ && echo -n ',' >> $@
     206        +make mutexStmt-lock8.runquiet >> $@ && echo -n ',' >> $@
     207        +make mutexStmt-no-stmt-lock1.runquiet >> $@ && echo -n ',' >> $@
     208        +make mutexStmt-no-stmt-lock2.runquiet >> $@ && echo -n ',' >> $@
     209        +make mutexStmt-no-stmt-lock4.runquiet >> $@ && echo -n ',' >> $@
     210        +make mutexStmt-no-stmt-lock8.runquiet >> $@ && echo -n ',' >> $@
     211        +make mutexStmt-monitor1.runquiet >> $@ && echo -n ',' >> $@
     212        +make mutexStmt-monitor2.runquiet >> $@ && echo -n ',' >> $@
     213        +make mutexStmt-monitor4.runquiet >> $@
     214        $(srcdir)/fixcsv.sh $@
     215
    199216schedint.csv:
    200217        echo "building $@"
    … …  
    357374## =========================================================================================================
    358375
     376mutexStmt$(EXEEXT) :                \
     377        mutexStmt-cpp1.run                      \
     378        mutexStmt-cpp2.run                      \
     379        mutexStmt-cpp4.run                      \
     380        mutexStmt-cpp8.run                      \
     381        mutexStmt-java.run                      \
     382        mutexStmt-lock1.run                 \
     383        mutexStmt-lock2.run                 \
     384        mutexStmt-lock4.run                 \
     385        mutexStmt-lock8.run                 \
     386        mutexStmt-no-stmt-lock1.run \
     387        mutexStmt-no-stmt-lock2.run \
     388        mutexStmt-no-stmt-lock4.run \
     389        mutexStmt-no-stmt-lock8.run \
     390        mutexStmt-monitor1.run      \
     391        mutexStmt-monitor2.run      \
     392        mutexStmt-monitor4.run
     393
     394mutexStmt-lock1$(EXEEXT):
     395        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock1.cfa
     396
     397mutexStmt-lock2$(EXEEXT):
     398        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock2.cfa
     399
     400mutexStmt-lock4$(EXEEXT):
     401        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock4.cfa
     402
     403mutexStmt-lock8$(EXEEXT):
     404        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/lock8.cfa
     405
     406mutexStmt-cpp1$(EXEEXT):
     407        $(BENCH_V_CXX)$(CXXCOMPILE) -std=c++17 $(srcdir)/mutexStmt/cpp1.cc
     408
     409mutexStmt-cpp2$(EXEEXT):
     410        $(BENCH_V_CXX)$(CXXCOMPILE) -std=c++17 $(srcdir)/mutexStmt/cpp2.cc
     411
     412mutexStmt-cpp4$(EXEEXT):
     413        $(BENCH_V_CXX)$(CXXCOMPILE) -std=c++17 $(srcdir)/mutexStmt/cpp4.cc
     414
     415mutexStmt-cpp8$(EXEEXT):
     416        $(BENCH_V_CXX)$(CXXCOMPILE) -std=c++17 $(srcdir)/mutexStmt/cpp8.cc
     417
     418mutexStmt-monitor1$(EXEEXT):
     419        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor1.cfa
     420
     421mutexStmt-monitor2$(EXEEXT):
     422        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor2.cfa
     423
     424mutexStmt-monitor4$(EXEEXT):
     425        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/monitor4.cfa
     426
     427mutexStmt-no-stmt-lock1$(EXEEXT):
     428        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock1.cfa
     429
     430mutexStmt-no-stmt-lock2$(EXEEXT):
     431        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock2.cfa
     432
     433mutexStmt-no-stmt-lock4$(EXEEXT):
     434        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock4.cfa
     435
     436mutexStmt-no-stmt-lock8$(EXEEXT):
     437        $(BENCH_V_CFA)$(CFACOMPILE) $(srcdir)/mutexStmt/no_stmt_lock8.cfa
     438
     439mutexStmt-java$(EXEEXT):
     440        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutexStmt/JavaThread.java
     441        echo "#!/bin/sh" > a.out
     442        echo "java JavaThread \"$$""@\"" >> a.out
     443        chmod a+x a.out
     444
     445## =========================================================================================================
     446
    359447schedint$(EXEEXT) :             \
    360448        schedint-cfa1.run       \
    … …  
    524612## =========================================================================================================
    525613
    526 %-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
    527         cd $(builddir) && cargo build --release
    528         cp $(builddir)/target/release/$(basename $@) $@
     614RDQBENCHES = \
     615        rdq-cycle-cfa \
     616        rdq-cycle-tokio \
     617        rdq-cycle-go \
     618        rdq-cycle-fibre \
     619        rdq-yield-cfa \
     620        rdq-yield-tokio \
     621        rdq-yield-go \
     622        rdq-yield-fibre \
     623        rdq-locality-cfa \
     624        rdq-locality-tokio \
     625        rdq-locality-go \
     626        rdq-locality-fibre \
     627        rdq-transfer-cfa \
     628        rdq-transfer-tokio \
     629        rdq-transfer-go \
     630        rdq-transfer-fibre
     631
     632rdq-benches:
     633        +make $(RDQBENCHES)
     634
     635clean-rdq-benches:
     636        rm -rf $(RDQBENCHES) $(builddir)/target go.mod
     637
     638rdq-%-tokio$(EXEEXT): $(builddir)/target/release/rdq-%-tokio$(EXEEXT)
     639        $(BENCH_V_RUSTC)cp $(builddir)/target/release/$(basename $@) $@
     640
     641$(builddir)/target/release/rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
     642        $(BENCH_V_RUSTC)cd $(builddir) && cargo build --release
     643
     644rdq-%-cfa$(EXEEXT): $(srcdir)/readyQ/%.cfa $(srcdir)/readyQ/rq_bench.hfa
     645        $(BENCH_V_CFA)$(CFACOMPILE) $< -o $@
     646
     647go.mod:
     648        touch $@
     649        go mod edit -module=rdq.bench
     650        go get golang.org/x/sync/semaphore
     651        go get golang.org/x/text/language
     652        go get golang.org/x/text/message
     653
     654rdq-%-go$(EXEEXT): $(srcdir)/readyQ/%.go $(srcdir)/readyQ/bench.go go.mod
     655        $(BENCH_V_GOC)go build -o $@ $< $(srcdir)/readyQ/bench.go
     656
     657rdq-%-fibre$(EXEEXT): $(srcdir)/readyQ/%.cpp
     658        $(BENCH_V_CXX)$(CXXCOMPILE) $< -o $@ -lfibre -std=c++17 $(AM_CFLAGS)
     659
     660# ## =========================================================================================================
     661
     662CLEANFILES = $(RDQBENCHES) go.mod go.sum
     663
     664clean-local:
     665        -rm -rf target
Note: See TracChangeset for help on using the changeset viewer.