Commit fd35be62 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Update scripting to accommodate rcuperf 



This commit adds the scripting changes to add support for the shiny
new rcuperf kernel module.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 274529ba

tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh

0 → 100755
+82 −0
Original line number Diff line number Diff line 
#!/bin/bash

#

# Analyze a given results directory for rcuperf performance measurements.

#

# Usage: kvm-recheck-rcuperf.sh resdir

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, you can access it online at

# http://www.gnu.org/licenses/gpl-2.0.html.

#

# Copyright (C) IBM Corporation, 2016

#

# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>



i="$1"

if test -d $i

then

	:

else

	echo Unreadable results directory: $i

	exit 1

fi

. tools/testing/selftests/rcutorture/bin/functions.sh



configfile=`echo $i | sed -e 's/^.*\///'`



grep -e '-perf:.*writer-duration' $i/console.log | sed -e 's/^\[[^]]*]//' |

awk '

{

	gptimes[++n] = $5 / 1000.;

	sum += $5 / 1000.;

}



END {

	if (NR <= 0) {

		print "No rcuperf records found???"

		exit;

	}

	asort(gptimes);

	pct50 = int(NR * 50 / 100);

	if (pct50 < 1)

		pct50 = 1;

	pct90 = int(NR * 90 / 100);

	if (pct90 < 1)

		pct90 = 1;

	pct99 = int(NR * 99 / 100);

	if (pct99 < 1)

		pct99 = 1;

	div = 10 ** int(log(gptimes[pct90]) / log(10) + .5) / 100;

	print "Histogram bucket size: " div;

	last = gptimes[1] - 10;

	count = 0;

	for (i = 1; i <= NR; i++) {

		current = div * int(gptimes[i] / div);

		if (last == current) {

			count++;

		} else {

			if (count > 0)

				print last, count;

			count = 1;

			last = current;

		}

	}

	if (count > 0)

		print last, count;

	print "Average grace-period duration: " sum / NR " microseconds";

	print "Minimum grace-period duration: " gptimes[1];

	print "50th percentile grace-period duration: " gptimes[pct50];

	print "90th percentile grace-period duration: " gptimes[pct90];

	print "99th percentile grace-period duration: " gptimes[pct99];

	print "Maximum grace-period duration: " gptimes[NR];

}'

tools/testing/selftests/rcutorture/bin/kvm-recheck.sh

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ do 
				cat $i/Make.oldconfig.err

			fi

			parse-build.sh $i/Make.out $configfile

			if test "$TORTURE_SUITE" != rcuperf

			then

				parse-torture.sh $i/console.log $configfile

			fi

			parse-console.sh $i/console.log $configfile

			if test -r $i/Warnings

			then

tools/testing/selftests/rcutorture/bin/kvm.sh

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ do 
		shift

		;;

	--torture)

		checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\)$' '^--'

		checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\|rcuperf\)$' '^--'

		TORTURE_SUITE=$2

		shift

		;;

tools/testing/selftests/rcutorture/configs/rcuperf/CFLIST

0 → 100644
+1 −0
Original line number Diff line number Diff line 
TREE

tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_RCU_PERF_TEST=y

CONFIG_PRINTK_TIME=y