From b700fec1132a58a421c90298ba387b5d5b82442d Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Tue, 16 Apr 2024 16:31:28 -0700 Subject: [PATCH] powerhint: Add nodes required to enable auto migration margins/dvfs headroom Everything should be disabled by default. Make sure camera and game explicitly disable them by default too. Ensure the feature is disable when screen is idle. Bug: 315748906 Signed-off-by: Yvonne Yip (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fc8763127f66581e0543cf57d36b057100b72190) Merged-In: I3dd2bfe1824af489cd1ccc3a69557c180bf33ddf Change-Id: I3dd2bfe1824af489cd1ccc3a69557c180bf33ddf --- perf/powerhint-caiman.json | 162 +++++++++++++++++++++++++++++++++++++ perf/powerhint-komodo.json | 162 +++++++++++++++++++++++++++++++++++++ perf/powerhint-tokay.json | 162 +++++++++++++++++++++++++++++++++++++ 3 files changed, 486 insertions(+) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 02de119a..23fbd03b 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -205,6 +205,60 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 2, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -1818,6 +1872,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", @@ -1974,6 +2040,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", @@ -2154,6 +2232,18 @@ "Duration": 0, "Value": "1100 1024 1100" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", @@ -2250,6 +2340,18 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterDownRateLimitUs", @@ -2466,6 +2568,18 @@ "Duration": 0, "Value": "0-6" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2755,6 +2869,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2983,6 +3109,30 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUMidClusterMaxFreq", @@ -3061,6 +3211,18 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 577ea063..5b26375c 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -205,6 +205,60 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 2, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -1818,6 +1872,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", @@ -1974,6 +2040,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", @@ -2154,6 +2232,18 @@ "Duration": 0, "Value": "1100 1024 1100" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", @@ -2250,6 +2340,18 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterDownRateLimitUs", @@ -2466,6 +2568,18 @@ "Duration": 0, "Value": "0-6" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2755,6 +2869,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2983,6 +3109,30 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUMidClusterMaxFreq", @@ -3061,6 +3211,18 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 02de119a..23fbd03b 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -205,6 +205,60 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "AutoMigrationMarginsEnable", + "Path": "/proc/vendor_sched/auto_migration_margins_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "AutoDvfsHeadroomEnable", + "Path": "/proc/vendor_sched/auto_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "TARampupMultiplier", + "Path": "/proc/vendor_sched/groups/ta/rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 1, + "ResetOnInit": true + }, + { + "Name": "AdpfRampupMultiplier", + "Path": "/proc/vendor_sched/adpf_rampup_multiplier", + "Values": [ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8" + ], + "DefaultIndex": 2, + "ResetOnInit": true + }, { "Name": "CPUUClampMaxFilterEnable", "Path": "/proc/vendor_sched/uclamp_max_filter_enable", @@ -1818,6 +1872,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "CPULittleClusterDownRateLimitUs", @@ -1974,6 +2040,18 @@ "Duration": 0, "Value": "cam2" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPULittleClusterDownRateLimitUs", @@ -2154,6 +2232,18 @@ "Duration": 0, "Value": "1100 1024 1100" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPULittleClusterDownRateLimitUs", @@ -2250,6 +2340,18 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CPULittleClusterDownRateLimitUs", @@ -2466,6 +2568,18 @@ "Duration": 0, "Value": "0-6" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CPUDVFSHeadroom", @@ -2755,6 +2869,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "CPULittleClusterDownRateLimitUs", @@ -2983,6 +3109,30 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "TARampupMultiplier", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "AdpfRampupMultiplier", + "Duration": 0, + "Value": "2" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUMidClusterMaxFreq", @@ -3061,6 +3211,18 @@ "Duration": 2000, "Value": "44" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "CPULittleClusterDownRateLimitUs",