From fdba30e5cca955f0418728fcdfe25420f861b3db Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 7 Aug 2017 15:00:33 -0400 Subject: [PATCH] P4 to Git Change 1444178 by lmoriche@lmoriche_opencl_dev2 on 2017/08/07 14:50:37 SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment - Use the internal libelf instead of the system's when building with cmake. - Don't include codecvt if WITH_LIQUID_FLASH is not defined - Don't memset the device::Kernel::workGroupInfo_, there's a std::string in it. The constructor already zeroes all the fields. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#8 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp#21 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#25 edit --- opencl/api/opencl/amdocl/CMakeLists.txt | 2 ++ opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/opencl/api/opencl/amdocl/CMakeLists.txt b/opencl/api/opencl/amdocl/CMakeLists.txt index 5dc525a6b4..8f5cd22215 100644 --- a/opencl/api/opencl/amdocl/CMakeLists.txt +++ b/opencl/api/opencl/amdocl/CMakeLists.txt @@ -15,6 +15,8 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common) include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders) +include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf) +include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common) include_directories(${CMAKE_SOURCE_DIR}/compiler/tools) add_library(amdocl64 SHARED diff --git a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp index 8b972a2ed8..8c5d7fe644 100644 --- a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp +++ b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp @@ -5,8 +5,6 @@ #include "cl_common.hpp" #include -#include -#include #include "platform/object.hpp" #include "cl_lqdflash_amd.h" @@ -18,6 +16,8 @@ #if defined(WITH_LIQUID_FLASH) #include "lf.h" +#include +#include #endif // WITH_LIQUID_FLASH namespace amd {