From fe02aeed6d760ab9c2fe7ef38fedf4c0fed47b7c Mon Sep 17 00:00:00 2001 From: Kevin DuBois Date: Wed, 14 Feb 2024 13:38:19 -0800 Subject: [PATCH 1/2] powerhint.json: enable gpu capacity signalling. Enables a signal indicating that the app has janked as detected by the ADPF API. Bug: 290625326 Test: perf / power tests Change-Id: Iaf0f131cab90e4225642af243303473f56a34320 --- perf/powerhint-husky.json | 22 ++++++++++++++++------ perf/powerhint-shiba.json | 22 ++++++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 341a557..11df6a3 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2959,6 +2959,7 @@ "Value": "20 80" } ], + "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali", "AdpfConfig": [ { "Name": "REFRESH_120FPS", @@ -2982,7 +2983,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 40000 }, { "Name": "REFRESH_90FPS", @@ -3006,7 +3009,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 32500 }, { "Name": "REFRESH_60FPS", @@ -3030,7 +3035,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 25000 }, { "Name": "UiHighBoostWithoutPid", @@ -3054,7 +3061,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false }, { "Name": "UiLowBoostWithoutPid", @@ -3078,7 +3086,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false }, { "Name": "UiLowNoneBoost", @@ -3102,7 +3111,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false } ] } diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index f60f040..55da0a2 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2863,6 +2863,7 @@ "Value": "20 80" } ], + "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali", "AdpfConfig": [ { "Name": "REFRESH_120FPS", @@ -2886,7 +2887,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 150000 }, { "Name": "REFRESH_90FPS", @@ -2910,7 +2913,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 125000 }, { "Name": "REFRESH_60FPS", @@ -2934,7 +2939,9 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "GpuBoost": true, + "GpuCapacityBoostMax": 100000 }, { "Name": "UiHighBoostWithoutPid", @@ -2958,7 +2965,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false }, { "Name": "UiLowBoostWithoutPid", @@ -2982,7 +2990,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false }, { "Name": "UiLowNoneBoost", @@ -3006,7 +3015,8 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 + "StaleTimeFactor": 5.0, + "GpuBoost": false } ] } From a928cbb681a74dc7430334971fc6af3141ad81a3 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:12:01 +0000 Subject: [PATCH 2/2] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I2b4be8ee1d4f8a91196478d7b3c898f236365dff --- perf/powerhint-husky.json | 24 +++++++++--------------- perf/powerhint-ripcurrent.json | 24 +++++++++--------------- perf/powerhint-shiba.json | 24 +++++++++--------------- 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f2e47ea..6972fb6 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2933,15 +2933,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2957,15 +2957,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2981,15 +2981,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -3012,8 +3012,6 @@ "UclampMin_High": 196, "UclampMin_Low": 196, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -3036,8 +3034,6 @@ "UclampMin_High": 52, "UclampMin_Low": 52, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -3060,8 +3056,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 8b26427..b79d86f 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2716,15 +2716,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2740,15 +2740,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2764,15 +2764,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2795,8 +2795,6 @@ "UclampMin_High": 196, "UclampMin_Low": 196, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2819,8 +2817,6 @@ "UclampMin_High": 52, "UclampMin_Low": 52, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2843,8 +2839,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 88f5e12..c615e8b 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2837,15 +2837,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2861,15 +2861,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2885,15 +2885,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2916,8 +2916,6 @@ "UclampMin_High": 196, "UclampMin_Low": 196, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2940,8 +2938,6 @@ "UclampMin_High": 52, "UclampMin_Low": 52, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2964,8 +2960,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }