Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add API to get GPU private memory" into sc-dev am: 4b939ccd2f am: 7a58d28e3e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15266039

Change-Id: Id3a5194606c0cce5f36376cd3eed27efba0eb578
This commit is contained in:
Kalesh Singh
2021-07-15 17:52:49 +00:00
committed by Automerger Merge Worker
parent 844a275a3a 7a58d28e3e
commit 3d54f68455
6 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/Debug.java
View File

@@ -2599,11 +2599,11 @@ public final class Debug
public static native long getIonPoolsSizeKb();
/**
* Return GPU DMA buffer usage in kB or -1 on error.
* Returns the global total GPU-private memory in kB or -1 on error.
*
* @hide
*/
public static native long getGpuDmaBufUsageKb();
public static native long getGpuPrivateMemoryKb();
/**
* Return DMA-BUF memory mapped by processes in kB.

1
core/jni/Android.bp
View File

@@ -238,7 +238,6 @@ cc_library_shared {
],
shared_libs: [
"android.hardware.memtrack-V1-ndk_platform",
"audioclient-types-aidl-cpp",
"audioflinger-aidl-cpp",
"av-types-aidl-cpp",

33
core/jni/android_os_Debug.cpp
View File

@@ -33,7 +33,6 @@
#include <string>
#include <vector>
#include <aidl/android/hardware/memtrack/DeviceInfo.h>
#include <android-base/logging.h>
#include <bionic/malloc.h>
#include <debuggerd/client.h>
@@ -46,7 +45,6 @@
#include "jni.h"
#include <dmabufinfo/dmabuf_sysfs_stats.h>
#include <dmabufinfo/dmabufinfo.h>
#include <dmabufinfo/dmabuf_sysfs_stats.h>
#include <meminfo/procmeminfo.h>
#include <meminfo/sysmeminfo.h>
#include <memtrack/memtrack.h>
@@ -861,29 +859,24 @@ static jlong android_os_Debug_getDmabufHeapPoolsSizeKb(JNIEnv* env, jobject claz
return poolsSizeKb;
}
static jlong android_os_Debug_getGpuDmaBufUsageKb(JNIEnv* env, jobject clazz) {
std::vector<aidl::android::hardware::memtrack::DeviceInfo> gpu_device_info;
if (!memtrack_gpu_device_info(&gpu_device_info)) {
static jlong android_os_Debug_getGpuPrivateMemoryKb(JNIEnv* env, jobject clazz) {
struct memtrack_proc* p = memtrack_proc_new();
if (p == nullptr) {
LOG(ERROR) << "getGpuPrivateMemoryKb: Failed to create memtrack_proc";
return -1;
}
dmabufinfo::DmabufSysfsStats stats;
if (!GetDmabufSysfsStats(&stats)) {
// Memtrack hal defines PID 0 as global total for GPU-private (GL) memory.
if (memtrack_proc_get(p, 0) != 0) {
// The memtrack HAL may not be available, avoid flooding the log.
memtrack_proc_destroy(p);
return -1;
}
jlong sizeKb = 0;
const auto& importer_stats = stats.importer_info();
for (const auto& dev_info : gpu_device_info) {
const auto& importer_info = importer_stats.find(dev_info.name);
if (importer_info == importer_stats.end()) {
continue;
}
ssize_t gpuPrivateMem = memtrack_proc_gl_pss(p);
sizeKb += importer_info->second.size / 1024;
}
return sizeKb;
memtrack_proc_destroy(p);
return gpuPrivateMem / 1024;
}
static jlong android_os_Debug_getDmabufMappedSizeKb(JNIEnv* env, jobject clazz) {
@@ -994,8 +987,8 @@ static const JNINativeMethod gMethods[] = {
(void*)android_os_Debug_getIonHeapsSizeKb },
{ "getDmabufTotalExportedKb", "()J",
(void*)android_os_Debug_getDmabufTotalExportedKb },
{ "getGpuDmaBufUsageKb", "()J",
(void*)android_os_Debug_getGpuDmaBufUsageKb },
{ "getGpuPrivateMemoryKb", "()J",
(void*)android_os_Debug_getGpuPrivateMemoryKb },
{ "getDmabufHeapTotalExportedKb", "()J",
(void*)android_os_Debug_getDmabufHeapTotalExportedKb },
{ "getIonPoolsSizeKb", "()J",

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -11056,9 +11056,9 @@ public class ActivityManagerService extends IActivityManager.Stub
}
final long gpuUsage = Debug.getGpuTotalUsageKb();
if (gpuUsage >= 0) {
final long gpuDmaBufUsage = Debug.getGpuDmaBufUsageKb();
if (gpuDmaBufUsage >= 0) {
final long gpuPrivateUsage = gpuUsage - gpuDmaBufUsage;
final long gpuPrivateUsage = Debug.getGpuPrivateMemoryKb();
if (gpuPrivateUsage >= 0) {
final long gpuDmaBufUsage = gpuUsage - gpuPrivateUsage;
pw.print(" GPU: ");
pw.print(stringifyKBSize(gpuUsage));
pw.print(" (");

6
services/core/java/com/android/server/am/AppProfiler.java
View File

@@ -1561,9 +1561,9 @@ public class AppProfiler {
final long gpuUsage = Debug.getGpuTotalUsageKb();
if (gpuUsage >= 0) {
final long gpuDmaBufUsage = Debug.getGpuDmaBufUsageKb();
if (gpuDmaBufUsage >= 0) {
final long gpuPrivateUsage = gpuUsage - gpuDmaBufUsage;
final long gpuPrivateUsage = Debug.getGpuPrivateMemoryKb();
if (gpuPrivateUsage >= 0) {
final long gpuDmaBufUsage = gpuUsage - gpuPrivateUsage;
memInfoBuilder.append(" GPU: ");
memInfoBuilder.append(stringifyKBSize(gpuUsage));
memInfoBuilder.append(" (");

6
services/core/java/com/android/server/stats/pull/SystemMemoryUtil.java
View File

@@ -28,7 +28,7 @@ final class SystemMemoryUtil {
static Metrics getMetrics() {
int totalIonKb = (int) Debug.getDmabufHeapTotalExportedKb();
int gpuTotalUsageKb = (int) Debug.getGpuTotalUsageKb();
int gpuDmaBufUsageKb = (int) Debug.getGpuDmaBufUsageKb();
int gpuPrivateAllocationsKb = (int) Debug.getGpuPrivateMemoryKb();
int dmaBufTotalExportedKb = (int) Debug.getDmabufTotalExportedKb();
long[] mInfos = new long[Debug.MEMINFO_COUNT];
@@ -58,10 +58,6 @@ final class SystemMemoryUtil {
accountedKb += mInfos[Debug.MEMINFO_KERNEL_STACK];
}
int gpuPrivateAllocationsKb = -1;
if (gpuTotalUsageKb >= 0 && gpuDmaBufUsageKb >= 0) {
gpuPrivateAllocationsKb = gpuTotalUsageKb - gpuDmaBufUsageKb;
}
// If we can distinguish gpu private allocs it means the dmabuf metrics
// are supported already.
if (dmaBufTotalExportedKb >= 0 && gpuPrivateAllocationsKb >= 0) {