aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-12-06 15:05:26 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-06 21:25:29 +0000
commitbbfe51547439fd02265c9775115001033f9312c1 (patch)
treea12b8de211c48e5a8ccd03774f9bafce063a9c75 /bench
parent7f4dd6cc079f9a7389a3d962e4588a6e9383cfdd (diff)
remove ThermalManager
It throttles 1000x more than intended, and I suspect that some of the trip points it uses to decide when to throttle make no sense. We've already turned it off on the Nexus 5x. Change-Id: Idf556a83fe61ccc5f63c7bede3eecbe80087e28b Reviewed-on: https://skia-review.googlesource.com/81303 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'bench')
-rw-r--r--bench/nanobench.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index d475e164e5..76d5371869 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -47,7 +47,6 @@
#include "SkTaskGroup.h"
#include "SkTraceEvent.h"
#include "Stats.h"
-#include "ThermalManager.h"
#include "ios_utils.h"
#include <stdlib.h>
@@ -128,8 +127,6 @@ DEFINE_int32(flushEvery, 10, "Flush --outResultsFile every Nth run.");
DEFINE_bool(gpuStats, false, "Print GPU stats after each gpu benchmark?");
DEFINE_bool(gpuStatsDump, false, "Dump GPU states after each benchmark to json");
DEFINE_bool(keepAlive, false, "Print a message every so often so that we don't time out");
-DEFINE_string(useThermalManager, "0,1,10,1000", "enabled,threshold,sleepTimeMs,TimeoutMs for "
- "thermalManager\n");
DEFINE_bool(csv, false, "Print status in CSV format");
DEFINE_string(sourceType, "",
"Apply usual --match rules to source type: bench, gm, skp, image, etc.");
@@ -1221,16 +1218,6 @@ int main(int argc, char** argv) {
SkTArray<Config> configs;
create_configs(&configs);
-#ifdef THERMAL_MANAGER_SUPPORTED
- int tmEnabled, tmThreshold, tmSleepTimeMs, tmTimeoutMs;
- if (4 != sscanf(FLAGS_useThermalManager[0], "%d,%d,%d,%d",
- &tmEnabled, &tmThreshold, &tmSleepTimeMs, &tmTimeoutMs)) {
- SkDebugf("Can't parse %s from --useThermalManager.\n", FLAGS_useThermalManager[0]);
- exit(1);
- }
- ThermalManager tm(tmThreshold, tmSleepTimeMs, tmTimeoutMs);
-#endif
-
if (FLAGS_keepAlive) {
start_keepalive();
}
@@ -1261,11 +1248,6 @@ int main(int argc, char** argv) {
bench->delayedSetup();
}
for (int i = 0; i < configs.count(); ++i) {
-#ifdef THERMAL_MANAGER_SUPPORTED
- if (tmEnabled && !tm.coolOffIfNecessary()) {
- SkDebugf("Could not cool off, timings will be throttled\n");
- }
-#endif
Target* target = is_enabled(b, configs[i]);
if (!target) {
continue;