Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OPENCL]support google pixel phone opencl mode #399

Merged
merged 5 commits into from
Sep 18, 2020
Merged

[OPENCL]support google pixel phone opencl mode #399

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3866cd
[OPENCL]support google pixel phone opencl mode
Sep 16, 2020
f307f3b
Merge branch 'master' into feature/pixel_phone_opencl
shaundai-tencent Sep 17, 2020
bbce7ed
Merge branch 'master' into feature/pixel_phone_opencl
neiltian-tencent Sep 17, 2020
59af7ea
Merge branch 'master' into feature/pixel_phone_opencl
neiltian-tencent Sep 17, 2020
24ff98f
Merge branch 'master' into feature/pixel_phone_opencl
shaundai-tencent Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions source/tnn/device/opencl/opencl_wrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ static const std::vector<std::string> g_opencl_library_paths = {
// Mali
"/system/vendor/lib64/egl/libGLES_mali.so",
"/system/lib64/egl/libGLES_mali.so",
// Pixel Phone
"libOpenCL-pixel.so",
#else
// Qualcomm Adreno
"/system/vendor/lib/libOpenCL.so", "/system/lib/libOpenCL.so",
// Mali
"/system/vendor/lib/egl/libGLES_mali.so", "/system/lib/egl/libGLES_mali.so",
// other
"/system/vendor/lib/libPVROCL.so", "/data/data/org.pocl.libs/files/lib/libpocl.so"
"/system/vendor/lib/libPVROCL.so", "/data/data/org.pocl.libs/files/lib/libpocl.so",
// Pixel Phone
"libOpenCL-pixel.so",
#endif
#elif defined(__linux__)
"/usr/lib/libOpenCL.so",
Expand Down Expand Up @@ -104,10 +108,29 @@ bool OpenCLSymbols::LoadLibraryFromPath(const std::string &library_path) {
if (handle_ == nullptr) {
return false;
}
bool is_pixel = library_path == "libOpenCL-pixel.so";
typedef void* (*loadOpenCLPointer_t)(const char* name);
loadOpenCLPointer_t loadOpenCLPointer;
if(is_pixel){
typedef void (*enableOpenCL_t)();
enableOpenCL_t enableOpenCL = reinterpret_cast<enableOpenCL_t>(dlsym(handle_, "enableOpenCL"));
if (loadOpenCLPointer == nullptr) {
return false;
}
enableOpenCL();
loadOpenCLPointer = reinterpret_cast<loadOpenCLPointer_t>(dlsym(handle_, "loadOpenCLPointer"));
if (loadOpenCLPointer == nullptr) {
return false;
}
}

// load function ptr use dlopen and dlsym. if cann't find func_name, will return false.
#define TNN_LOAD_FUNCTION_PTR(func_name) \
func_name = reinterpret_cast<func_name##Func>(dlsym(handle_, #func_name)); \
if(is_pixel){ \
func_name = reinterpret_cast<func_name##Func>(loadOpenCLPointer(#func_name)); \
} else { \
func_name = reinterpret_cast<func_name##Func>(dlsym(handle_, #func_name)); \
} \
if (func_name == nullptr) { \
LOGE("load func (%s) from (%s) failed!\n", #func_name, library_path.c_str()); \
return false; \
Expand Down