Merge branch 'sycl' into pietro/events_rr

Author: PietroGhg

libclc/CMakeLists.txt

@@ -34,8 +34,14 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
   r600/lib/SOURCES;
   r600/libspirv/SOURCES;
   spirv/lib/SOURCES;
-  spirv64/lib/SOURCES
-  native_cpu-unknown-linux/libspirv/SOURCES
+  spirv64/lib/SOURCES;
+  native_cpu-unknown-linux/libspirv/SOURCES;
+  # CLC internal libraries
+  clc/lib/generic/SOURCES;
+  clc/lib/clspv/SOURCES;
+  clc/lib/clspv64/SOURCES;
+  clc/lib/spirv/SOURCES;
+  clc/lib/spirv64/SOURCES;
 )
 
 set( LIBCLC_MIN_LLVM 3.9.0 )
@@ -329,6 +335,14 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       " configuration, some SYCL programs may fail to build.")
   endif()
 
+  set( clc_lib_files )
+  libclc_configure_lib_source(
+    clc_lib_files
+    CLC_INTERNAL
+    LIB_ROOT_DIR clc
+    DIRS ${dirs} ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS}
+  )
+
   set( opencl_lib_files )
   set( opencl_gen_files )
 
@@ -474,7 +488,8 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     list( APPEND build_flags
       -D__CLC_INTERNAL
       -D${CLC_TARGET_DEFINE}
-      -I${CMAKE_CURRENT_SOURCE_DIR}/generic/include
+      # All libclc builtin libraries see CLC headers
+      -I${CMAKE_CURRENT_SOURCE_DIR}/clc/include
       # FIXME: Fix libclc to not require disabling this noisy warning
       -Wno-bitwise-conditional-parentheses
     )
@@ -483,6 +498,20 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       list( APPEND build_flags -mcpu=${cpu} )
     endif()
 
+    add_libclc_builtin_set(
+      CLC_INTERNAL
+      ARCH ${ARCH}
+      ARCH_SUFFIX clc-${arch_suffix}
+      TRIPLE ${clang_triple}
+      COMPILE_FLAGS ${build_flags}
+      OPT_FLAGS ${opt_flags}
+      LIB_FILES ${clc_lib_files}
+    )
+
+    list( APPEND build_flags
+      -I${CMAKE_CURRENT_SOURCE_DIR}/generic/include
+    )
+
     add_libclc_builtin_set(
       ARCH ${ARCH}
       ARCH_SUFFIX libspirv-${arch_suffix}
@@ -493,8 +522,9 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       LIB_FILES ${libspirv_lib_files}
       GEN_FILES ${libspirv_gen_files}
       ALIASES ${${d}_aliases}
-      GENERATE_TARGET "generate_convert_spirv.cl" "generate_convert_core.cl"
       PARENT_TARGET libspirv-builtins
+      # Link in the CLC builtins and internalize their symbols
+      INTERNAL_LINK_DEPENDENCIES $<TARGET_PROPERTY:builtins.link.clc-${arch_suffix},TARGET_FILE>
     )
 
     add_libclc_builtin_set(
@@ -506,8 +536,9 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       LIB_FILES ${opencl_lib_files}
       GEN_FILES ${opencl_gen_files}
       ALIASES ${${d}_aliases}
-      GENERATE_TARGET "generate_convert_clc.cl"
       PARENT_TARGET libopencl-builtins
+      # Link in the CLC builtins and internalize their symbols
+      INTERNAL_LINK_DEPENDENCIES $<TARGET_PROPERTY:builtins.link.clc-${arch_suffix},TARGET_FILE>
     )
   endforeach( d )
 endforeach( t )

libclc/generic/include/func.h renamed to libclc/clc/include/clc/clcfunc.h

@@ -1,8 +1,13 @@
-#ifndef CLC_FUNC
-#define CLC_FUNC
+#ifndef __CLC_CLCFUNC_H_
+#define __CLC_CLCFUNC_H_
 
 #define _CLC_OVERLOAD __attribute__((overloadable))
 #define _CLC_DECL
