diff options
| author |  joshualitt <joshualitt@chromium.org> | 2016-02-11 11:42:19 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-11 11:42:19 -0800 |
| commit | e1745a1efc02de4964a430cf9fd02d7652b3ed5e (patch) | |
| tree | 5d508958104b00146666cb5eec1d886384f89993 /tools | |
| parent | f4004f9309242533dea68c95433020db71fc65c8 (diff) | |
enable ThermalManager on Android
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684653002
Review URL: https://codereview.chromium.org/1684653002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ThermalManager.cpp | 2 | ||||
| -rw-r--r-- | tools/nanobench_flags.json | 47 | ||||
| -rwxr-xr-x | tools/nanobench_flags.py | 4 |
3 files changed, 52 insertions, 1 deletions
diff --git a/tools/ThermalManager.cpp b/tools/ThermalManager.cpp index 36f7468002..21c0fc367f 100644 --- a/tools/ThermalManager.cpp +++ b/tools/ThermalManager.cpp @@ -95,7 +95,7 @@ ThermalManager::TripPoint::TripPoint(SkString thermalZoneRoot, SkString pointNam fPoint = OpenFileAndReadInt32(fullPath.c_str()); fBase = GetTemp(fThermalZoneRoot); fThreshold = threshold; - fDisabled = fBase >= fPoint + fThreshold; // We disable any trip point which start off + fDisabled = fBase + fThreshold >= fPoint; // We disable any trip point which start off // triggered if (!fDisabled) { SkDebugf("Trip point %s base - %d trip point-%d\n", fullPath.c_str(), diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json index 2ae91d0c3c..c80ced8b61 100644 --- a/tools/nanobench_flags.json +++ b/tools/nanobench_flags.json @@ -1,9 +1,54 @@ { + "Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release": [ + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--useThermalManager", + "1,1,10,1000", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "msaa4", + "nvprmsaa4", + "--match", + "~blurroundrect", + "~patch_grid", + "~desk_carsvg", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp" + ], "Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release": [ "--pre_log", "--images", "--gpuStatsDump", "true", + "--useThermalManager", + "1,1,10,1000", "--scales", "1.0", "1.1", @@ -85,6 +130,8 @@ "--images", "--gpuStatsDump", "true", + "--useThermalManager", + "1,1,10,1000", "--scales", "1.0", "1.1", diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py index 685b302600..50d5feb930 100755 --- a/tools/nanobench_flags.py +++ b/tools/nanobench_flags.py @@ -33,6 +33,9 @@ def get_args(bot): args.append('--images') args.extend(['--gpuStatsDump', 'true']) + if 'Android' in bot and 'GPU' in bot: + args.extend(['--useThermalManager', '1,1,10,1000']) + if 'Appurify' not in bot: args.extend(['--scales', '1.0', '1.1']) @@ -129,6 +132,7 @@ def self_test(): import coverage # This way the bots don't need coverage.py to be installed. args = {} cases = [ + 'Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release', 'Perf-Android-Nexus7-Tegra3-Arm7-Release', 'Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release', 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', |