tests/benchmark: Remove urcu-signal benchmark tests

In preparation for deprecation of the urcu-signal flavor, remove the
urcu-signal benchmark tests.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I6824862353b8a14a244d2a882cf8a8cef2f48739

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 97000929f4c187e4e8198a0dc8ac39a0bf50e913..e5ce2e9860bb6c8560d1665ab33b4dff9026b04b 100644 (file)
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -40,13 +40,12 @@ dist_noinst_DATA = \
        urcu_30_seconds.tap
 
 noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
-       test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
         test_rwlock_timing test_rwlock test_perthreadlock_timing \
-        test_perthreadlock test_urcu_yield test_urcu_signal_yield test_urcu_mb \
+        test_perthreadlock test_urcu_yield test_urcu_mb \
         test_urcu_qsbr_timing test_urcu_qsbr \
-       test_mutex test_looplen test_urcu_gc test_urcu_signal_gc \
+       test_mutex test_looplen test_urcu_gc \
        test_urcu_lgc \
-        test_urcu_mb_gc test_urcu_qsbr_gc test_urcu_qsbr_lgc test_urcu_signal_lgc \
+        test_urcu_mb_gc test_urcu_qsbr_gc test_urcu_qsbr_lgc \
         test_urcu_mb_lgc test_urcu_qsbr_dynamic_link test_urcu_defer \
         test_urcu_assign test_urcu_assign_dynamic_link \
         test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \
@@ -62,7 +61,6 @@ URCU_COMMON_LIB=$(top_builddir)/src/liburcu-common.la
 URCU_LIB=$(top_builddir)/src/liburcu.la
 URCU_QSBR_LIB=$(top_builddir)/src/liburcu-qsbr.la
 URCU_MB_LIB=$(top_builddir)/src/liburcu-mb.la
-URCU_SIGNAL_LIB=$(top_builddir)/src/liburcu-signal.la
 URCU_BP_LIB=$(top_builddir)/src/liburcu-bp.la
 URCU_CDS_LIB=$(top_builddir)/src/liburcu-cds.la
 
@@ -95,34 +93,17 @@ test_urcu_mb_LDADD = $(URCU_MB_LIB)
 test_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
 
-test_urcu_signal_SOURCES = test_urcu.c common-states.c
-test_urcu_signal_LDADD = $(URCU_SIGNAL_LIB)
-test_urcu_signal_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
-
-test_urcu_signal_dynamic_link_SOURCES = test_urcu.c common-states.c
-test_urcu_signal_dynamic_link_LDADD = $(URCU_SIGNAL_LIB)
-test_urcu_signal_dynamic_link_CFLAGS = -DRCU_SIGNAL -DDYNAMIC_LINK_TEST \
-                                       $(AM_CFLAGS)
-
-test_urcu_signal_timing_SOURCES = test_urcu_timing.c common-states.c
-test_urcu_signal_timing_LDADD = $(URCU_SIGNAL_LIB)
-test_urcu_signal_timing_CFLAGS= -DRCU_SIGNAL $(AM_CFLAGS)
-
-test_urcu_signal_yield_SOURCES = test_urcu.c common-states.c
-test_urcu_signal_yield_LDADD = $(URCU_SIGNAL_LIB) $(DEBUG_YIELD_LIB)
-test_urcu_signal_yield_CFLAGS = -DRCU_SIGNAL -DDEBUG_YIELD $(AM_CFLAGS)
-
 test_rwlock_timing_SOURCES = test_rwlock_timing.c common-states.c
-test_rwlock_timing_LDADD = $(URCU_SIGNAL_LIB)
+test_rwlock_timing_LDADD = $(URCU_LIB)
 
 test_rwlock_SOURCES = test_rwlock.c common-states.c
-test_rwlock_LDADD = $(URCU_SIGNAL_LIB)
+test_rwlock_LDADD = $(URCU_LIB)
 
 test_perthreadlock_timing_SOURCES = test_perthreadlock_timing.c common-states.c
-test_perthreadlock_timing_LDADD = $(URCU_SIGNAL_LIB)
+test_perthreadlock_timing_LDADD = $(URCU_LIB)
 
 test_perthreadlock_SOURCES = test_perthreadlock.c common-states.c
-test_perthreadlock_LDADD = $(URCU_SIGNAL_LIB)
+test_perthreadlock_LDADD = $(URCU_LIB)
 
 test_mutex_SOURCES = test_mutex.c common-states.c
 
@@ -131,10 +112,6 @@ test_looplen_SOURCES = test_looplen.c common-states.c
 test_urcu_gc_SOURCES = test_urcu_gc.c common-states.c
 test_urcu_gc_LDADD = $(URCU_LIB)
 
