From 27fd9ccb0d2f656587f470a9bdde54299f10a321 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 8 Aug 2017 00:31:20 -0400 Subject: [PATCH] P4 to Git Change 1444296 by lmoriche@lmoriche_palamida on 2017/08/08 00:10:29 SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment - Disable LLVM object compression. Allows closed source LLVM binaries to run with the open source runtime - Define the DEBUG macro for Debug build types - Use the prepared amdgcn lib instead of the static lib when generating the .bc includes for the runtime. Affected files ... ... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#14 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#9 edit ... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#8 edit [ROCm/clr commit: c0cdecf5442603853d982b17f598d9536b34a65d] --- projects/clr/opencl/CMakeLists.txt | 1 + projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index a679c4f2f3..905d9da93a 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -19,6 +19,7 @@ set(LLVM_BUILD_TOOLS CACHE BOOL OFF) set(LLVM_TARGETS_TO_BUILD "AMDGPU" CACHE STRING "") set(LLVM_ENABLE_PROJECTS CACHE STRING "clang") set(LLVM_BUILD_GLOBAL_ISEL CACHE BOOL OFF) +set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "") set(CLANG_ENABLE_ARCMT CACHE BOOL OFF) set(CLANG_ENABLE_STATIC_ANALYZER CACHE BOOL OFF) diff --git a/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt index 8f5cd22215..a403633739 100644 --- a/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt +++ b/projects/clr/opencl/api/opencl/amdocl/CMakeLists.txt @@ -5,6 +5,10 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER) +if(CMAKE_BUILD_TYPE MATCHES "^Debug$") + add_definitions(-DDEBUG) +endif() + include_directories(${CMAKE_SOURCE_DIR}/runtime) include_directories(${CMAKE_SOURCE_DIR}/api/opencl) include_directories(${CMAKE_SOURCE_DIR}/api/opencl/khronos) @@ -15,8 +19,6 @@ 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