From a853895d3f18cb664bec76dee42170be39e22b9b Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 26 May 2023 23:30:45 +0000 Subject: [PATCH] Enable PMU, use cam2 EM profile for 60fps Bug: 256723111 Test: ODPM/Framedrop (https://docs.google.com/spreadsheets/d/1U7RvqW7x7PbZh-NML_HvBuaXDHbnUDN4QrRCdUHzPQI/edit?usp=sharing) Change-Id: I4384078b49075c43490909f56f3297ad63ff9987 --- perf/powerhint-husky.json | 68 +++++++++++++++++++--------------- perf/powerhint-ripcurrent.json | 68 +++++++++++++++++++--------------- perf/powerhint-shiba.json | 68 +++++++++++++++++++--------------- 3 files changed, 117 insertions(+), 87 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index e39e8b7..0c5201a 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -603,7 +603,8 @@ "Path": "/sys/kernel/pixel_em/active_profile", "Values": [ "default", - "cam1" + "cam1", + "cam2" ], "DefaultIndex": 0 }, @@ -611,7 +612,8 @@ "Name": "PMU_LIT_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", "Values": [ - "1328000" + "1328000", + "1098000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -630,16 +632,25 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "35", "30", "0" ], "DefaultIndex": 0 }, + { + "Name": "PMU_MID_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ - "6", "3" ], "DefaultIndex": 0 @@ -648,8 +659,8 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "65", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -657,8 +668,8 @@ "Name": "PMU_BIG_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ - "2556000", - "1852000" + "1852000", + "1298000" ], "DefaultIndex": 0 }, @@ -666,7 +677,6 @@ "Name": "PMU_BIG_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ - "5", "3" ], "DefaultIndex": 0 @@ -675,8 +685,8 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "69", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -1344,6 +1354,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1098000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1354,7 +1370,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "0" + "Value": "35" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_MID_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1366,13 +1388,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1298000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1384,19 +1406,19 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_POLL", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", "Duration": 0, - "Value": "cam1" + "Value": "cam2" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1422,23 +1444,11 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1852000" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1622000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 65f8e57..a57b3dd 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -590,7 +590,8 @@ "Path": "/sys/kernel/pixel_em/active_profile", "Values": [ "default", - "cam1" + "cam1", + "cam2" ], "DefaultIndex": 0 }, @@ -598,7 +599,8 @@ "Name": "PMU_LIT_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", "Values": [ - "1328000" + "1328000", + "1098000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -617,16 +619,25 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "35", "30", "0" ], "DefaultIndex": 0 }, + { + "Name": "PMU_MID_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ - "6", "3" ], "DefaultIndex": 0 @@ -635,8 +646,8 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "65", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -644,8 +655,8 @@ "Name": "PMU_BIG_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ - "2556000", - "1852000" + "1852000", + "1298000" ], "DefaultIndex": 0 }, @@ -653,7 +664,6 @@ "Name": "PMU_BIG_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ - "5", "3" ], "DefaultIndex": 0 @@ -662,8 +672,8 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "69", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -1206,6 +1216,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1098000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1216,7 +1232,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "0" + "Value": "35" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_MID_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1228,13 +1250,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1298000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1246,19 +1268,19 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_POLL", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", "Duration": 0, - "Value": "cam1" + "Value": "cam2" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1284,23 +1306,11 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1852000" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1622000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index a331eff..94e0084 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -593,7 +593,8 @@ "Path": "/sys/kernel/pixel_em/active_profile", "Values": [ "default", - "cam1" + "cam1", + "cam2" ], "DefaultIndex": 0 }, @@ -601,7 +602,8 @@ "Name": "PMU_LIT_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency", "Values": [ - "1328000" + "1328000", + "1098000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -620,16 +622,25 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "35", "30", "0" ], "DefaultIndex": 0 }, + { + "Name": "PMU_MID_LIMIT_FREQ", + "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency", + "Values": [ + "1328000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "PMU_MID_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold", "Values": [ - "6", "3" ], "DefaultIndex": 0 @@ -638,8 +649,8 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "65", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -647,8 +658,8 @@ "Name": "PMU_BIG_LIMIT_FREQ", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency", "Values": [ - "2556000", - "1852000" + "1852000", + "1298000" ], "DefaultIndex": 0 }, @@ -656,7 +667,6 @@ "Name": "PMU_BIG_LCPI_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold", "Values": [ - "5", "3" ], "DefaultIndex": 0 @@ -665,8 +675,8 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "69", - "50" + "50", + "20" ], "DefaultIndex": 0 }, @@ -1232,6 +1242,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_LIT_LIMIT_FREQ", + "Duration": 0, + "Value": "1098000" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_LCPI_THRESHOLD", @@ -1242,7 +1258,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "0" + "Value": "35" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PMU_MID_LIMIT_FREQ", + "Duration": 0, + "Value": "1328000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1254,13 +1276,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_LIMIT_FREQ", "Duration": 0, - "Value": "1852000" + "Value": "1298000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1272,19 +1294,19 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_BIG_SPC_THRESHOLD", "Duration": 0, - "Value": "50" + "Value": "20" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PMU_POLL", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "EM_Profile", "Duration": 0, - "Value": "cam1" + "Value": "cam2" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1304,23 +1326,11 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1852000" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1622000" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "1475000" + "Value": "1548000" }, { "PowerHint": "CAMERA_STREAMING_HIGH",