X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Frun-urcu-tests.sh;h=751514a7a6525069ea56a8c315e56431c9a3f980;hp=6e6cf606f81f158588d4b5fdd41415cf13bf6aa0;hb=bd23a6c64e8ccff9a666441958e34793748ebd3a;hpb=ad46005890368f9c306f0c510b3d4b08c47b66f8

diff --git a/tests/benchmark/run-urcu-tests.sh b/tests/benchmark/run-urcu-tests.sh
index 6e6cf60..751514a 100755
--- a/tests/benchmark/run-urcu-tests.sh
+++ b/tests/benchmark/run-urcu-tests.sh
@@ -1,22 +1,42 @@
 #!/bin/bash
 
-source ../utils/tap.sh
-
-NUM_TESTS=103
+#first parameter: seconds per test
+DURATION=$1
 
-plan_tests	${NUM_TESTS}
+if [ "x${DURATION}" = "x" ]; then
+	echo "usage: $0 [DURATION]"
+	exit 1
+fi
 
-#run all tests
-diag "Executing URCU tests"
+. ../utils/tap.sh
+. ./common.sh
+
+NUM_CPUS="1"
+for i in nproc gnproc; do
+	NUM_CPUS=$($i 2>/dev/null)
+	if [ "$?" -eq "0" ]; then
+		break
+	else
+		NUM_CPUS="1"
+	fi
+done
 
 #set to number of active CPUS
-NUM_CPUS=$(nproc)
 if [[ ${NUM_CPUS} -lt 4 ]]; then
 	NUM_CPUS=4	# Floor at 4 due to following assumptions.
 fi
 
-#first parameter: seconds per test
-DURATION=$1
+# batch: 19 * 1 = 19
+# fraction: 15 * 29 =
+# scalabilit NUM_CPUS * 15
+# reader 15 * 23 =
+NUM_TESTS=$(( 19 + 435 + ( NUM_CPUS * 15 ) + 345 ))
+
+plan_tests	${NUM_TESTS}
+
+#run all tests
+diag "Executing URCU tests"
+
 
 #extra options, e.g. for setting affinity on even CPUs :
 #EXTRA_OPTS=$(for a in $(seq 0 2 127); do echo -n "-a ${a} "; done)
@@ -42,13 +62,26 @@ diag "Executing batch RCU test"
 
 BATCH_ARRAY="1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536
 	     131072 262144"
-NR_WRITERS=$((${NUM_CPUS} / 2))
+BATCH_TEST_ARRAY="test_urcu_gc"
+
+NR_WRITERS=$((NUM_CPUS / 2))
+NR_READERS=$((NUM_CPUS - NR_WRITERS))
 
-NR_READERS=$((${NUM_CPUS} - ${NR_WRITERS}))
 for BATCH_SIZE in ${BATCH_ARRAY}; do
-	okx ./runtests-batch.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} -d 0 -b ${BATCH_SIZE} ${EXTRA_OPTS}
+	for TEST in ${BATCH_TEST_ARRAY}; do
+		okx ${TEST_TIME_BIN} ./"${TEST}" "${NR_READERS}" "${NR_WRITERS}" "${DURATION}" \
+			-d 0 -b "${BATCH_SIZE}" ${EXTRA_OPTS} 2>"${TMPFILE}"
+		while read line; do
+			echo "## $line"
+		done <"${TMPFILE}"
+	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_rwlock test_perthreadlock test_mutex"
+
 #setting gc each 32768. ** UPDATE FOR YOUR ARCHITECTURE BASED ON TEST ABOVE **
 EXTRA_OPTS="${EXTRA_OPTS} -b 32768"
 
@@ -57,11 +90,17 @@ diag "Executing update fraction test"
 WDELAY_ARRAY="0 1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768
               65536 131072 262144 524288 1048576 2097152 4194304 8388608
               16777216 33554432 67108864 134217728"
-NR_WRITERS=$((${NUM_CPUS} / 2))
+NR_WRITERS=$((NUM_CPUS / 2))
+NR_READERS=$((NUM_CPUS - NR_WRITERS))
 
-NR_READERS=$((${NUM_CPUS} - ${NR_WRITERS}))
 for WDELAY in ${WDELAY_ARRAY}; do
-	okx ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} -d ${WDELAY} ${EXTRA_OPTS}
+	for TEST in ${TEST_ARRAY}; do
+		okx ${TEST_TIME_BIN} ./"${TEST}" "${NR_READERS}" "${NR_WRITERS}" "${DURATION}" \
+			-d "${WDELAY}" ${EXTRA_OPTS} 2>"${TMPFILE}"
+		while read line; do
+			echo "## $line"
+		done <"${TMPFILE}"
+	done
 done
 
 #Test scalability :
@@ -73,8 +112,14 @@ diag "Executing scalability test"
 
 NR_WRITERS=0
 
-for NR_READERS in $(seq 1 ${NUM_CPUS}); do
-	okx ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS}
+for NR_READERS in $(xseq 1 ${NUM_CPUS}); do
+	for TEST in ${TEST_ARRAY}; do
+		okx ${TEST_TIME_BIN} ./"${TEST}" "${NR_READERS}" "${NR_WRITERS}" "${DURATION}" \
+			${EXTRA_OPTS} 2>"${TMPFILE}"
+		while read line; do
+			echo "## $line"
+		done <"${TMPFILE}"
+	done
 done
 
 
@@ -91,5 +136,11 @@ NR_WRITERS=0
 READERCSLEN_ARRAY="0 1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536 131072 262144 524288 1048576 2097152"
 
 for READERCSLEN in ${READERCSLEN_ARRAY}; do
-	okx ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS} -c ${READERCSLEN}
+	for TEST in ${TEST_ARRAY}; do
+		okx ${TEST_TIME_BIN} ./"${TEST}" "${NR_READERS}" "${NR_WRITERS}" "${DURATION}" \
+			-c "${READERCSLEN}" ${EXTRA_OPTS} 2>"${TMPFILE}"
+		while read line; do
+			echo "## $line"
+		done <"${TMPFILE}"
+	done
 done