From 83650f79c424a0e4e0176a1d78929020db6fb291 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Thu, 6 Apr 2023 17:16:55 +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: Ic5d7efed94a7c744132af1092b1438409d94ed9d --- powerhint-oriole.json | 40 +++++++++++++-------------- powerhint-raven.json | 40 +++++++++++++-------------- powerhint-slider.json | 60 ++++++++++++++++++++--------------------- powerhint-whitefin.json | 60 ++++++++++++++++++++--------------------- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6d9cff0..9ec6a0e 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -134,7 +134,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -143,7 +143,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -152,8 +152,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -538,13 +538,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1762,7 +1762,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1784,8 +1784,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1808,8 +1808,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1832,8 +1832,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1859,9 +1859,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1883,9 +1883,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1907,7 +1907,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-raven.json b/powerhint-raven.json index 23dc7cc..46970f3 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -133,7 +133,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -142,7 +142,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -151,8 +151,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -537,13 +537,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1743,7 +1743,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1765,8 +1765,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1789,8 +1789,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1813,8 +1813,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1840,9 +1840,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1864,9 +1864,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1888,7 +1888,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-slider.json b/powerhint-slider.json index 661a28f..52c8cb3 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -142,9 +142,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +161,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +171,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -417,7 +417,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -429,7 +429,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -440,7 +440,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -464,13 +464,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1202,13 +1202,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1219,7 +1219,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1354,7 +1354,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", @@ -1382,8 +1382,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1406,8 +1406,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1430,8 +1430,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1457,9 +1457,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1481,9 +1481,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1505,7 +1505,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-whitefin.json b/powerhint-whitefin.json index 245cc4e..fa470a9 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -142,9 +142,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +161,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +171,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -408,7 +408,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -420,7 +420,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -431,7 +431,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -455,13 +455,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1187,13 +1187,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1204,7 +1204,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1333,7 +1333,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" } ], "AdpfConfig": [ @@ -1349,8 +1349,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1373,8 +1373,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1397,8 +1397,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1424,9 +1424,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1448,9 +1448,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1472,7 +1472,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1,