[SYCL] [NATIVECPU] Implement missing math builtins for scalar data types

clang/lib/Basic/TargetInfo.cpp

@@ -517,9 +517,11 @@ void TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) {
   if (Opts.FakeAddressSpaceMap)
     AddrSpaceMap = &FakeAddrSpaceMap;
 
-  if (Opts.SYCLIsDevice && Opts.SYCLIsNativeCPU) {
+  if ((Opts.SYCLIsDevice || Opts.OpenCL) && Opts.SYCLIsNativeCPU) {
     // For SYCL Native CPU we use the NVPTXAddrSpaceMap because
-    // we need builtins to be mangled with AS information
+    // we need builtins to be mangled with AS information.
+    // This is also enabled in OpenCL mode so that mangling
+    // matches when building libclc.
 
     static const unsigned SYCLNativeCPUASMap[] = {
         0,  // Default

clang/test/CodeGenSYCL/native_cpu_as.cpp

@@ -0,0 +1,36 @@
+// This test is temporarily disabled for SYCL Native CPU on Windows
+// UNSUPPORTED: system-windows
+// Checks that name mangling matches between SYCL Native CPU and OpenCL when -fsycl-is-native-cpu is set
+// RUN: %clang_cc1 -DCPP -fsycl-is-device -S -emit-llvm -internal-isystem %S/Inputs -fsycl-is-native-cpu -o %t_sycl.ll %s 
+// RUN: FileCheck -input-file=%t_sycl.ll %s 
+
+// RUN: %clang_cc1 -x cl -DOCL -S -emit-llvm -internal-isystem %S/Inputs -fsycl-is-native-cpu -o %t_ocl.ll %s 
+// RUN: FileCheck -input-file=%t_ocl.ll %s 
+
+#ifdef CPP
+#define AS_LOCAL __attribute((address_space(3)))
+#define AS_GLOBAL __attribute((address_space(1)))
+#define AS_PRIVATE __attribute((address_space(0)))
+#define ATTRS [[intel::device_indirectly_callable]]
+#define ATTRS2 SYCL_EXTERNAL
+#else 
+#ifdef OCL
+#define AS_LOCAL __local
+#define AS_GLOBAL __global
+#define AS_PRIVATE __private
+#define ATTRS __attribute((overloadable))
+#define ATTRS2 __attribute((overloadable))
+#endif
+#endif
+
+
+ATTRS2 void use_private(int *p);
+ATTRS  void func(AS_LOCAL int *p1, AS_GLOBAL int *p2, AS_PRIVATE int *p3){
+  int private_var;
+  use_private(&private_var);
+}
+// CHECK: define dso_local void @_Z4funcPU3AS3iPU3AS1iPi(
+// CHECK: call void @_Z11use_privatePi(
+
+
+

libclc/CMakeLists.txt

@@ -345,8 +345,9 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
 				# clang builtins need to be accessible
 				set( flags "SHELL:-mcpu=gfx940")
       elseif( ${ARCH}  STREQUAL x86_64)
-        # TODO: This is used by native cpu, we should define an option to set this flags
+        # TODO: This is used by SYCL Native Cpu, we should define an option to set this flags
         set( flags "SHELL:-Xclang -target-feature -Xclang +avx"
+            "SHELL:-Xclang -fsycl-is-native-cpu"
             "SHELL:-Xclang -target-feature -Xclang +avx512f")
 			else()
 				set ( flags )

libclc/x86_64-unknown-linux/libspirv/SOURCES

@@ -16,3 +16,4 @@ math/native_sqrt.cl
 math/rint.cl
 math/round.cl
 math/trunc.cl
+shared/helpers.ll

libclc/x86_64-unknown-linux/libspirv/integer/helpers.h

@@ -0,0 +1,9 @@
+#include "func.h"
+
+#define GEN_UNARY_BUILTIN_T(NAME, TYPE)                                        \
+  _CLC_OVERLOAD TYPE __##NAME##_helper(TYPE);                                  \
+  _CLC_OVERLOAD TYPE __spirv_ocl_##NAME(TYPE n) { return __##NAME##_helper(n); }
+
+#define GEN_UNARY_BUILTIN(NAME)                                                \
+  GEN_UNARY_BUILTIN_T(NAME, int)                                               \
+  GEN_UNARY_BUILTIN_T(NAME, signed char)

libclc/x86_64-unknown-linux/libspirv/integer/popcount.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(popcount)

libclc/x86_64-unknown-linux/libspirv/math/ceil.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(ceil)

libclc/x86_64-unknown-linux/libspirv/math/fabs.cl

@@ -0,0 +1,4 @@
+#define IS_FABS
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(fabs)

libclc/x86_64-unknown-linux/libspirv/math/floor.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(floor)

libclc/x86_64-unknown-linux/libspirv/math/fma.cl

@@ -0,0 +1,4 @@
+#include "helpers.h"
+
+GEN_TERNARY_BUILTIN(fma);
+

libclc/x86_64-unknown-linux/libspirv/math/helpers.h

@@ -0,0 +1,82 @@
+#include "func.h"
+#include "types.h"
+
+#ifdef NO_CLANG_BUILTINS
+
+#define GEN_UNARY_BUILTIN_T(NAME, TYPE)                                        \
+  _CLC_OVERLOAD TYPE __##NAME##_helper(TYPE);                                  \
+  _CLC_OVERLOAD TYPE __spirv_ocl_##NAME(TYPE n) { return __##NAME##_helper(n); }
+
+#define GEN_TERNARY_BUILTIN_T(NAME, TYPE)                                      \
+  _CLC_OVERLOAD TYPE __##NAME##_helper(TYPE, TYPE, TYPE);                      \
+  _CLC_OVERLOAD TYPE __spirv_ocl_##NAME(TYPE a, TYPE b, TYPE c) {              \
+    return __##NAME##_helper(a, b, c);                                         \
+  }
+#define GEN_UNARY_BUILTIN(NAME)                                                \
+  GEN_UNARY_BUILTIN_T(NAME, float)                                             \
+  GEN_UNARY_BUILTIN_T(NAME, double)
+
+#define GEN_TERNARY_BUILTIN(NAME)                                              \
+  GEN_TERNARY_BUILTIN_T(NAME, float)                                           \
+  GEN_TERNARY_BUILTIN_T(NAME, double)
+
+#else
+
+#ifndef IS_NATIVE
+#define GETNAME(ID) __spirv_ocl_##ID
+#else
+#define GETNAME(ID) __spirv_ocl_native_##ID
+#endif
+
+// Todo: fabs is the only builtin whose vector version is not named
+// __builtin_elementwise_##NAME
+#ifndef IS_FABS
+#define GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, NUM)                              \
+  _CLC_OVERLOAD TYPE##NUM GETNAME(NAME)(TYPE##NUM n) {                         \
+    return __builtin_elementwise_##NAME(n);                                    \
+  }
+#else
+#define GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, NUM)                              \
+  _CLC_OVERLOAD TYPE##NUM GETNAME(NAME)(TYPE##NUM n) {                         \
+    return __builtin_elementwise_abs(n);                                       \
+  }
+#endif
+
+#define GEN_UNARY_VECTOR_BUILTIN_T(NAME, TYPE)                                 \
+  GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, 2)                                      \
+  GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, 3)                                      \
+  GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, 4)                                      \
+  GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, 8)                                      \
+  GEN_UNARY_VECTOR_BUILTIN(NAME, TYPE, 16)
+
+#define GEN_UNARY_BUILTIN(NAME)                                                \
+  _CLC_OVERLOAD float GETNAME(NAME)(float n) {                                 \
+    return __builtin_##NAME##f(n);                                             \
+  }                                                                            \
+  _CLC_OVERLOAD double GETNAME(NAME)(double n) { return __builtin_##NAME(n); } \
+  GEN_UNARY_VECTOR_BUILTIN_T(NAME, float)                                      \
+  GEN_UNARY_VECTOR_BUILTIN_T(NAME, double)
+
+#define GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, NUM)                            \
+  _CLC_OVERLOAD TYPE##NUM GETNAME(NAME)(TYPE##NUM n1, TYPE##NUM n2,            \
+                                        TYPE##NUM n3) {                        \
+    return __builtin_elementwise_##NAME(n1, n2, n3);                           \
+  }
+
+#define GEN_TERNARY_VECTOR_BUILTIN_T(NAME, TYPE)                               \
+  GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, 2)                                    \
+  GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, 3)                                    \
+  GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, 4)                                    \
+  GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, 8)                                    \
+  GEN_TERNARY_VECTOR_BUILTIN(NAME, TYPE, 16)
+
+#define GEN_TERNARY_BUILTIN(NAME)                                              \
+  _CLC_OVERLOAD float GETNAME(NAME)(float n1, float n2, float n3) {            \
+    return __builtin_##NAME##f(n1, n2, n3);                                    \
+  }                                                                            \
+  _CLC_OVERLOAD double GETNAME(NAME)(double n1, double n2, double n3) {        \
+    return __builtin_##NAME(n1, n2, n3);                                       \
+  }                                                                            \
+  GEN_TERNARY_VECTOR_BUILTIN_T(NAME, float)                                    \
+  GEN_TERNARY_VECTOR_BUILTIN_T(NAME, double)
+#endif

libclc/x86_64-unknown-linux/libspirv/math/native_cos.cl

@@ -0,0 +1,4 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(cos)

libclc/x86_64-unknown-linux/libspirv/math/native_exp.cl

@@ -0,0 +1,4 @@
+#define IS_NATIVE 
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(exp)

libclc/x86_64-unknown-linux/libspirv/math/native_exp2.cl

@@ -0,0 +1,4 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(exp2)

libclc/x86_64-unknown-linux/libspirv/math/native_log.cl

@@ -0,0 +1,4 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(log)

libclc/x86_64-unknown-linux/libspirv/math/native_log10.cl

@@ -0,0 +1,5 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(log10)
+

libclc/x86_64-unknown-linux/libspirv/math/native_log2.cl

@@ -0,0 +1,5 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(log2)
+

libclc/x86_64-unknown-linux/libspirv/math/native_sin.cl

@@ -0,0 +1,5 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(sin)
+

libclc/x86_64-unknown-linux/libspirv/math/native_sqrt.cl

@@ -0,0 +1,4 @@
+#define IS_NATIVE
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(sqrt)

libclc/x86_64-unknown-linux/libspirv/math/rint.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(rint)

libclc/x86_64-unknown-linux/libspirv/math/round.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(round)

libclc/x86_64-unknown-linux/libspirv/math/sqrt.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(sqrt)

libclc/x86_64-unknown-linux/libspirv/math/trunc.cl

@@ -0,0 +1,3 @@
+#include "helpers.h"
+
+GEN_UNARY_BUILTIN(trunc)

libclc/x86_64-unknown-linux/libspirv/shared/helpers.ll

@@ -0,0 +1,17 @@
+declare i32 @llvm.ctpop.i32(i32 %n)
+declare i8 @llvm.ctpop.i8(i8 %n)
+
+
+define dso_local i32 @_Z17__popcount_helperi(i32 %x) {
+entry:
+  %call = call i32 @llvm.ctpop.i32(i32 %x) 
+  ret i32 %call
+}
+
+
+define dso_local i8 @_Z17__popcount_helpera(i8 %x) {
+entry:
+  %call = call i8 @llvm.ctpop.i8(i8 %x) 
+  ret i8 %call
+}
+