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: PtsUiBench
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I60f4d7cd2cecf7ff4d73fa0cee1a09522b1d9bfd
This commit is contained in:
Qais Yousef 2023-02-27 15:24:10 +00:00
parent a0c87c0930
commit 98f52f4845

View file

@ -169,7 +169,7 @@
"Name": "CAMUClampBoost", "Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min", "Path": "/proc/vendor_sched/cam_uclamp_min",
"Values": [ "Values": [
"612", "764",
"0" "0"
], ],
"ResetOnInit": true "ResetOnInit": true
@ -178,7 +178,7 @@
"Name": "TAUClampBoost", "Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min", "Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [ "Values": [
"612", "764",
"1" "1"
], ],
"ResetOnInit": true "ResetOnInit": true
@ -196,8 +196,8 @@
"Name": "MLUclampBoost", "Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min", "Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [ "Values": [
"180", "225",
"650" "813"
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
@ -632,7 +632,7 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAUClampBoost", "Node": "TAUClampBoost",
"Duration": 5000, "Duration": 5000,
"Value": "612" "Value": "764"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -751,7 +751,7 @@
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
"Node": "CAMUClampBoost", "Node": "CAMUClampBoost",
"Duration": 1000, "Duration": 1000,
"Value": "612" "Value": "764"
}, },
{ {
"PowerHint": "CAMERA_LAUNCH", "PowerHint": "CAMERA_LAUNCH",
@ -2102,13 +2102,13 @@
"PowerHint": "ML_ACC", "PowerHint": "ML_ACC",
"Node": "MLUclampBoost", "Node": "MLUclampBoost",
"Duration": 2000, "Duration": 2000,
"Value": "650" "Value": "813"
}, },
{ {
"PowerHint": "ML_ACC", "PowerHint": "ML_ACC",
"Node": "PMQoSCpuDmaLatency", "Node": "PMQoSCpuDmaLatency",
"Duration": 2000, "Duration": 2000,
"Value": "44" "Value": "55"
} }
], ],
"AdpfConfig": [ "AdpfConfig": [
@ -2124,8 +2124,8 @@
"PID_Do": 500.0, "PID_Do": 500.0,
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 185, "UclampMin_Init": 232,
"UclampMin_High": 384, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
@ -2148,8 +2148,8 @@
"PID_Do": 500.0, "PID_Do": 500.0,
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 129, "UclampMin_Init": 162,
"UclampMin_High": 384, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
@ -2172,8 +2172,8 @@
"PID_Do": 500.0, "PID_Do": 500.0,
"PID_Du": 0.0, "PID_Du": 0.0,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 129, "UclampMin_Init": 162,
"UclampMin_High": 384, "UclampMin_High": 480,
"UclampMin_Low": 2, "UclampMin_Low": 2,
"SamplingWindow_P": 1, "SamplingWindow_P": 1,
"SamplingWindow_I": 0, "SamplingWindow_I": 0,
@ -2199,9 +2199,9 @@
"SamplingWindow_I": 1, "SamplingWindow_I": 1,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 200, "UclampMin_Init": 250,
"UclampMin_High": 157, "UclampMin_High": 197,
"UclampMin_Low": 157, "UclampMin_Low": 197,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -2223,9 +2223,9 @@
"SamplingWindow_I": 1, "SamplingWindow_I": 1,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 200, "UclampMin_Init": 250,
"UclampMin_High": 42, "UclampMin_High": 53,
"UclampMin_Low": 42, "UclampMin_Low": 53,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"EarlyBoost_On": false, "EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0, "EarlyBoost_TimeFactor": 0.0,
@ -2247,7 +2247,7 @@
"SamplingWindow_I": 1, "SamplingWindow_I": 1,
"SamplingWindow_D": 1, "SamplingWindow_D": 1,
"UclampMin_On": true, "UclampMin_On": true,
"UclampMin_Init": 200, "UclampMin_Init": 250,
"UclampMin_High": 0, "UclampMin_High": 0,
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,