commit 252e5f6c5ec807f6b8fd4c9c253dca24105ba558
author Yiwei Zhang <zzyiwei@google.com> Wed Feb 19 15:44:17 2020 -0800
committer Yiwei Zhang <zzyiwei@google.com> Tue Jun 02 16:06:47 2020 -0700
tree ed44ae9dbf0eeaf40837d44d0fb88e2b5ee57605
parent 805d882ce10bf008c2aac0c00ed88a325c69291a

GPU Memory: install gpu_mem.o and integrate libgpumem

This change integrates libgpumem into gpuservice. gpu_mem.o c program is
required in the blueprint so that gpu_mem.o will be compiled and
installed at /system/etc/bpf/.

This change also adds a proper CleanSpec.mk for gpu_mem.o

Bug: 154524735
Test: adb shell dumpsys gpu --gpumem
Change-Id: Iad09d061691ffd4cf0fc4bde63cb6f0ae459aa27

services/gpuservice/GpuService.cpp

diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp
index 7bb0e4a..afdf390 100644
--- a/services/gpuservice/GpuService.cpp
+++ b/services/gpuservice/GpuService.cpp
@@ -24,11 +24,11 @@
 #include <binder/Parcel.h>
 #include <binder/PermissionCache.h>
 #include <cutils/properties.h>
+#include <gpumem/GpuMem.h>
 #include <gpustats/GpuStats.h>
 #include <private/android_filesystem_config.h>
 #include <utils/String8.h>
 #include <utils/Trace.h>
-
 #include <vkjson.h>
 
 namespace android {
@@ -45,7 +45,10 @@
 
 const char* const GpuService::SERVICE_NAME = "gpu";
 
-GpuService::GpuService() : mGpuStats(std::make_unique<GpuStats>()){};
+GpuService::GpuService()
+      : mGpuMem(std::make_unique<GpuMem>()), mGpuStats(std::make_unique<GpuStats>()) {
+    mGpuMem->initialize();
+};
 
 void GpuService::setGpuStats(const std::string& driverPackageName,
                              const std::string& driverVersionName, uint64_t driverVersionCode,
@@ -90,6 +93,7 @@
     } else {
         bool dumpAll = true;
         bool dumpDriverInfo = false;
+        bool dumpMem = false;
         bool dumpStats = false;
         size_t numArgs = args.size();
 
@@ -100,6 +104,8 @@
                     dumpStats = true;
                 } else if (args[index] == String16("--gpudriverinfo")) {
                     dumpDriverInfo = true;
+                } else if (args[index] == String16("--gpumem")) {
+                    dumpMem = true;
                 }
             }
         }
@@ -108,6 +114,10 @@
             dumpGameDriverInfo(&result);
             result.append("\n");
         }
+        if (dumpAll || dumpMem) {
+            mGpuMem->dump(args, &result);
+            result.append("\n");
+        }
         if (dumpAll || dumpStats) {
             mGpuStats->dump(args, &result);
             result.append("\n");