From 6a77a85f6a4bc8eacc603ce8629f1d14821d6c98 Mon Sep 17 00:00:00 2001 From: Will Song Date: Mon, 15 Jul 2024 12:03:04 -0700 Subject: [PATCH 1/4] gs-common: Added common perf init.rc Migrate configuratuions from devices setting to common folder for kernel 6.1 devices. Bug: 335874870 Flag: NONE code refactor Test: Boot and check parameters Change-Id: I3c204c1df36eda67744d085600a95ac8bb696da9 Signed-off-by: Will Song --- performance/Android.bp | 5 ++++- performance/init.pixel-perf.rc | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 performance/init.pixel-perf.rc diff --git a/performance/Android.bp b/performance/Android.bp index 5c0e0b2..6dae537 100644 --- a/performance/Android.bp +++ b/performance/Android.bp @@ -5,7 +5,10 @@ package { cc_binary { name: "dump_perf", srcs: ["dump_perf.cpp"], - init_rc: ["init.pixel-mm-gs.rc"], + init_rc: [ + "init.pixel-mm-gs.rc", + "init.pixel-perf.rc", + ], cflags: [ "-Wall", "-Wextra", diff --git a/performance/init.pixel-perf.rc b/performance/init.pixel-perf.rc new file mode 100644 index 0000000..82766a5 --- /dev/null +++ b/performance/init.pixel-perf.rc @@ -0,0 +1,13 @@ +# Copyright (C) 2024 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. From 38522ec23eb70d44948b2dfd6ac799266a88be42 Mon Sep 17 00:00:00 2001 From: Will Song Date: Thu, 15 Aug 2024 16:53:30 -0700 Subject: [PATCH 2/4] gs-common: Move cpufreq perf settings to gs-common Moving common cpufreq perf settings to gs-common Bug: 335874870 Flag: NONE code refactor Test: boot and check parameters Change-Id: I9038a54d782be75d520e611fd93d18b1880ae442 Signed-off-by: Will Song --- performance/init.pixel-perf.rc | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/performance/init.pixel-perf.rc b/performance/init.pixel-perf.rc index 82766a5..7d56deb 100644 --- a/performance/init.pixel-perf.rc +++ b/performance/init.pixel-perf.rc @@ -11,3 +11,65 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +on init + chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold + chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold + + chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/limit_frequency + chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency + + chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/pmu_limit_enable + chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/pmu_limit_enable + + # cpufreq governor setting + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu5/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu6/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor sched_pixel + write /sys/devices/system/cpu/cpu8/cpufreq/scaling_governor sched_pixel + + write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu1/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu2/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu3/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu5/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/up_rate_limit_us 500 + write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/up_rate_limit_us 500 + + write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu1/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu2/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu3/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu5/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 500 + write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us 500 From 7606e415045aeaea6326cef4fc64aff60e19f522 Mon Sep 17 00:00:00 2001 From: "Pechetty Sravani (xWF)" Date: Mon, 19 Aug 2024 05:33:45 +0000 Subject: [PATCH 3/4] Revert "gs-common: Move cpufreq perf settings to gs-common" Revert submission 28323508-common_perf_init Reason for revert: Potential culprit for b/360746202- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:28323508-common_perf_init Change-Id: I0dd3825e9574b79f761a43edc56f86c060103aeb --- performance/init.pixel-perf.rc | 62 ---------------------------------- 1 file changed, 62 deletions(-) diff --git a/performance/init.pixel-perf.rc b/performance/init.pixel-perf.rc index 7d56deb..82766a5 100644 --- a/performance/init.pixel-perf.rc +++ b/performance/init.pixel-perf.rc @@ -11,65 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -on init - chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/spc_threshold - chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold - - chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/limit_frequency - chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency - - chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy1/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy2/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy3/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy5/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy7/sched_pixel/pmu_limit_enable - chown system system /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/pmu_limit_enable - - # cpufreq governor setting - write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu5/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu6/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor sched_pixel - write /sys/devices/system/cpu/cpu8/cpufreq/scaling_governor sched_pixel - - write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu1/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu2/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu3/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu5/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/up_rate_limit_us 500 - write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/up_rate_limit_us 500 - - write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu1/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu2/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu3/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu5/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 500 - write /sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us 500 From 98e6a61c1f41e00f950ef08d00cb30f7635a6d49 Mon Sep 17 00:00:00 2001 From: "Pechetty Sravani (xWF)" Date: Mon, 19 Aug 2024 05:33:45 +0000 Subject: [PATCH 4/4] Revert "gs-common: Added common perf init.rc" Revert submission 28323508-common_perf_init Reason for revert: Potential culprit for b/360746202- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:28323508-common_perf_init Change-Id: Ic29fb88b0d78974af602ff12456fb39c223c19e7 --- performance/Android.bp | 5 +---- performance/init.pixel-perf.rc | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 performance/init.pixel-perf.rc diff --git a/performance/Android.bp b/performance/Android.bp index 6dae537..5c0e0b2 100644 --- a/performance/Android.bp +++ b/performance/Android.bp @@ -5,10 +5,7 @@ package { cc_binary { name: "dump_perf", srcs: ["dump_perf.cpp"], - init_rc: [ - "init.pixel-mm-gs.rc", - "init.pixel-perf.rc", - ], + init_rc: ["init.pixel-mm-gs.rc"], cflags: [ "-Wall", "-Wextra", diff --git a/performance/init.pixel-perf.rc b/performance/init.pixel-perf.rc deleted file mode 100644 index 82766a5..0000000 --- a/performance/init.pixel-perf.rc +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2024 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License.