+#define _CLC_INLINE __attribute__((always_inline)) inline
+#define _CLC_CONVERGENT __attribute__((convergent))
+#define _CLC_PURE __attribute__((pure))
+#define _CLC_CONSTFN __attribute__((const))
+
 // avoid inlines for SPIR-V related targets since we'll optimise later in the
 // chain
 #if defined(CLC_SPIRV) || defined(CLC_SPIRV64)
@@ -12,9 +17,5 @@
 #else
 #define _CLC_DEF __attribute__((always_inline))
 #endif
-#define _CLC_INLINE __attribute__((always_inline)) inline
-#define _CLC_CONVERGENT __attribute__((convergent))
-#define _CLC_PURE __attribute__((pure))
-#define _CLC_CONSTFN __attribute__((const))
 
-#endif // CLC_FUNC
+#endif // __CLC_CLCFUNC_H_

libclc/generic/include/types.h renamed to libclc/clc/include/clc/clctypes.h

@@ -1,5 +1,5 @@
-#ifndef CLC_TYPES
-#define CLC_TYPES
+#ifndef __CLC_CLCTYPES_H_
+#define __CLC_CLCTYPES_H_
 
 /* 6.1.1 Built-in Scalar Data Types */
 
@@ -12,12 +12,12 @@ typedef unsigned long ulong;
 typedef __SIZE_TYPE__ size_t;
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 
-#define __stdint_join3(a,b,c) a ## b ## c
+#define __stdint_join3(a, b, c) a##b##c
 
-#define  __intn_t(n) __stdint_join3(__INT, n, _TYPE__)
+#define __intn_t(n) __stdint_join3(__INT, n, _TYPE__)
 #define __uintn_t(n) __stdint_join3(unsigned __INT, n, _TYPE__)
 
-typedef  __intn_t(__INTPTR_WIDTH__)  intptr_t;
+typedef __intn_t(__INTPTR_WIDTH__) intptr_t;
 typedef __uintn_t(__INTPTR_WIDTH__) uintptr_t;
 
 #undef __uintn_t
@@ -104,4 +104,4 @@ typedef __attribute__((ext_vector_type(8))) half half8;
 typedef __attribute__((ext_vector_type(16))) half half16;
 #endif
 
-#endif // CLC_TYPES
+#endif // __CLC_CLCTYPES_H_

libclc/clc/include/clc/geometric/clc_dot.h

@@ -0,0 +1,2 @@
+#define __CLC_BODY <clc/geometric/clc_dot.inc>
+#include <clc/geometric/floatn.inc>

libclc/clc/include/clc/geometric/clc_dot.inc

@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_FLOAT __clc_dot(__CLC_FLOATN p0, __CLC_FLOATN p1);

libclc/clc/include/clc/internal/clc.h

@@ -0,0 +1,26 @@
+#ifndef __CLC_INTERNAL_CLC_H_
+#define __CLC_INTERNAL_CLC_H_
+
+#ifndef cl_clang_storage_class_specifiers
+#error Implementation requires cl_clang_storage_class_specifiers extension!
+#endif
+
+#pragma OPENCL EXTENSION cl_clang_storage_class_specifiers : enable
+
+#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+#endif
+
+#ifdef cl_khr_fp16
+#pragma OPENCL EXTENSION cl_khr_fp16 : enable
+#endif
+
+/* Function Attributes */
+#include <clc/clcfunc.h>
+
+/* 6.1 Supported Data Types */
+#include <clc/clctypes.h>
+
+#pragma OPENCL EXTENSION all : disable
+
+#endif // __CLC_INTERNAL_CLC_H_

libclc/clc/lib/clspv/SOURCES

@@ -0,0 +1 @@
+dummy.cl

libclc/clc/lib/clspv/dummy.cl

@@ -0,0 +1 @@
+// Empty file

libclc/clc/lib/clspv64

@@ -0,0 +1 @@
+clspv

libclc/clc/lib/generic/SOURCES

@@ -0,0 +1 @@
+geometric/clc_dot.cl