Merge "Update documentation for utilities to find files loaded by a process." into rvc-dev am: 91bd44c678 am: 0451dc6e6e am: d3c43303bc am: 09599f1f8a am: 687986e8cf am: 0f306d7064
Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/21727300
Change-Id: I4e37b56be4fcf26e829b6c29079ea4904630a2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libraries/app-helpers/interfaces/common/src/android/platform/helpers/IRecorderHelper.java b/libraries/app-helpers/interfaces/common/src/android/platform/helpers/IRecorderHelper.java
new file mode 100644
index 0000000..add3479
--- /dev/null
+++ b/libraries/app-helpers/interfaces/common/src/android/platform/helpers/IRecorderHelper.java
@@ -0,0 +1,18 @@
+/**
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * <p>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
+ *
+ * <p>http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * <p>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.
+ */
+package android.platform.helpers;
+
+public interface IRecorderHelper extends IAppHelper {
+ // Inherit methods from super class.
+}
diff --git a/libraries/collectors-helper/memory/src/com/android/helpers/TotalPssHelper.java b/libraries/collectors-helper/memory/src/com/android/helpers/TotalPssHelper.java
index 7318bc1..14318cf 100644
--- a/libraries/collectors-helper/memory/src/com/android/helpers/TotalPssHelper.java
+++ b/libraries/collectors-helper/memory/src/com/android/helpers/TotalPssHelper.java
@@ -24,7 +24,7 @@
import android.os.Debug.MemoryInfo;
import android.util.Log;
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/scripts/perf-setup/p10c10-setup.sh b/scripts/perf-setup/p10c10-setup.sh
new file mode 100755
index 0000000..fbeb199
--- /dev/null
+++ b/scripts/perf-setup/p10c10-setup.sh
@@ -0,0 +1,63 @@
+#!/system/bin/sh
+#
+# Copyright (C) 2022 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.
+
+# Performance test setup for 2022 devices
+
+echo "Disabling Tskin thermal mitigation..."
+setprop persist.vendor.disable.thermal.control 1
+
+echo "Disabling TJ thermal mitigation..."
+setprop persist.vendor.disable.thermal.tj.control 1
+
+echo "Clearing cooling device states..."
+for i in /sys/devices/virtual/thermal/cooling_device*/user_vote; do echo 0 > "$i" 2>/dev/null; done
+for i in /sys/devices/virtual/thermal/cooling_device*/cur_state; do echo 0 > "$i" 2>/dev/null; done
+
+echo "Disabling powerhints..."
+setprop vendor.powerhal.init 0
+setprop ctl.restart vendor.power-hal-aidl
+
+echo "Locking LITTLE CPUs to the max freq..."
+echo 1803000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+echo 1803000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
+
+echo "Locking MID CPUs to the max freq..."
+echo 2348000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq
+echo 2348000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
+cat /sys/devices/system/cpu/cpu4/cpufreq/scaling_cur_freq
+
+echo "Locking BIG CPUs to the max freq..."
+echo 2850000 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq
+echo 2850000 > /sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq
+cat /sys/devices/system/cpu/cpu6/cpufreq/scaling_cur_freq
+
+echo "Locking GPU to the max freq..."
+echo 848000 > /sys/devices/platform/28000000.mali/scaling_max_freq
+echo 848000 > /sys/devices/platform/28000000.mali/scaling_min_freq
+cat /sys/devices/platform/28000000.mali/cur_freq
+
+echo "Locking MIF to the max freq..."
+echo 3172000 > /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/debug_scaling_devfreq_max
+echo 3172000 > /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/debug_scaling_devfreq_min
+cat /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/cur_freq
+
+echo "Locking INT to the max freq..."
+echo 533000 > /sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/exynos_data/debug_scaling_devfreq_max
+echo 533000 > /sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/exynos_data/debug_scaling_devfreq_min
+cat /sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/cur_freq
+
+
diff --git a/tests/bootdoa/fatal_allowlist b/tests/bootdoa/fatal_allowlist
index 0b8ba88..48b66f3 100644
--- a/tests/bootdoa/fatal_allowlist
+++ b/tests/bootdoa/fatal_allowlist
@@ -6,4 +6,7 @@
page\slast\spinned[0-9\S\s]+
PFN\s[0-9]+[A-Za-z0-9\S\s]+swapbacked\S
# b/222779442
-page_pinner[A-Za-z\S\s]+never\sset\S+
\ No newline at end of file
+page_pinner[A-Za-z\S\s]+never\sset\S+
+# b/234031026
+sysmmu[\S\s]+SysMMU\sREAD\sPAGE\sFAULT\sfrom\sAUR\SINST\SDATA\sVID[0-9a-zA-Z\S\s]+AxID\S\s0x[0-9a-z]{2}\S
+
