nas: Simplify report extraction

Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
gormanm · May 27, 2019 · f443cf4 · f443cf4
1 parent 0bf7aca
commit f443cf4
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 158 deletions.
diff --git a/bin/lib/MMTests/ExtractFreqminecommon.pm b/bin/lib/MMTests/ExtractFreqminecommon.pm
@@ -24,17 +24,8 @@ sub uniq {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	my @threads;
-
-	my @files = <$reportDir/freqmine-*-1.log>;
-	foreach my $file (@files) {
-		my @elements = split (/-/, $file);
-		my $thr = $elements[-2];
-		$thr =~ s/.log//;
-		push @threads, $thr;
-	}
+	my @threads = $self->discover_scaling_parameters($reportDir, "freqmine-", "-1.log");
 
-	@threads = sort {$a <=> $b} @threads;
 	foreach my $nthr (@threads) {
 		my @files = <$reportDir/freqmine-$nthr-*.log>;
 

diff --git a/bin/lib/MMTests/ExtractFutexwait.pm b/bin/lib/MMTests/ExtractFutexwait.pm
@@ -17,18 +17,8 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	my ($tp, $name);
-	my @threads;
 
-	my @files = <$reportDir/futexwait-*-1.log>;
-	foreach my $file (@files) {
-		my @elements = split (/-/, $file);
-		my $thr = $elements[-2];
-		$thr =~ s/.log//;
-		push @threads, $thr;
-	}
-
-	@threads = sort {$a <=> $b} @threads;
+	my @threads = $self->discover_scaling_parameters($reportDir, "futexwait-", "-1.log");;
 	foreach my $nthr (@threads) {
 		my @files = <$reportDir/futexwait-$nthr-*.log>;
 
@@ -48,3 +38,5 @@ sub extractReport() {
 		}
 	}
 }
+
+1;
diff --git a/bin/lib/MMTests/ExtractHackbench.pm b/bin/lib/MMTests/ExtractHackbench.pm
@@ -15,16 +15,8 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	my ($user, $system, $elapsed, $cpu);
-
-	my @files = <$reportDir/hackbench-*-1>;
-	my @groups;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		push @groups, $split[-2];
-	}
-	@groups = sort { $a <=> $b} @groups;
 
