From bdfa40990158b000721dffe54ad70bb6f20ffde8 Mon Sep 17 00:00:00 2001 From: Doreen Wang Date: Sat, 24 Sep 2022 16:25:30 +0000 Subject: [PATCH 1/3] RESTRICT AUTOMERGE: [3A] Update LOCAL_TARGET_PRODUCT for T6Pro Update LOCAL_TARGET_PRODUCT for T6Pro. Bug:246290120 Test: build pass Change-Id: Ifcda3fd12f634a331f1f0f5859bf16f48a83a7bf Change-Id: I5c021728dcfb6a55691684b6fdc966be6f4cf4e5 --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 9bcdfe11..11b046ee 100644 --- a/device.mk +++ b/device.mk @@ -504,6 +504,7 @@ CHEETAH_PRODUCT := %cheetah LYNX_PRODUCT := %lynx FELIX_PRODUCT := %felix CLOUDRIPPER_PRODUCT := %cloudripper +TANGOR_PRODUCT := %tangorpro ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := panther else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) @@ -514,6 +515,8 @@ else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := felix else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cloudripper +else ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := tangorpro else # WAR: continue defaulting to slider build on gs201 to not # break dev targets such as ravenclaw From a9b460cfe9193d2a7e4ef92e75485957602b239d Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Sat, 24 Sep 2022 00:43:41 +0100 Subject: [PATCH 2/3] pkvm: Prefix metrics when running on A0 chip A0 and B0 chips have different performance characteristics when it comes to the hypervisor because B0 waits for SysMMU_SYNCs to complete during every memory ownership transaction. Set debug.hypervisor.metrics_tag=hwrev_a0 on PROTO1.x and EVT1.0 devices. EVT1.1 and later are B0 and benchmarks are representative of production devices. This is only done on userdebug/eng builds. Test: 'getprop | grep hypervisor' on A0/B0 devices Change-Id: I0c81a0e4706a13cd63358de23048087a9190b9da --- conf/init.debug.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conf/init.debug.rc b/conf/init.debug.rc index b7512e4e..4d5e4c77 100644 --- a/conf/init.debug.rc +++ b/conf/init.debug.rc @@ -32,3 +32,12 @@ on post-fs-data chown bluetooth system /dev/logbuffer_btlpm chown bluetooth system /dev/logbuffer_btpower chown bluetooth system /dev/logbuffer_tty18 + +# pKVM performance is different on A0 and B0 chips. +# Add extra tag to metrics collected on A0 to separate the results. +on property:ro.revision=PROTO1.0 + setprop debug.hypervisor.metrics_tag "hwrev_a0" +on property:ro.revision=PROTO1.1 + setprop debug.hypervisor.metrics_tag "hwrev_a0" +on property:ro.revision=EVT1.0 + setprop debug.hypervisor.metrics_tag "hwrev_a0" From 76ffa9baa279518f5b05a8cc3e0b76fcfdadfe1c Mon Sep 17 00:00:00 2001 From: Doreen Wang Date: Sat, 24 Sep 2022 16:25:30 +0000 Subject: [PATCH 3/3] [3A] Update LOCAL_TARGET_PRODUCT for T6Pro Update LOCAL_TARGET_PRODUCT for T6Pro. Bug:246290120 Test: build pass Change-Id: Ifcda3fd12f634a331f1f0f5859bf16f48a83a7bf Change-Id: I5c021728dcfb6a55691684b6fdc966be6f4cf4e5 --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index f7783582..527021d1 100644 --- a/device.mk +++ b/device.mk @@ -516,6 +516,7 @@ CHEETAH_PRODUCT := %cheetah LYNX_PRODUCT := %lynx FELIX_PRODUCT := %felix CLOUDRIPPER_PRODUCT := %cloudripper +TANGOR_PRODUCT := %tangorpro ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := panther else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) @@ -526,6 +527,8 @@ else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := felix else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cloudripper +else ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := tangorpro else # WAR: continue defaulting to slider build on gs201 to not # break dev targets such as ravenclaw