-test_urcu_signal_gc_SOURCES = test_urcu_gc.c common-states.c
-test_urcu_signal_gc_LDADD = $(URCU_SIGNAL_LIB)
-test_urcu_signal_gc_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
-
 test_urcu_mb_gc_SOURCES = test_urcu_gc.c common-states.c
 test_urcu_mb_gc_LDADD = $(URCU_MB_LIB)
 test_urcu_mb_gc_CFLAGS = -DRCU_MB $(AM_CFLAGS)
@@ -150,10 +127,6 @@ test_urcu_lgc_SOURCES = test_urcu_gc.c common-states.c
 test_urcu_lgc_LDADD = $(URCU_LIB)
 test_urcu_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS)
 
-test_urcu_signal_lgc_SOURCES = test_urcu_gc.c common-states.c
-test_urcu_signal_lgc_LDADD = $(URCU_SIGNAL_LIB)
-test_urcu_signal_lgc_CFLAGS = -DRCU_SIGNAL -DTEST_LOCAL_GC $(AM_CFLAGS)
-
 test_urcu_mb_lgc_SOURCES = test_urcu_gc.c common-states.c
 test_urcu_mb_lgc_LDADD = $(URCU_MB_LIB)
 test_urcu_mb_lgc_CFLAGS = -DTEST_LOCAL_GC -DRCU_MB $(AM_CFLAGS)

diff --git a/tests/benchmark/run-urcu-tests.sh b/tests/benchmark/run-urcu-tests.sh
index f06fa1ecfa6834dea0d2a83ed9db7858c142ad18..13347ee1ce159843326564a3dcc6e04083a756de 100755 (executable)
--- a/tests/benchmark/run-urcu-tests.sh
+++ b/tests/benchmark/run-urcu-tests.sh
@@ -39,10 +39,10 @@ if [[ ${NUM_CPUS} -lt 4 ]]; then
 fi
 
 # batch: 19 * 1 = 19
-# fraction: 15 * 29 =
-# scalabilit NUM_CPUS * 15
-# reader 15 * 23 =
-NUM_TESTS=$(( 19 + 435 + ( NUM_CPUS * 15 ) + 345 ))
+# fraction: 12 * 29 =
+# scalabilit NUM_CPUS * 12
+# reader 12 * 23 =
+NUM_TESTS=$(( 19 + 348 + ( NUM_CPUS * 12 ) + 276 ))
 
 plan_tests     ${NUM_TESTS}
 
@@ -90,9 +90,9 @@ for BATCH_SIZE in ${BATCH_ARRAY}; do
        done
 done
 
-TEST_ARRAY="test_urcu_gc test_urcu_signal_gc test_urcu_mb_gc test_urcu_qsbr_gc
-            test_urcu_lgc test_urcu_signal_lgc test_urcu_mb_lgc test_urcu_qsbr_lgc
-            test_urcu test_urcu_signal test_urcu_mb test_urcu_qsbr
+TEST_ARRAY="test_urcu_gc test_urcu_mb_gc test_urcu_qsbr_gc
+            test_urcu_lgc test_urcu_mb_lgc test_urcu_qsbr_lgc
+            test_urcu test_urcu_mb test_urcu_qsbr
             test_rwlock test_perthreadlock test_mutex"
 
 #setting gc each 32768. ** UPDATE FOR YOUR ARCHITECTURE BASED ON TEST ABOVE **

diff --git a/tests/benchmark/runtests.sh b/tests/benchmark/runtests.sh
index 5b0c2ed78b4b26666a68acfb0ddcbc5d9433b3a0..761a5476b5c0f2f6db614624b94e9f585c04a7df 100755 (executable)
--- a/tests/benchmark/runtests.sh
+++ b/tests/benchmark/runtests.sh
@@ -25,13 +25,13 @@ TMPFILE=$(mktemp)
 trap 'rm -f "$TMPFILE"; _exit' EXIT
 
 
-NUM_TESTS=15
+NUM_TESTS=12
 
 plan_tests     ${NUM_TESTS}
 
-for a in test_urcu_gc test_urcu_signal_gc test_urcu_mb_gc test_urcu_qsbr_gc \
-       test_urcu_lgc test_urcu_signal_lgc test_urcu_mb_lgc test_urcu_qsbr_lgc \
-       test_urcu test_urcu_signal test_urcu_mb test_urcu_qsbr \
+for a in test_urcu_gc test_urcu_mb_gc test_urcu_qsbr_gc \
+       test_urcu_lgc test_urcu_mb_lgc test_urcu_qsbr_lgc \
+       test_urcu test_urcu_mb test_urcu_qsbr \
        test_rwlock test_perthreadlock test_mutex; do
        okx ${URCU_TESTS_TIME_BIN} "$URCU_TESTS_BUILDDIR/benchmark/${a}" "$@" 2>"${TMPFILE}"
        diag "time: $(cat "${TMPFILE}")"