[SYCL-PTX] Add fmod builtin

Signed-off-by: Victor Lomuller <victor@codeplay.com>

Author: Victor Lomuller

libclc/generic/libspirv/SOURCES

@@ -55,6 +55,7 @@ math/floor.cl
 math/fma.cl
 math/fmax.cl
 math/fmin.cl
+math/fmod.cl
 math/fract.cl
 math/ldexp.cl
 math/log.cl

libclc/generic/libspirv/math/clc_sw_binary.inc

@@ -0,0 +1,9 @@
+#include <utils.h>
+
+// TODO: Enable half precision when the sw routine is implemented
+#if __CLC_FPSIZE > 16
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __CLC_FUNC(__CLC_GENTYPE x,
+                                                __CLC_GENTYPE y) {
+  return __CLC_SW_FUNC(x, y);
+}
+#endif

libclc/generic/libspirv/math/fmod.cl

@@ -0,0 +1,17 @@
+//===----------------------------------------------------------------------===//
+//
+// 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>
+
+#include <math/clc_fmod.h>
+
+#define __CLC_FUNC __spirv_ocl_fmod
+#define __CLC_SW_FUNC __clc_fmod
+#define __CLC_BODY <clc_sw_binary.inc>
+#include <clc/math/gentype.inc>
+#undef __CLC_SW_FUNC

libclc/ptx-nvidiacl/include/libdevice.h

@@ -9,30 +9,39 @@
 #ifndef PTX_NVIDIACL_LIBDEVICE_H
 #define PTX_NVIDIACL_LIBDEVICE_H
 
-#define __LIBDEVICE_UNARY_BUILTIN_F(BUILTIN) float __nv_ ## BUILTIN ## f(float);
+#define __LIBDEVICE_UNARY_BUILTIN_F(BUILTIN) float __nv_##BUILTIN##f(float);
+#define __LIBDEVICE_BINARY_BUILTIN_F(BUILTIN)                                  \
+  float __nv_##BUILTIN##f(float, float);
 
 #ifdef cl_khr_fp64
 
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 
-#define __LIBDEVICE_UNARY_BUILTIN_D(BUILTIN) double __nv_ ## BUILTIN(double);
+#define __LIBDEVICE_UNARY_BUILTIN_D(BUILTIN) double __nv_##BUILTIN(double);
+#define __LIBDEVICE_BINARY_BUILTIN_D(BUILTIN)                                  \
+  double __nv_##BUILTIN(double, double);
 
 #else
 
 #define __LIBDEVICE_UNARY_BUILTIN_D(BUILTIN)
 
 #endif
 
-#define __LIBDEVICE_UNARY_BUILTIN(BUILTIN) \
-  __LIBDEVICE_UNARY_BUILTIN_F(BUILTIN) \
+#define __LIBDEVICE_UNARY_BUILTIN(BUILTIN)                                     \
+  __LIBDEVICE_UNARY_BUILTIN_F(BUILTIN)                                         \
   __LIBDEVICE_UNARY_BUILTIN_D(BUILTIN)
 
+#define __LIBDEVICE_BINARY_BUILTIN(BUILTIN)                                    \
+  __LIBDEVICE_BINARY_BUILTIN_F(BUILTIN)                                        \
+  __LIBDEVICE_BINARY_BUILTIN_D(BUILTIN)
+
 __LIBDEVICE_UNARY_BUILTIN(exp)
 __LIBDEVICE_UNARY_BUILTIN(exp2)
 __LIBDEVICE_UNARY_BUILTIN(exp10)
 __LIBDEVICE_UNARY_BUILTIN(expm1)
 __LIBDEVICE_UNARY_BUILTIN_F(fast_exp)
 __LIBDEVICE_UNARY_BUILTIN_F(fast_exp10)
 
+__LIBDEVICE_BINARY_BUILTIN(fmod)
 
 #endif

libclc/ptx-nvidiacl/libspirv/SOURCES

@@ -12,6 +12,7 @@ math/exp.cl
 math/exp10.cl
 math/exp2.cl
 math/expm1.cl
+math/fmod.cl
 math/native_exp.cl
 math/native_exp10.cl
 math/native_exp2.cl

libclc/ptx-nvidiacl/libspirv/math/binary_builtin.inc

@@ -0,0 +1,37 @@
+//===----------------------------------------------------------------------===//
+//
+// 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 "../../../generic/lib/clcmacro.h"
+#include "utils.h"
+
+#ifndef __CLC_BUILTIN_F
+#define __CLC_BUILTIN_F __CLC_XCONCAT(__CLC_BUILTIN, f)
+#endif
+
+_CLC_DEFINE_BINARY_BUILTIN(float, __CLC_FUNCTION, __CLC_BUILTIN_F, float, float)
+
+#ifndef __FLOAT_ONLY
+
+#ifdef cl_khr_fp64
+
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+
+_CLC_DEFINE_BINARY_BUILTIN(double, __CLC_FUNCTION, __CLC_BUILTIN, double,
+                           double)
+
+#endif
+
+#ifdef cl_khr_fp16
+
+#pragma OPENCL EXTENSION cl_khr_fp16 : enable
+
+_CLC_DEFINE_BINARY_BUILTIN(half, __CLC_FUNCTION, __CLC_BUILTIN, half, half)
+
+#endif
+
+#endif

libclc/ptx-nvidiacl/libspirv/math/fmod.cl

@@ -0,0 +1,15 @@
+//===----------------------------------------------------------------------===//
+//
+// 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 "../../../generic/lib/clcmacro.h"
+#include "../../include/libdevice.h"
+#include <spirv/spirv.h>
+
+#define __CLC_FUNCTION __spirv_ocl_fmod
+#define __CLC_BUILTIN __nv_fmod
+#include "binary_builtin.inc"