Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 11733120 from 990b023aae to 24Q3-release

Browse source 
Change-Id: I9db1292d267c00520b918c96b102153978a8d9a2
This commit is contained in:
Android Build Coastguard Worker 2024-04-18 23:01:32 +00:00
commit e4ea7aaa4f
14 changed files with 112 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conf/init.tokay.rc
View file

@ -73,3 +73,7 @@ on fs
# Permission for SSC mode enable # Permission for SSC mode enable
chown system system /sys/class/backlight/panel0-backlight/ssc_en chown system system /sys/class/backlight/panel0-backlight/ssc_en
chmod 664 /sys/class/backlight/panel0-backlight/ssc_en chmod 664 /sys/class/backlight/panel0-backlight/ssc_en
# Disable Async DVFS
on property:sys.boot_completed=1
write /sys/devices/platform/26040000.cal_if/async_dvfs_enabled 0

3
device-caimito-common.mk
View file

@ -27,7 +27,8 @@ PRODUCT_COPY_FILES += \
ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay)) ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite
ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng)) ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json

22
perf/powerhint-caiman.json
View file

@ -3140,6 +3140,7 @@
"Value": "20 80" "Value": "20 80"
} }
], ],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [ "AdpfConfig": [
{ {
"Name": "REFRESH_120FPS", "Name": "REFRESH_120FPS",
@ -3172,7 +3173,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 40000
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -3205,7 +3208,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 32500
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -3238,7 +3243,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -3260,7 +3267,8 @@
"UclampMin_Low": 196, "UclampMin_Low": 196,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowBoostWithoutPid", "Name": "UiLowBoostWithoutPid",
@ -3282,7 +3290,8 @@
"UclampMin_Low": 52, "UclampMin_Low": 52,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowNoneBoost", "Name": "UiLowNoneBoost",
@ -3304,7 +3313,8 @@
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
} }
] ]
} }

22
perf/powerhint-komodo.json
View file

@ -3140,6 +3140,7 @@
"Value": "20 80" "Value": "20 80"
} }
], ],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [ "AdpfConfig": [
{ {
"Name": "REFRESH_120FPS", "Name": "REFRESH_120FPS",
@ -3172,7 +3173,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 40000
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -3205,7 +3208,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 32500
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -3238,7 +3243,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -3260,7 +3267,8 @@
"UclampMin_Low": 196, "UclampMin_Low": 196,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowBoostWithoutPid", "Name": "UiLowBoostWithoutPid",
@ -3282,7 +3290,8 @@
"UclampMin_Low": 52, "UclampMin_Low": 52,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowNoneBoost", "Name": "UiLowNoneBoost",
@ -3304,7 +3313,8 @@
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0 "StaleTimeFactor": 15.0,
"GpuBoost": false
} }
] ]
} }

22
perf/powerhint-tokay.json
View file

@ -3140,6 +3140,7 @@
"Value": "20 80" "Value": "20 80"
} }
], ],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [ "AdpfConfig": [
{ {
"Name": "REFRESH_120FPS", "Name": "REFRESH_120FPS",
@ -3172,7 +3173,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 40000
}, },
{ {
"Name": "REFRESH_90FPS", "Name": "REFRESH_90FPS",
@ -3205,7 +3208,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 32500
}, },
{ {
"Name": "REFRESH_60FPS", "Name": "REFRESH_60FPS",
@ -3238,7 +3243,9 @@
"HBoostUclampMin": 722, "HBoostUclampMin": 722,
"JunkCheckTimeFactor": 1.2, "JunkCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25, "LowFrameRateThreshold": 25,
"MaxRecordsNum": 300 "MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}, },
{ {
"Name": "UiHighBoostWithoutPid", "Name": "UiHighBoostWithoutPid",
@ -3260,7 +3267,8 @@
"UclampMin_Low": 196, "UclampMin_Low": 196,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowBoostWithoutPid", "Name": "UiLowBoostWithoutPid",
@ -3282,7 +3290,8 @@
"UclampMin_Low": 52, "UclampMin_Low": 52,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
}, },
{ {
"Name": "UiLowNoneBoost", "Name": "UiLowNoneBoost",
@ -3304,7 +3313,8 @@
"UclampMin_Low": 0, "UclampMin_Low": 0,
"ReportingRateLimitNs": 1, "ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0, "TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0 "StaleTimeFactor": 5.0,
"GpuBoost": false
} }
] ]
} }