+	my @groups = $self->discover_scaling_parameters($reportDir, "hackbench-", "-1");
 	foreach my $group (@groups) {
 		my $nr_samples = 0;
 		foreach my $file (<$reportDir/hackbench-$group-*>) {

diff --git a/bin/lib/MMTests/ExtractLkpthroughput.pm b/bin/lib/MMTests/ExtractLkpthroughput.pm
@@ -27,15 +27,7 @@ sub extractReport() {
 	$self->{_Workloads} = \@workloads;
 	close(INPUT);
 
-	my @threads;
-	my @files = <$reportDir/lkp-*-1.log>;
-	foreach my $file (@files) {
-		my @elements = split (/-/, $file);
-		my $thr = $elements[-2];
-		$thr =~ s/.log//;
-		push @threads, $thr;
-	}
-	@threads = sort {$a <=> $b} @threads;
+	my @threads = $self->discover_scaling_parameters($reportDir, "lkp-", "-1.log");
 	@threads = uniq(@threads);
 
 	foreach my $nthr (@threads) {

diff --git a/bin/lib/MMTests/ExtractMicrotput.pm b/bin/lib/MMTests/ExtractMicrotput.pm
@@ -16,15 +16,8 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	my ($user, $system, $elapsed, $cpu);
 
-	my @files = <$reportDir/microtput-*-1>;
-	my @threads;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		push @threads, $split[-2];
-	}
-	@threads = sort { $a <=> $b} @threads;
+	my @threads = $self->discover_scaling_parameters($reportDir, "microtput-", "-1");
 
 	foreach my $thread (@threads) {
 		my $nr_samples = 0;

diff --git a/bin/lib/MMTests/ExtractMutilate.pm b/bin/lib/MMTests/ExtractMutilate.pm
@@ -19,14 +19,7 @@ sub new() {
 sub extractReport() {
 	my ($self, $reportDir) = @_;
 
-	my @files = <$reportDir/mutilate-*-1.log>;
-	my @clients;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-2];
-	}
-	@clients = sort { $a <=> $b } @clients;
+	my @clients = $self->discover_scaling_parameters($reportDir, "mutilate-", "-1.log");
 
 	foreach my $client (@clients) {
 		my $iteration = 1;

diff --git a/bin/lib/MMTests/ExtractNastime.pm b/bin/lib/MMTests/ExtractNastime.pm
@@ -16,11 +16,6 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	$reportDir =~ s/mpitime/mpi/;
-	$reportDir =~ s/omptime/omp/;
-	$reportDir =~ s/mpi-([a-z][a-z])time/mpi-\1/;
-	$reportDir =~ s/omp-([a-z][a-z])time/omp-\1/;
-
 	my @kernels = $self->discover_scaling_parameters($reportDir, "", ".log.1");
 
 	foreach my $kernel (@kernels) {

diff --git a/bin/lib/MMTests/ExtractPistress.pm b/bin/lib/MMTests/ExtractPistress.pm
@@ -23,14 +23,7 @@ my %status_code = (
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-
-	my @clients;
-	foreach my $file (<$reportDir/pistress-*.log>) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log.*//;
-		push @clients, $split[-1];
-	}
-	@clients = sort { $a <=> $b} @clients;
+	my @clients = $self->discover_scaling_parameters($reportDir, "pistress-", ".log");
 
 	foreach my $client (@clients) {
 		my $file = "$reportDir/pistress-$client.status";

diff --git a/bin/lib/MMTests/ExtractRedis.pm b/bin/lib/MMTests/ExtractRedis.pm
@@ -17,15 +17,7 @@ sub initialise() {
 sub extractReport() {
 	my ($self, $reportDir) = @_;
 
-	my @clients;
-	my @files = <$reportDir/redis-*-1.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-2] =~ s/.log//;
-		push @clients, $split[-2];
-	}
-	@clients = sort { $a <=> $b } @clients;
-
+	my @clients = $self->discover_scaling_parameters($reportDir, "redis-", "-1.log");
 	foreach my $client (@clients) {
 		my $iteration = 1;
 		foreach my $file (<$reportDir/redis-$client-*.log>) {

diff --git a/bin/lib/MMTests/ExtractSchbench.pm b/bin/lib/MMTests/ExtractSchbench.pm
@@ -23,19 +23,7 @@ sub extractReport() {
 	my ($self, $reportDir) = @_;
 	my @ratioops;
 
-	my @files = <$reportDir/schbench-*.log>;
-	my @groups;
-
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		my $group = $split[-1];
-
-		$group =~ s/([0-9]+).*/$1/;
-
-		push @groups, $group
-	}
-	@groups = sort { $a <=> $b } @groups;
-
+	my @groups = $self->discover_scaling_parameters($reportDir, "schbench-", ".log");
 	foreach my $group (@groups) {
 		open(INPUT, "$reportDir/schbench-$group.log") || die("Failed to open $group\n");
 		while (<INPUT>) {

diff --git a/bin/lib/MMTests/ExtractSiege.pm b/bin/lib/MMTests/ExtractSiege.pm
@@ -15,14 +15,7 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-	my @clients;
-	my @files = <$reportDir/siege-*-1.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-2];
-	}
-	@clients = sort { $a <=> $b } @clients;
+	my @clients = $self->discover_scaling_parameters($reportDir, "siege-", "-1.log");
 
 	foreach my $client (@clients) {
 		my @files = <$reportDir/siege-$client-*.log>;

diff --git a/bin/lib/MMTests/ExtractStressng.pm b/bin/lib/MMTests/ExtractStressng.pm
@@ -16,14 +16,7 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-
-	my @files = <$reportDir/stressng-*-1.log>;
-	my @clients;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		push @clients, $split[-2];
-	}
-	@clients = sort { $a <=> $b } @clients;
+	my @clients = $self->discover_scaling_parameters($reportDir, "stressng-", "-1.log");
 
 	foreach my $client (@clients) {
 		foreach my $file (<$reportDir/stressng-$client-*>) {

diff --git a/bin/lib/MMTests/ExtractThpfioscale.pm b/bin/lib/MMTests/ExtractThpfioscale.pm
@@ -18,17 +18,8 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-
 	my @ops;
-	my @clients;
-	my @files = <$reportDir/threads-*.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-1];
-	}
-	@clients = sort { $a <=> $b } @clients;
-
+	my @clients = $self->discover_scaling_parameters($reportDir, "threads-", ".log");
 
 	foreach my $client (@clients) {
 		my $faults = 0;

diff --git a/bin/lib/MMTests/ExtractThpscale.pm b/bin/lib/MMTests/ExtractThpscale.pm
@@ -18,17 +18,8 @@ sub initialise() {
 
 sub extractReport() {
 	my ($self, $reportDir) = @_;
-
 	my @ops;
-	my @clients;
-	my @files = <$reportDir/threads-*.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-1];
-	}
-	@clients = sort { $a <=> $b } @clients;
-
+	my @clients = $self->discover_scaling_parameters($reportDir, "threads-", ".log");
 
 	foreach my $client (@clients) {
 		my $faults = 0;

diff --git a/bin/lib/MMTests/ExtractTlbflush.pm b/bin/lib/MMTests/ExtractTlbflush.pm
@@ -16,22 +16,12 @@ sub initialise() {
 sub extractReport() {
 	my ($self, $reportDir) = @_;
 
-	my @ops;
-	my @clients;
-	my @files = <$reportDir/tlbflush-*.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-1];
-	}
-	@clients = sort { $a <=> $b } @clients;
-
+	my @clients = $self->discover_scaling_parameters($reportDir, "tlbflush-", ".log");
 	foreach my $client (@clients) {
 		my $iteration = 0;
 
 		my $file = "$reportDir/tlbflush-$client.log";
 		open(INPUT, $file) || die("Failed to open $file\n");
-		my ($user, $sys, $records);
 		while (<INPUT>) {
 			if ($_ =~ /.*, cost ([0-9]*)ns.*/) {
 				$self->addData("nsec-$client", ++$iteration, $1);

diff --git a/bin/lib/MMTests/ExtractWptlbflush.pm b/bin/lib/MMTests/ExtractWptlbflush.pm
@@ -25,15 +25,7 @@ sub initialise() {
 sub extractReport() {
 	my ($self, $reportDir) = @_;
 
-	my @ops;
-	my @clients;
-	my @files = <$reportDir/wp-tlbflush-*.log>;
-	foreach my $file (@files) {
-		my @split = split /-/, $file;
-		$split[-1] =~ s/.log//;
-		push @clients, $split[-1];
-	}
-	@clients = sort { $a <=> $b } @clients;
+	my @clients = $self->discover_scaling_parameters($reportDir, "wp-tlbflush-", ".log");
 
 	foreach my $client (@clients) {
 		my $file = "$reportDir/wp-tlbflush-$client.log";

diff --git a/compare-kernels.sh b/compare-kernels.sh
@@ -541,16 +541,6 @@ for SUBREPORT in $(run_report_name $KERNEL_BASE); do
 		cache-mmtests.sh compare-mmtests.pl -d . -b johnripper -a exectime -n $KERNEL_LIST $FORMAT_CMD
 		echo
 		;;
-	loopdd)
-		echo $SUBREPORT Throughput
-		eval $COMPARE_CMD
-		echo
-		echo $SUBREPORT DD-Time
-		eval $COMPARE_CMD --sub-heading ddtime
-		echo
-		echo $SUBREPORT CPU-Time
-		eval $COMPARE_CMD --sub-heading elapsed
-		;;
 	monitor)
 		echo No meaningful extraction script for monitor
 		echo
@@ -560,7 +550,7 @@ for SUBREPORT in $(run_report_name $KERNEL_BASE); do
 		cache-mmtests.sh compare-mmtests.pl -d . -b $SUBREPORT -n $KERNEL_LIST $FORMAT_CMD
 		echo
 		echo $SUBREPORT Wall Time
-		cache-mmtests.sh compare-mmtests.pl -d . -b ${SUBREPORT}time -n $KERNEL_LIST $FORMAT_CMD
+		cache-mmtests.sh compare-mmtests.pl -d . -b ${SUBREPORT} -a time -n $KERNEL_LIST $FORMAT_CMD
 		echo
 		;;
 	netpipe)
@@ -665,7 +655,7 @@ for SUBREPORT in $(run_report_name $KERNEL_BASE); do
 		$COMPARE_CMD
 		echo
 		echo $SUBREPORT Throughput
-		cache-mmtests.sh compare-mmtests.pl -d . -b xfsiothroughput -n $KERNEL_LIST $FORMAT_CMD
+		cache-mmtests.sh compare-mmtests.pl -d . -b xfsio -a throughput -n $KERNEL_LIST $FORMAT_CMD
 		echo
 		echo $SUBREPORT Ops
 		cache-mmtests.sh compare-mmtests.pl -d . -b xfsio -a ops -n $KERNEL_LIST $FORMAT_CMD