From c6609a4bb95f69dcedd9023332f43d7e487f6a2c Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 4 Jun 2024 14:00:14 +0000 Subject: [PATCH] Set big core to cpu skip mask by default Also reset the mask for launch and other camera streaming modes that do not use it. Bug: 248621289 Test: build pass Change-Id: Id2f8f203359d4551d17f9b6ba02ee1c8e805fa3c --- perf/powerhint-husky.json | 63 ++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 63 ++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 65 +++++++++++++++++++++++++++++++++- 3 files changed, 190 insertions(+), 1 deletion(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index b944c9c..d215204 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -282,6 +282,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -842,6 +851,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -995,6 +1010,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1275,6 +1296,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1845,6 +1872,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2007,6 +2040,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2157,6 +2196,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2247,6 +2292,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2391,6 +2442,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -3034,6 +3091,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f5f1ca1..df0f423 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -268,6 +268,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -864,6 +873,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1017,6 +1032,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1274,6 +1295,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1694,6 +1721,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1844,6 +1877,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -1976,6 +2015,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2060,6 +2105,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2204,6 +2255,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2817,6 +2874,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c9ca7d2..3345675 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -282,6 +282,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUSkipMask", + "Path": "/proc/vendor_sched/cpu_skip_mask", + "Values": [ + "0x0", + "0x80" + ], + "ResetOnInit": true + }, { "Name": "BGUClampMaxBoost", "Path": "/proc/vendor_sched/groups/bg/uclamp_max", @@ -842,6 +851,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -995,6 +1010,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1281,6 +1302,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1749,6 +1776,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1911,6 +1944,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2061,6 +2100,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2157,12 +2202,18 @@ "Duration": 0, "Value": "cam1" }, - { + { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPUUtilThreshold", "Duration": 0, "Value": "1280" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferHighCap", @@ -2295,6 +2346,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2938,6 +2995,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad",