Only compare perfomance if verbose output is requestedbyron-master

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

4 files changed, 10 insertions, 3 deletions

diff --git a/src/glean/tbasicperf.cpp b/src/glean/tbasicperf.cpp
index 94e9179..b31f036 100644
--- a/src/glean/tbasicperf.cpp
+++ b/src/glean/tbasicperf.cpp
@@ -116,6 +116,8 @@ BasicPerfTest::compareOne(BasicPerfResult& oldR, BasicPerfResult& newR) {
 	bool same = true;
 	const char *title = "100mS sleep";
 
+	if (env->options.verbosity) {
+
 	if (newR.timeLow < oldR.timeLow) {
 		double percent = (100.0
 				  * (oldR.timeLow - newR.timeLow)
@@ -158,7 +160,7 @@ BasicPerfTest::compareOne(BasicPerfResult& oldR, BasicPerfResult& newR) {
 			 << env->options.db1Name
 			 << " test time.\n";
 	}
-	if (env->options.verbosity) {
+
 		env->log << env->options.db1Name << ':';
 		logStats(oldR);
 		env->log << env->options.db2Name << ':';
diff --git a/src/glean/tchgperf.cpp b/src/glean/tchgperf.cpp
index b943f53..9ba9e9d 100644
--- a/src/glean/tchgperf.cpp
+++ b/src/glean/tchgperf.cpp
@@ -263,6 +263,7 @@ TexBindPerf::logOne(TexBindPerfResult& r) {
 ///////////////////////////////////////////////////////////////////////////////
 void
 TexBindPerf::compareOne(TexBindPerfResult& oldR, TexBindPerfResult& newR) {
+	if (env->options.verbosity) {
 	if (newR.bindTime < oldR.lowerBound) {
 		int percent = static_cast<int>(
 			100.0 * (oldR.bindTime - newR.bindTime) / newR.bindTime
@@ -280,7 +281,6 @@ TexBindPerf::compareOne(TexBindPerfResult& oldR, TexBindPerfResult& newR) {
 			<< '\t' << env->options.db1Name << " may be "
 			<< percent << "% faster.\n";
 	} else {
-		if (env->options.verbosity)
 			env->log << name << ":  SAME "
 				<< newR.config->conciseDescription()
 				<< "\n\t"
@@ -290,6 +290,7 @@ TexBindPerf::compareOne(TexBindPerfResult& oldR, TexBindPerfResult& newR) {
 				<< env->options.db1Name
 				<< " test time.\n";
 	}
+	}
 	if (env->options.verbosity) {
 		env->log << env->options.db1Name << ':';
 		logStats(oldR, env);
diff --git a/src/glean/treadpixperf.cpp b/src/glean/treadpixperf.cpp
index 836056c..44f9019 100644
--- a/src/glean/treadpixperf.cpp
+++ b/src/glean/treadpixperf.cpp
@@ -451,7 +451,8 @@ ReadpixPerfTest::compareOne(ReadpixPerfResult &oldR,
 	comparePassFail(oldR, newR);
 
 	if (newR.pass && oldR.pass) {
-		// if both tests failed, compare/report rates
+	if (env->options.verbosity) {
+		// if both tests passed, compare/report rates
 		ReadpixPerfResult::sub_iterator it_old = oldR.results.begin();
 		ReadpixPerfResult::sub_iterator it_new = newR.results.begin();
 		assert(oldR.results.size() == newR.results.size());
@@ -476,6 +477,7 @@ ReadpixPerfTest::compareOne(ReadpixPerfResult &oldR,
 			}
 		}
 	}
+	}
 }
 
 
diff --git a/src/glean/tvtxperf.cpp b/src/glean/tvtxperf.cpp
index 90f9b33..0a9bbef 100644
--- a/src/glean/tvtxperf.cpp
+++ b/src/glean/tvtxperf.cpp
@@ -322,6 +322,7 @@ doComparison(const GLEAN::VPSubResult& oldR,
     GLEAN::DrawingSurfaceConfig* config,
     bool& same, const string& name, GLEAN::Environment* env,
     const char* title) {
+	if (env->options.verbosity) {
 	if (newR.tps < oldR.tpsLow) {
 		int percent = static_cast<int>(
 			100.0 * (oldR.tps - newR.tps) / newR.tps + 0.5);
@@ -338,6 +339,7 @@ doComparison(const GLEAN::VPSubResult& oldR,
 			<< " may be " << percent << "% faster on "
 			<< title << " drawing.\n";
 	}
+	}
 	if (newR.imageOK != oldR.imageOK) {
 		diffHeader(same, name, config, env);
 		env->log << '\t' << env->options.db1Name << " image check "