diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 52dd08ce..92eb3df1 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -61,6 +61,14 @@ on init chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/spc_threshold chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu3_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/memlat_cpuidle_state_aware + chown system system /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/memlat_cpuidle_state_aware chmod 0220 /proc/vendor_sched/set_task_group_bg chmod 0220 /proc/vendor_sched/set_task_group_cam @@ -170,6 +178,16 @@ on init write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/up_rate_limit_us 500 write /sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us 20000 + # memlat cpuidle awareness setting + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu3_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/memlat_cpuidle_state_aware 2 + write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/memlat_cpuidle_state_aware 2 + # RT uclamp setting write /proc/sys/kernel/sched_util_clamp_min_rt_default 0 diff --git a/device.mk b/device.mk index a7d51c22..fc06a799 100644 --- a/device.mk +++ b/device.mk @@ -1100,7 +1100,17 @@ PRODUCT_PACKAGES += \ include hardware/google/pixel/thermal/device.mk PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true -include device/google/gs101/edgetpu/edgetpu.mk +# EdgeTPU +include device/google/gs-common/edgetpu/edgetpu.mk +# Config variables for TPU chip on device. +$(call soong_config_set,edgetpu_config,chip,abrolhos) +# TPU firmware +PRODUCT_PACKAGES += edgetpu-abrolhos.fw +# TPU DBA AIDL HAL service +PRODUCT_PACKAGES += com.google.edgetpu.dba-service +# TPU DBA HAL C API library +PRODUCT_PACKAGES += libedgetpu_dba_hal.google + # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 35d3f755..fdc32922 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -15,6 +15,7 @@ */ #define LOG_TAG "dumpstate_device" +#define ATRACE_TAG ATRACE_TAG_ALWAYS #include @@ -22,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -215,6 +217,7 @@ void dumpCameraLogs(int fd, const std::string &destDir) { } timepoint_t startSection(int fd, const std::string §ionName) { + ATRACE_BEGIN(sectionName.c_str()); ::android::base::WriteStringToFd( "\n" "------ Section start: " + sectionName + " ------\n" @@ -223,6 +226,7 @@ timepoint_t startSection(int fd, const std::string §ionName) { } void endSection(int fd, const std::string §ionName, timepoint_t startTime) { + ATRACE_END(); auto endTime = std::chrono::steady_clock::now(); auto elapsedMsec = std::chrono::duration_cast (endTime - startTime).count(); @@ -946,6 +950,7 @@ void Dumpstate::dumpCameraSection(int fd) { } static void *dumpModemThread(void *data) { + ATRACE_ASYNC_BEGIN("dumpModemThread", 0); std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY; @@ -1051,12 +1056,14 @@ static void *dumpModemThread(void *data) { ALOGD("dumpModemThread finished\n"); + ATRACE_ASYNC_END("dumpModemThread", 0); return NULL; } ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFileDescriptor>& in_fds, IDumpstateDevice::DumpstateMode in_mode, int64_t in_timeoutMillis) { + ATRACE_BEGIN("dumpstateBoard"); // Unused arguments. (void) in_timeoutMillis; @@ -1103,6 +1110,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile pthread_join(modemThreadHandle, NULL); } + ATRACE_END(); return ndk::ScopedAStatus::ok(); } diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS deleted file mode 100644 index 9eb92a96..00000000 --- a/edgetpu/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# Devs who work on EdgeTPU on Android. -hsuy@google.com -yuchicheng@google.com -iayara@google.com -qinyiyan@google.com -macwang@google.com \ No newline at end of file diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk deleted file mode 100644 index ef74bcd0..00000000 --- a/edgetpu/edgetpu.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Config variables for TPU chip on device. -$(call soong_config_set,edgetpu_config,chip,abrolhos) - -# TPU logging service -PRODUCT_PACKAGES += \ - android.hardware.edgetpu.logging@service-edgetpu-logging - -# TPU firmware -PRODUCT_PACKAGES += \ - edgetpu-abrolhos.fw - -# TPU NN AIDL HAL -PRODUCT_PACKAGES += \ - android.hardware.neuralnetworks@service-darwinn-aidl - -# TPU application service -PRODUCT_PACKAGES += \ - vendor.google.edgetpu_app_service@1.0-service - -# TPU vendor service -PRODUCT_PACKAGES += \ - vendor.google.edgetpu_vendor_service@1.0-service - -# TPU HAL client library -PRODUCT_PACKAGES += \ - libedgetpu_client.google - -# TPU metrics logger library -PRODUCT_PACKAGES += \ - libmetrics_logger - -# TPU DBA AIDL HAL service -PRODUCT_PACKAGES += \ - com.google.edgetpu.dba-service - -# TPU DBA HAL C API library -PRODUCT_PACKAGES += \ - libedgetpu_dba_hal.google - -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/