From ccf1de99a1b84713afb5dbb530f3ca90ee58d77f Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 16 May 2017 16:06:16 -0400 Subject: [PATCH] P4 to Git Change 1410307 by lmoriche@lmoriche_palamida on 2017/05/16 15:09:08 SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment - Fix the build breakage caused by the latest changes from device-libs. Affected files ... ... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#7 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h#8 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#4 edit [ROCm/clr commit: e6dd2db23d8f36e4833898ed679a6c356541d949] --- projects/clr/opencl/CMakeLists.txt | 5 +---- .../api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 9396d5fd4b..b54fd4298b 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -8,7 +8,7 @@ endif() project(OpenCL-ROCm) set(LLVM_INCLUDE_TESTS CACHE BOOL OFF) -set(LLVM_TARGETS_TO_BUILD "AMDGPU" "X86" CACHE STRING "") +set(LLVM_TARGETS_TO_BUILD "AMDGPU" CACHE STRING "") set(LLVM_ENABLE_PROJECTS CACHE STRING "clang") set(LLVM_BUILD_GLOBAL_ISEL CACHE BOOL OFF) set(CLANG_ENABLE_ARCMT CACHE BOOL OFF) @@ -32,7 +32,6 @@ include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU) add_subdirectory(compiler/driver) -set(CMAKE_C_COMPILER "${PROJECT_BINARY_DIR}/compiler/llvm/bin/clang") set(BUILD_HC_LIB CACHE BOOL OFF) set(ROCM_DEVICELIB_INCLUDE_TESTS CACHE BOOL OFF) add_subdirectory(library/amdgcn) @@ -40,8 +39,6 @@ add_subdirectory(library/amdgcn) add_subdirectory(compiler/lib/loaders/elf/utils/libelf) add_subdirectory(tools/bc2h) -add_dependencies(bc2h clang) # FIXME: remove -add_dependencies(oclelf clang) # FIXME: remove add_subdirectory(runtime) add_subdirectory(api/opencl/amdocl) diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h index 5a93514f87..f8ec6167a0 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h @@ -87,6 +87,8 @@ extern "C" { #define CL_EXT_SUFFIX__VERSION_2_0 #define CL_API_SUFFIX__VERSION_2_1 #define CL_EXT_SUFFIX__VERSION_2_1 + #define CL_API_SUFFIX__VERSION_2_2 + #define CL_EXT_SUFFIX__VERSION_2_2 #ifdef __GNUC__ #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS