Changes in benchmark/Makefile.am [ebb6158:dd1cc02]

File:

• benchmark/Makefile.am (modified) (5 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 $@"
@@ -372 +355 @@
         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
-
 ## =========================================================================================================
 
@@ -600 +537 @@
         rdq-locality-go \
         rdq-locality-fibre \
-        rdq-transfer-cfa \
-        rdq-transfer-tokio
+        rdq-transfer-cfa
 
 rdq-benches:
@@ -607 +543 @@
 
 clean-rdq-benches:
-        rm -rf $(RDQBENCHES) $(builddir)/target go.mod
-
-rdq-%-tokio$(EXEEXT): $(builddir)/target/release/rdq-%-tokio$(EXEEXT)
-        $(BENCH_V_RUSTC)cp $(builddir)/target/release/$(basename $@) $@
-
-$(builddir)/target/release/rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
-        $(BENCH_V_RUSTC)cd $(builddir) && cargo build --release
+        rm -rf $(RDQBENCHES)
+
+rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
+        cd $(builddir) && cargo build --release
+        cp $(builddir)/target/release/$(basename $@) $@
 
 rdq-%-cfa$(EXEEXT): $(srcdir)/readyQ/%.cfa $(srcdir)/readyQ/rq_bench.hfa
@@ -620 +554 @@
 go.mod:
         touch $@
-        go mod edit -module=rdq.bench
+        go mod edit -module=rdqbench
         go get golang.org/x/sync/semaphore
         go get golang.org/x/text/language