2
powerstats/caiman/service.cpp
View file

@ -49,7 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display"); addPixelStateResidencyDataProvider(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);

2
powerstats/komodo/service.cpp
View file

@ -49,7 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display"); addPixelStateResidencyDataProvider(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);

1
powerstats/tokay/service.cpp
View file

@ -62,6 +62,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addPixelStateResidencyDataProvider(p, "");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);

20
thermal/thermal_info_config_caiman.json
View file

@ -188,6 +188,19 @@
"Coefficient": [1.0, -1.0], "Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
"VirtualSensor": true,
"ModelPath": "vt_prediction_lstm_model.tflite",
"Formula": "USE_ML_MODEL",
"Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"PreviousSampleCount": 11,
"OutputLabelCount": 6,
"Multiplier": 0.001,
"SupportUnderStampling": true,
"ValidateInput": true
},
{ {
"Name": "STATS-UPDATOR", "Name": "STATS-UPDATOR",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -195,8 +208,8 @@
"Hidden": true, "Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "WEIGHTED_AVG", "Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"],
"Coefficient": [0.0, 0.0, 0.0], "Coefficient": [0.0, 0.0, 0.0, 0.0],
"Multiplier": 1, "Multiplier": 1,
"SendPowerHint": true, "SendPowerHint": true,
"PollingDelay": 300000, "PollingDelay": 300000,
@ -218,6 +231,9 @@
"SendCallback": true, "SendCallback": true,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000, "PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",

20
thermal/thermal_info_config_komodo.json
View file

@ -211,6 +211,19 @@
"Coefficient": [1.0, -1.0], "Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
"VirtualSensor": true,
"ModelPath": "vt_prediction_lstm_model.tflite",
"Formula": "USE_ML_MODEL",
"Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"PreviousSampleCount": 11,
"OutputLabelCount": 6,
"Multiplier": 0.001,
"SupportUnderSampling": true,
"ValidateInput": true
},
{ {
"Name": "STATS-UPDATOR", "Name": "STATS-UPDATOR",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -218,8 +231,8 @@
"Hidden": true, "Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "WEIGHTED_AVG", "Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"],
"Coefficient": [0.0, 0.0, 0.0], "Coefficient": [0.0, 0.0, 0.0, 0.0],
"Multiplier": 1, "Multiplier": 1,
"SendPowerHint": true, "SendPowerHint": true,
"PollingDelay": 300000, "PollingDelay": 300000,
@ -241,6 +254,9 @@
"SendCallback": true, "SendCallback": true,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000, "PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",

20
thermal/thermal_info_config_tokay.json
View file

@ -178,6 +178,19 @@
"Coefficient": [1.0, -1.0], "Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
"VirtualSensor": true,
"ModelPath": "vt_prediction_lstm_model.tflite",
"Formula": "USE_ML_MODEL",
"Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"PreviousSampleCount": 11,
"OutputLabelCount": 6,
"Multiplier": 0.001,
"SupportUnderSampling": true,
"ValidateInput": true
},
{ {
"Name": "STATS-UPDATOR", "Name": "STATS-UPDATOR",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -185,8 +198,8 @@
"Hidden": true, "Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "WEIGHTED_AVG", "Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"],
"Coefficient": [0.0, 0.0, 0.0], "Coefficient": [0.0, 0.0, 0.0, 0.0],
"Multiplier": 1, "Multiplier": 1,
"SendPowerHint": true, "SendPowerHint": true,
"PollingDelay": 300000, "PollingDelay": 300000,
@ -208,6 +221,9 @@
"SendCallback": true, "SendCallback": true,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000, "PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "tpu_cooling", "CdevRequest": "tpu_cooling",

BIN
thermal/vt_prediction_lstm_model_caiman.tflite Normal file
View file

Binary file not shown.

BIN
thermal/vt_prediction_lstm_model_komodo.tflite Normal file
View file

Binary file not shown.

BIN
thermal/vt_prediction_lstm_model_tokay.tflite Normal file
View file

Binary file not shown.