From 2fa00d3dc83e1f3c2c0a381808a6d0f48d3cf001 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Fri, 31 Mar 2023 18:09:24 +0000 Subject: [PATCH] powerhint.json: Update uclamp_min hint to account for margin Upstream has fixed relationship between uclamp_min and margin which means uclamp_min value between 80-100% of capacity of the CPU is a valid value and will not cause upmigration. To keep the current hints in powerhint.json the same, we must update uclamp_min to be capacity_orig_of(medium_cpu) + 1. This change is dependent on uclamp vs fits margin in GKI, vendor modules. And an improvement in sched_pixel to ignore the 25% boost if the only reason to request the frequency is uclamp_min. To cater for the later - we multiply each uclamp_min value with 1.25 - except ones that look intentionally set around capacity boundaries. Bug: 261695590 Test: UiBench Signed-off-by: Qais Yousef Change-Id: I88aa819bcaa0844d688242894dc899a607076bd8 --- powerhint-husky.json | 40 +++++++++++++++++++-------------------- powerhint-ripcurrent.json | 40 +++++++++++++++++++-------------------- powerhint-shiba.json | 40 +++++++++++++++++++-------------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/powerhint-husky.json b/powerhint-husky.json index 6d6cdad..d1cea34 100644 --- a/powerhint-husky.json +++ b/powerhint-husky.json @@ -162,7 +162,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -171,7 +171,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1" ], "ResetOnInit": true @@ -189,8 +189,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "812" ], "DefaultIndex": 0, "ResetOnInit": true @@ -681,7 +681,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -794,7 +794,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -2229,7 +2229,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "812" }, { "PowerHint": "ML_ACC", @@ -2251,8 +2251,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 231, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2275,8 +2275,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2299,8 +2299,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2326,9 +2326,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 196, + "UclampMin_Low": 196, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2350,9 +2350,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 52, + "UclampMin_Low": 52, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2374,7 +2374,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-ripcurrent.json b/powerhint-ripcurrent.json index 18198d6..6bb824e 100644 --- a/powerhint-ripcurrent.json +++ b/powerhint-ripcurrent.json @@ -162,7 +162,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -171,7 +171,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1" ], "ResetOnInit": true @@ -189,8 +189,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "812" ], "DefaultIndex": 0, "ResetOnInit": true @@ -681,7 +681,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -794,7 +794,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -2229,7 +2229,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "812" }, { "PowerHint": "ML_ACC", @@ -2251,8 +2251,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 231, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2275,8 +2275,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2299,8 +2299,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2326,9 +2326,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 196, + "UclampMin_Low": 196, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2350,9 +2350,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 52, + "UclampMin_Low": 52, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2374,7 +2374,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-shiba.json b/powerhint-shiba.json index 689e2fc..ae11d50 100644 --- a/powerhint-shiba.json +++ b/powerhint-shiba.json @@ -162,7 +162,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -171,7 +171,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1" ], "ResetOnInit": true @@ -189,8 +189,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "812" ], "DefaultIndex": 0, "ResetOnInit": true @@ -681,7 +681,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -794,7 +794,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -2229,7 +2229,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "812" }, { "PowerHint": "ML_ACC", @@ -2251,8 +2251,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 231, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2275,8 +2275,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2299,8 +2299,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 161, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2326,9 +2326,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 196, + "UclampMin_Low": 196, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2350,9 +2350,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 52, + "UclampMin_Low": 52, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2374,7 +2374,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1,