Commit 3b9bed75 authored by Jurek, Pawel's avatar Jurek, Pawel Committed by gbsbuild

Update prebuilt opencl-clang package with clang.exe based on LLVM7

Change-Id: I84164d964e7736eea44bf05c7a83a650a57ae46a
parent c0f7b762
......@@ -33,21 +33,12 @@
# In new Clang versions VME types are built-in. Keep this flag until all OS's update Clang version to 8
if(NOT DEFINED VME_TYPES_DEFINED)
set(VME_TYPES_DEFINED FALSE)
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
set(VME_TYPES_DEFINED TRUE)
endif()
endif()
set(CLANG_EXE_VERSION_GE_7 FALSE)
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
set(CLANG_EXE_VERSION_GE_7 TRUE)
set(VME_TYPES_DEFINED TRUE)
endif()
set(CCLANG_BUILD_INTREE_LLVM FALSE)
if(EXISTS ${LLVM_SOURCE_DIR}/projects/opencl-clang)
set(CCLANG_BUILD_INTREE_LLVM TRUE)
set(VME_TYPES_DEFINED TRUE)
set(CLANG_SOURCE_DIR ${LLVM_SOURCE_DIR}/tools/clang)
endif()
......@@ -971,9 +962,6 @@ set(FLAG "")
if(${VME_TYPES_DEFINED})
list(APPEND FLAG "__VME_TYPES_DEFINED__")
endif(${VME_TYPES_DEFINED})
if(${CLANG_EXE_VERSION_GE_7})
list(APPEND FLAG "__CLANG7__")
endif()
igc_bif_find_cl_files(IGC_BUILD__BIF_OCL_COMMON_DEPENDS ${IGC_BUILD__BIF_OCL_COMMON_INC_DIRS} "${IGC_OPTION__BIF_SRC_OCL_DIR}/Implementation")
......
......@@ -401,13 +401,6 @@ ndrange_t __attribute__((overloadable)) ndrange_3D(const size_t[3]);
ndrange_t __attribute__((overloadable)) ndrange_3D(const size_t[3], const size_t[3]);
ndrange_t __attribute__((overloadable)) ndrange_3D(const size_t[3], const size_t[3], const size_t[3]);
#ifndef __CLANG7__ // Clang 7.0+
#if defined(cl_khr_subgroups)
uint __attribute__((overloadable)) get_kernel_sub_group_count_for_ndrange(const ndrange_t range, void(^block)(void));
uint __attribute__((overloadable)) get_kernel_max_sub_group_size_for_ndrange(const ndrange_t range, void(^block)(void));
#endif
#endif // !__VME_TYPES_DEFINED__
void __attribute__((overloadable)) retain_event(clk_event_t);
void __attribute__((overloadable)) release_event(clk_event_t);
......
......@@ -1365,12 +1365,6 @@ namespace TC
break;
case TB_DATA_FORMAT_SPIR_V:
optionsEx += " -emit-spirv";
// There's no way to get Clang version from the DLL,
// so in the transition period we must rely on the fact that
// we will emit spirv as intermediate only with Clang5.0 (and later).
// TODO: Remove this and related code in cth after all platforms switch to 8.0 from 7.0.
optionsEx += " -D__CLANG7__";
break;
default:
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment