Merge remote-tracking branch 'intel_llvm/sycl' into add_inheritance_support_2

Signed-off-by: Elizabeth Andrews <[email protected]>

Author: elizabethandrews

clang/lib/Sema/SemaSYCL.cpp

@@ -1429,8 +1429,8 @@ class SyclKernelBodyCreator
       ParamDREs[I] = SemaRef.BuildDeclRefExpr(KernelParameters[I], ParamType,
                                               VK_LValue, SourceLocation());
     }
-
     MemberExpr *MethodME = BuildMemberExpr(Base, Method);
+
     QualType ResultTy = Method->getReturnType();
     ExprValueKind VK = Expr::getValueKindForType(ResultTy);
     ResultTy = ResultTy.getNonLValueExprType(SemaRef.Context);

libclc/generic/include/clcmacro.h

@@ -134,14 +134,14 @@
                               ADDR_SPACE, ARG2_TYPE)                           \
   DECLSPEC RET_TYPE##2 FUNCTION(ARG1_TYPE##2 x, ADDR_SPACE ARG2_TYPE##2 * y) { \
     return (RET_TYPE##2)(                                                      \
-        FUNCTION(x.x, (ARG2_TYPE *)y),                                         \
+        FUNCTION(x.x, (ADDR_SPACE ARG2_TYPE *)y),                              \
         FUNCTION(x.y,                                                          \
                  (ADDR_SPACE ARG2_TYPE *)((ADDR_SPACE ARG2_TYPE *)y + 1)));    \
   }                                                                            \
                                                                                \
   DECLSPEC RET_TYPE##3 FUNCTION(ARG1_TYPE##3 x, ADDR_SPACE ARG2_TYPE##3 * y) { \
     return (RET_TYPE##3)(                                                      \
-        FUNCTION(x.x, (ARG2_TYPE *)y),                                         \
+        FUNCTION(x.x, (ADDR_SPACE ARG2_TYPE *)y),                              \
         FUNCTION(x.y,                                                          \
                  (ADDR_SPACE ARG2_TYPE *)((ADDR_SPACE ARG2_TYPE *)y + 1)),     \
         FUNCTION(x.z,                                                          \
@@ -150,26 +150,35 @@
                                                                                \
   DECLSPEC RET_TYPE##4 FUNCTION(ARG1_TYPE##4 x, ADDR_SPACE ARG2_TYPE##4 * y) { \
     return (RET_TYPE##4)(                                                      \
-        FUNCTION(x.lo, (ARG2_TYPE##2 *)y),                                     \
+        FUNCTION(x.lo, (ADDR_SPACE ARG2_TYPE##2 *)y),                          \
         FUNCTION(x.hi,                                                         \
                  (ADDR_SPACE ARG2_TYPE##2 *)((ADDR_SPACE ARG2_TYPE *)y + 2))); \
   }                                                                            \
                                                                                \
   DECLSPEC RET_TYPE##8 FUNCTION(ARG1_TYPE##8 x, ADDR_SPACE ARG2_TYPE##8 * y) { \
     return (RET_TYPE##8)(                                                      \
-        FUNCTION(x.lo, (ARG2_TYPE##4 *)y),                                     \
+        FUNCTION(x.lo, (ADDR_SPACE ARG2_TYPE##4 *)y),                          \
         FUNCTION(x.hi,                                                         \
                  (ADDR_SPACE ARG2_TYPE##4 *)((ADDR_SPACE ARG2_TYPE *)y + 4))); \
   }                                                                            \
                                                                                \
   DECLSPEC RET_TYPE##16 FUNCTION(ARG1_TYPE##16 x,                              \
                                  ADDR_SPACE ARG2_TYPE##16 * y) {               \
     return (RET_TYPE##16)(                                                     \
-        FUNCTION(x.lo, (ARG2_TYPE##8 *)y),                                     \
+        FUNCTION(x.lo, (ADDR_SPACE ARG2_TYPE##8 *)y),                          \
         FUNCTION(x.hi,                                                         \
                  (ADDR_SPACE ARG2_TYPE##8 *)((ADDR_SPACE ARG2_TYPE *)y + 8))); \
   }
 
+#define _CLC_DEFINE_TERNARY_BUILTIN(RET_TYPE, FUNCTION, BUILTIN, ARG1_TYPE,    \
+                                    ARG2_TYPE, ARG3_TYPE)                      \
+  _CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG1_TYPE x, ARG2_TYPE y,           \
+                                           ARG3_TYPE z) {                      \
+    return BUILTIN(x, y, z);                                                   \
+  }                                                                            \
+  _CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, RET_TYPE, FUNCTION,           \
+                         ARG1_TYPE, ARG2_TYPE, ARG3_TYPE)
+
 #define _CLC_DEFINE_BINARY_BUILTIN(RET_TYPE, FUNCTION, BUILTIN, ARG1_TYPE,     \
                                    ARG2_TYPE)                                  \
   _CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG1_TYPE x, ARG2_TYPE y) {         \

libclc/generic/include/spirv/misc/shuffle.h

@@ -67,12 +67,6 @@
 #include <spirv/atomic/atomic_xchg.h>
 #include <spirv/atomic/atomic_xor.h>
 
-/* cl_khr extension atomics are omitted from __spirv */
-
-/* 6.12.12 Miscellaneous Vector Functions */
-#include <spirv/misc/shuffle.h>
-#include <spirv/misc/shuffle2.h>
-
 /* 6.11.13 Image Read and Write Functions */
 #include <spirv/image/image_defines.h>
 #include <spirv/image/image.h>