Changes in / [5a40e4e:d8d512e]

Files:

• benchmark/Cargo.toml.in (modified) (1 diff)
• benchmark/Makefile.am (modified) (2 diffs)
• benchmark/readyQ/yield.cfa (modified) (1 diff)
• benchmark/readyQ/yield.rs (deleted)
• libcfa/src/Makefile.am (modified) (1 diff)

benchmark/Cargo.toml.in

@@ -6 +6 @@
 
 [[bin]]
-name = "rdq-cycle-tokio"
+name = "cycle-tokio"
 path = "@abs_srcdir@/readyQ/cycle.rs"
 
 [[bin]]
-name = "rdq-locality-tokio"
+name = "locality-tokio"
 path = "@abs_srcdir@/readyQ/locality.rs"
-
-[[bin]]
-name = "rdq-yield-tokio"
-path = "@abs_srcdir@/readyQ/yield.rs"
 
 [features]

benchmark/Makefile.am

@@ -21 +21 @@
 include $(top_srcdir)/tools/build/cfa.make
 
-AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
+AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
 AM_CFAFLAGS = -quiet -nodebug
 AM_UPPFLAGS = -quiet -nodebug -multi -std=c++14
@@ -587 +587 @@
 ## =========================================================================================================
 
-RDQBENCHES = \
-        rdq-cycle-cfa \
-        rdq-cycle-tokio \
-        rdq-cycle-go \
-        rdq-cycle-fibre \
-        rdq-yield-cfa \
-        rdq-yield-tokio \
-        rdq-yield-go \
-        rdq-yield-fibre \
-        rdq-locality-cfa \
-        rdq-locality-tokio \
-        rdq-locality-go \
-        rdq-locality-fibre \
-        rdq-transfer-cfa
-
-rdq-benches:
-        +make $(RDQBENCHES)
-
-clean-rdq-benches:
-        rm -rf $(RDQBENCHES)
-
-rdq-%-tokio$(EXEEXT): $(srcdir)/readyQ/%.rs $(srcdir)/bench.rs
+%-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
-        $(BENCH_V_CFA)$(CFACOMPILE) $< -o $@
-
-go.mod:
-        touch $@
-        go mod edit -module=rdqbench
-        go get golang.org/x/sync/semaphore
-        go get golang.org/x/text/language
-        go get golang.org/x/text/message
-
-rdq-%-go$(EXEEXT): $(srcdir)/readyQ/%.go $(srcdir)/readyQ/bench.go go.mod
-        $(BENCH_V_GOC)go build -o $@ $< $(srcdir)/readyQ/bench.go
-
-rdq-%-fibre$(EXEEXT): $(srcdir)/readyQ/%.cpp
-        $(BENCH_V_CXX)$(CXXCOMPILE) $< -o $@ -lfibre $(AM_CFLAGS)
-
-# ## =========================================================================================================
-
-CLEANFILES = $(RDQBENCHES) go.mod go.sum
-
-clean-local:
-        -rm -rf target

benchmark/readyQ/yield.cfa

@@ -80 +80 @@
                 }
 
-                printf("Duration (ms)       : %'ld\n", (end - start)`ms);
-                printf("Number of processors: %'d\n", nprocs);
-                printf("Number of threads   : %'d\n", nthreads);
-                printf("Total yields        : %'15llu\n", global_counter);
+                printf("Took %'ld ms\n", (end - start)`ms);
                 printf("Yields per second   : %'18.2lf\n", ((double)global_counter) / (end - start)`s);
                 printf("ns per yields       : %'18.2lf\n", ((double)(end - start)`ns) / global_counter);
+                printf("Total yields        : %'15llu\n", global_counter);
                 printf("Yields per procs    : %'15llu\n", global_counter / nprocs);
                 printf("Yields/sec/procs    : %'18.2lf\n", (((double)global_counter) / nprocs) / (end - start)`s);

libcfa/src/Makefile.am

@@ -196 +196 @@
         $(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
-concurrency/io/call.cfa: $(srcdir)/concurrency/io/call.cfa.in
-        ${AM_V_GEN}python3 $< > $@
-
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = ${libsrc}