Resolve opencl cache creation fail in base_aaos

Changes done: -In multiuser mode APPs dont have access to /data/data/<progname>, thus add /data/user/userid/<progname>/.cache/neo_compiler_cache as 1st fallback cache dir for Android - Add /data/local/tmp/cache/<progname>/.cache/neo_compiler_cache as final fallback cache dir in case shell process dont have access to /data/data path Tests done: - Android build - Boot and verified with tflite gpu delegate with openCL Tracked-On: OAM-127697 Signed-off-by: Ratnesh Kumar Rai <[email protected]>
projectceladon · Nov 22, 2024 · e93dfb9 · e93dfb9
1 parent bb0a4a5
commit e93dfb9
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 6 deletions.
diff --git a/Android.bp b/Android.bp
@@ -12,6 +12,7 @@ cc_defaults {
         "-fexceptions",
         "-msse4.2",
         "-mavx2",
+        "-DANDROID",
         "-D__AVX2__",
         "-mretpoline",
         "-Wshorten-64-to-32",
@@ -38,6 +39,9 @@ cc_defaults {
 
     shared_libs: [
         "libgmm_umd",
+        "libcutils",
+        "liblog",
+        "libbinder",
     ],
 
     static_libs: [

diff --git a/shared/source/compiler_interface/linux/os_compiler_cache_helper.cpp b/shared/source/compiler_interface/linux/os_compiler_cache_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,10 +13,17 @@
 #include "shared/source/utilities/io_functions.h"
 
 #include "os_inc.h"
+#include <binder/IPCThreadState.h>
+#include <cutils/multiuser.h>
+#include <android/log.h>
 
 #include <dlfcn.h>
 #include <link.h>
+#include <string>
+#define LOG_TAG "COMPUTE_RUNTIME"
 
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+using ::android::IPCThreadState;
 namespace NEO {
 int64_t defaultCacheEnabled() {
     return 1l;
@@ -47,26 +54,92 @@ bool createCompilerCachePath(std::string &cacheDir) {
 bool checkDefaultCacheDirSettings(std::string &cacheDir, NEO::EnvironmentVariableReader &reader) {
     std::string emptyString = "";
     cacheDir = reader.getSetting("XDG_CACHE_HOME", emptyString);
+#ifdef ANDROID    
+    ALOGE("Ratne1: %s: CacheDir for openCL", cacheDir.c_str());
+#endif
 
     if (cacheDir.empty()) {
-        cacheDir = reader.getSetting("HOME", emptyString);
-        if (cacheDir.empty()) {
-            return false;
+#ifdef ANDROID
+        cacheDir = "/data/data";
+        cacheDir = joinPath(cacheDir, getprogname());
+        if (!NEO::SysCalls::pathExists(cacheDir)) {
+            NEO::SysCalls::mkdir(cacheDir);
         }
 
-        // .cache might not exist on fresh installation
         cacheDir = joinPath(cacheDir, ".cache/");
         if (!NEO::SysCalls::pathExists(cacheDir)) {
             NEO::SysCalls::mkdir(cacheDir);
         }
 
+        ALOGE("Ratne1: %s: CacheDir for openCL", cacheDir.c_str());
+
+        // In case /data/data/progname/.cache creation fails, which can happen in case of multiuser or due to service
+        //  running in shell due to permission issue, try multiuser path /data/user/userid/progname/.cache
+        if (!NEO::SysCalls::pathExists(cacheDir)) {
+	    PRINT_DEBUG_STRING(NEO::debugManager.flags.PrintDebugMessages.get(), stdout, "unable to create cache in:  %s\n\n",
+                            cacheDir.c_str());
+	    ALOGE("Ratne1: %s: unable to create CacheDir for openCL, trying multisuser path", cacheDir.c_str());
+            cacheDir = "/data/user";
+            ALOGE("Ratne1: %s: CacheDir1 now is for base_aaos ", cacheDir.c_str());
+
+	    IPCThreadState* ipc = IPCThreadState::self();
+	    const int32_t uid = ipc->getCallingUid();
+	    userid_t user = multiuser_get_user_id(uid);
+            ALOGE("Ratne1: user id %u", user);
+            cacheDir = joinPath(cacheDir, (std::to_string(user)).c_str());
+            ALOGE("Ratne1: %s: CacheDir2 now is for base_aaos ", cacheDir.c_str());
+            cacheDir = joinPath(cacheDir, getprogname());
+            ALOGE("Ratne1: %s: CacheDir3 now is for base_aaos ", cacheDir.c_str());
+            cacheDir = joinPath(cacheDir, ".cache/");
+            ALOGE("Ratne1: %s: CacheDir4 now is for base_aaos ", cacheDir.c_str());
+            if (!NEO::SysCalls::pathExists(cacheDir)) {
+                NEO::SysCalls::mkdir(cacheDir);
+            }
+        }
+
+        //now if cache dir is still not created use /data/local/tmp/cache/ as fallback cache dir
+        if (!NEO::SysCalls::pathExists(cacheDir)) {
+            cacheDir = "/data/local/tmp/cache";
+            if (!NEO::SysCalls::pathExists(cacheDir)) {
+	        NEO::SysCalls::mkdir(cacheDir);
+            }
+            cacheDir = joinPath(cacheDir, getprogname());
+            if (!NEO::SysCalls::pathExists(cacheDir)) {
+                NEO::SysCalls::mkdir(cacheDir);
+            }
+
+            cacheDir = joinPath(cacheDir, ".cache/");
+
+            if (!NEO::SysCalls::pathExists(cacheDir)) {
+                NEO::SysCalls::mkdir(cacheDir);
+            }
+            ALOGE("Ratnes: %s: CacheDir for openCL in temp", cacheDir.c_str());
+            PRINT_DEBUG_STRING(NEO::debugManager.flags.PrintDebugMessages.get(), stdout, "Trying to create cache in:  %s\n\n",
+                     cacheDir.c_str());
+        }
+
+        ALOGE("Ratnes: %s: CacheDir4 now is for base_aaos ", cacheDir.c_str());
+
+
+#else
+    cacheDir = reader.getSetting("HOME", emptyString);
+    if (cacheDir.empty()) {
+        return false;
+     }
+
+     cacheDir = joinPath(cacheDir, ".cache/");
+     if (!NEO::SysCalls::pathExists(cacheDir)) {
+         NEO::SysCalls::mkdir(cacheDir);
+     }
+#endif
         return createCompilerCachePath(cacheDir);
     }
 
     if (NEO::SysCalls::pathExists(cacheDir)) {
         return createCompilerCachePath(cacheDir);
     }
 
+
     return false;
 }
 
@@ -85,4 +158,4 @@ size_t getFileSize(const std::string &path) {
     }
     return 0u;
 }
-} // namespace NEO
+} // namespace NEO