Merge branch 'sycl' into gmlueck/mv-deprecated

Author: bader

clang/lib/CodeGen/BackendUtil.cpp

@@ -1384,6 +1384,12 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
     // configure the pipeline.
     OptimizationLevel Level = mapToLevel(CodeGenOpts);
 
+    if (LangOpts.SYCLIsDevice)
+      PB.registerPipelineStartEPCallback(
+          [](ModulePassManager &MPM, OptimizationLevel Level) {
+            MPM.addPass(ESIMDVerifierPass());
+          });
+
     bool IsThinLTO = CodeGenOpts.PrepareForThinLTO;
     bool IsLTO = CodeGenOpts.PrepareForLTO;
 

clang/test/CodeGenSYCL/simplifycfg.cpp

@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -flegacy-pass-manager -mllvm -sycl-opt %s -emit-llvm  -o - | FileCheck %s
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -fno-legacy-pass-manager -mllvm -sycl-opt %s -emit-llvm -o - | FileCheck %s
+//
+// This test checks that foo (which is @_Z3foov) is called twice after O3 optimizations.
+//
+// Usually clang with SimplifyCFG pass optimizes constructs like:
+// if (i % 2 == 0)
+//   func();
+// else
+//   func();
+//
+// into one simple func() invocation.
+// This behaviour might be wrong in cases when func's behaviour depends on
+// a place where it is written.
+// There is a relevant discussion about introducing
+// a reliable tool for such cases: https://reviews.llvm.org/D85603
+
+// CHECK: tail call spir_func void @_Z3foov()
+// CHECK: tail call spir_func void @_Z3foov()
+
+SYCL_EXTERNAL void foo();
+
+SYCL_EXTERNAL void bar(int i) {
+  if (i % 2 == 0) {
+    foo();
+  } else {
+    foo();
+  }
+}

libclc/amdgcn-amdhsa/libspirv/SOURCES

@@ -31,16 +31,19 @@ math/fmin.cl
 math/fmod.cl
 math/frexp.cl
 math/hypot.cl
+math/ilogb.cl
 math/ldexp.cl
 math/lgamma.cl
 math/log.cl
+math/log2.cl
 math/log10.cl
 math/log1p.cl
 math/logb.cl
 math/mangle_common.h
 math/modf.cl
 math/nextafter.cl
 math/pow.cl
+math/remainder.cl
 math/round.cl
 math/rsqrt.cl
 math/sin.cl

libclc/amdgcn-amdhsa/libspirv/math/ilogb.cl

@@ -0,0 +1,36 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <clcmacro.h>
+#include <spirv/spirv.h>
+ 
+int __ocml_ilogb_f64(double);
+int __ocml_ilogb_f32(float);
+
+_CLC_DEFINE_UNARY_BUILTIN(int, __spirv_ocl_ilogb, __ocml_ilogb_f32, float)
+
+#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+
+_CLC_DEFINE_UNARY_BUILTIN(int, __spirv_ocl_ilogb, __ocml_ilogb_f64, double)
+#endif
+
+#ifdef cl_khr_fp16
+#pragma OPENCL EXTENSION cl_khr_fp16 : enable
+
+_CLC_OVERLOAD _CLC_DEF int __spirv_ocl_ilogb(half x) {
+  float t = x;
+  return __spirv_ocl_ilogb(t);
+}
+
+_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, int, __spirv_ocl_ilogb, half);
+#endif
+
+#undef __CLC_BUILTIN
+#undef __CLC_BUILTIN_F
+#undef __CLC_FUNCTION

libclc/amdgcn-amdhsa/libspirv/math/log2.cl

@@ -0,0 +1,19 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <clcmacro.h>
+#include <spirv/spirv.h>
+ 
+double __ocml_log2_f64(double);
+float __ocml_log2_f32(float);
+ 
+#define __CLC_FUNCTION __spirv_ocl_log2
+#define __CLC_BUILTIN __ocml_log2
+#define __CLC_BUILTIN_F __CLC_XCONCAT(__CLC_BUILTIN, _f32)
+#define __CLC_BUILTIN_D __CLC_XCONCAT(__CLC_BUILTIN, _f64)
+#include <math/unary_builtin.inc>

libclc/amdgcn-amdhsa/libspirv/math/remainder.cl

@@ -0,0 +1,18 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <spirv/spirv.h>
+
+float __ocml_remainder_f32(float,float);
+double __ocml_remainder_f64(double,double);
+
+#define __CLC_FUNCTION __spirv_ocl_remainder
+#define __CLC_BUILTIN __ocml_remainder
+#define __CLC_BUILTIN_F __CLC_XCONCAT(__CLC_BUILTIN, _f32)
+#define __CLC_BUILTIN_D __CLC_XCONCAT(__CLC_BUILTIN, _f64)
+#include <math/binary_builtin.inc>

libclc/generic/libspirv/SOURCES

@@ -165,7 +165,7 @@ math/nextafter.cl
 math/pow.cl
 math/pown.cl
 math/powr.cl
-math/remainer.cl
+math/remainder.cl
 math/remquo.cl
 math/rint.cl
 math/rootn.cl

libclc/generic/libspirv/math/remainer.cl renamed to libclc/generic/libspirv/math/remainder.cl

@@ -55,7 +55,7 @@ math/native_sqrt.cl
 math/native_tan.cl
 math/nextafter.cl
 math/pow.cl
-math/remainer.cl
+math/remainder.cl
 math/round.cl
 math/rsqrt.cl
 math/sin.cl