From 22dcc3447baa8b2827e786f90ffe175d87ef4738 Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Wed, 27 Nov 2024 19:15:44 +0000 Subject: [PATCH] Add a way to disable auto prefer fit for launch. This change introduces "is APF enabled" system properties, and uses them as trigger conditions for APF nodes / pre-APF nodes. By default APF nodes are active, and pre-APF nodes are inactive, which maintains the situation before this change. A future experiment will flip "is APF enabled" system properties, deactivating APF nodes and activating pre-APF nodes. For more info see go/pixel-perf-apf-experiment. Bug: 365855872 Test: set vendor.powerhal.apf_enabled=false, vendor.powerhal.apf_disabled=true, observe auto_prefer_fit procfs value is never "1" Flag: NONE powerhint change does not support flags Change-Id: I919ad3ffe5f496df75bcb492bd3b4fa2285df65c Signed-off-by: Dmitry Skiba --- device-caiman.mk | 5 +++++ device-komodo.mk | 5 +++++ device-ripcurrentpro.mk | 5 +++++ device-tokay.mk | 5 +++++ perf/powerhint-caiman.json | 36 ++++++++++++++++++++++++------- perf/powerhint-komodo.json | 36 ++++++++++++++++++++++++------- perf/powerhint-ripcurrentpro.json | 36 ++++++++++++++++++++++++------- perf/powerhint-tokay.json | 36 ++++++++++++++++++++++++------- 8 files changed, 132 insertions(+), 32 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 73c1a53f..ad2f174a 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -502,3 +502,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-komodo.mk b/device-komodo.mk index e7cc9dd5..7c3595bd 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -503,3 +503,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 9434e674..d3d9ef8f 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -245,3 +245,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Thread HAL PRODUCT_PACKAGES += \ com.google.caimito.hardware.threadnetwork + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-tokay.mk b/device-tokay.mk index 5413d69e..a3252833 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -472,3 +472,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 0bed18b6..9d751f7a 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -1107,6 +1107,13 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1181,7 +1188,8 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", @@ -1189,35 +1197,47 @@ "Duration": 5000, "Value": "0xff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0xff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "590" + "Duration": 5000, + "Value": "590", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 0ccc1606..d35b21a3 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -1107,6 +1107,13 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1181,7 +1188,8 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", @@ -1189,35 +1197,47 @@ "Duration": 5000, "Value": "0xff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0xff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "590" + "Duration": 5000, + "Value": "590", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index f970372a..274b0e9f 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -991,6 +991,13 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1065,7 +1072,8 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", @@ -1073,35 +1081,47 @@ "Duration": 5000, "Value": "0xff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0xff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "590" + "Duration": 5000, + "Value": "590", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 1bbab17a..b64c2eaf 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -1107,6 +1107,13 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1181,7 +1188,8 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", @@ -1189,35 +1197,47 @@ "Duration": 5000, "Value": "0xff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0xff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "590" + "Duration": 5000, + "Value": "590", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH",