From e00b219010e0e9f3c08f8943ca588596824c7b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Sat, 17 Aug 2024 05:02:12 +0000 Subject: [PATCH] Revert "Set max load balance to 4, reduce Downrate Limit for lit and mid cores" This reverts commit d1274379addb82c0a256670c2eb69034706323a6. Reason for revert: git_main tokay-trunk_staging-userdebug boot failure (something about failing to parse /vendor/etc/powerhint.json). https://android-build.corp.google.com/test_investigate/?invocationId=I81200010307251269&testResultId=TR31029411252209740&legacy=&tab=changes Confirmed locally a revert results in a phone that boots. Change-Id: I134fc0926170940f374a04362b71f5b9c28188d4 --- perf/powerhint-caiman.json | 42 +++++-------------------------- perf/powerhint-komodo.json | 42 +++++-------------------------- perf/powerhint-ripcurrentpro.json | 28 --------------------- perf/powerhint-tokay.json | 41 +++++------------------------- 4 files changed, 18 insertions(+), 135 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index f557c4f1..3d76f979 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -56,7 +56,6 @@ "Values": [ "5000", "2000", - "1000", "500" ], "DefaultIndex": 0, @@ -95,7 +94,6 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", - "5000", "3000", "2000", "500" @@ -951,16 +949,6 @@ "200" ], "ResetOnInit": true - }, - { - "Name": "MaxLoadBalanceInterval", - "Path": "/proc/vendor_sched/max_load_balance_interval", - "Values": [ - "1", - "4" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ @@ -2031,13 +2019,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2123,12 +2111,6 @@ "Duration": 0, "Value": "0x0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2211,13 +2193,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2321,12 +2303,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2415,13 +2391,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2501,12 +2477,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 1dddb841..2d36ee82 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -56,7 +56,6 @@ "Values": [ "5000", "2000", - "1000", "500" ], "DefaultIndex": 0, @@ -95,7 +94,6 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", - "5000", "3000", "2000", "500" @@ -951,16 +949,6 @@ "200" ], "ResetOnInit": true - }, - { - "Name": "MaxLoadBalanceInterval", - "Path": "/proc/vendor_sched/max_load_balance_interval", - "Values": [ - "1", - "4" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ @@ -2031,13 +2019,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2123,12 +2111,6 @@ "Duration": 0, "Value": "0x0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2211,13 +2193,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2321,12 +2303,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2415,13 +2391,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2501,12 +2477,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 81858c83..875cb2cf 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -875,16 +875,6 @@ "200" ], "ResetOnInit": true - }, - { - "Name": "MaxLoadBalanceInterval", - "Path": "/proc/vendor_sched/max_load_balance_interval", - "Values": [ - "1", - "4" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ @@ -2005,12 +1995,6 @@ "Duration": 0, "Value": "0x0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2167,12 +2151,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2311,12 +2289,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index aa424626..3d76f979 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -56,7 +56,6 @@ "Values": [ "5000", "2000", - "1000", "500" ], "DefaultIndex": 0, @@ -950,16 +949,6 @@ "200" ], "ResetOnInit": true - }, - { - "Name": "MaxLoadBalanceInterval", - "Path": "/proc/vendor_sched/max_load_balance_interval", - "Values": [ - "1", - "4" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ @@ -2030,13 +2019,13 @@ "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_EXTREME", @@ -2122,12 +2111,6 @@ "Duration": 0, "Value": "0x0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2210,13 +2193,13 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2320,12 +2303,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2414,13 +2391,13 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", "Duration": 0, - "Value": "1000" + "Value": "5000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUMidClusterDownRateLimitUs", "Duration": 0, - "Value": "5000" + "Value": "20000" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2500,12 +2477,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MaxLoadBalanceInterval", - "Duration": 0, - "Value": "4" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle",