Author: jvesely
Date: Tue Mar 6 09:48:35 2018
New Revision: 326816
URL: http://llvm.org/viewvc/llvm-project?rev=326816&view=rev
Log:
Move cl_khr_fp64 exntension enablement to gentype include lists
This will make adding cl_khr_fp16 support easier
Reviewed-by: Aaron Watry <awa...@gmail.com>
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
Modified:
libclc/trunk/generic/include/clc/async/gentype.inc
libclc/trunk/generic/include/clc/geometric/floatn.inc
libclc/trunk/generic/include/clc/math/binary_intrin.inc
libclc/trunk/generic/include/clc/math/ternary_intrin.inc
libclc/trunk/generic/include/clc/math/unary_intrin.inc
libclc/trunk/generic/lib/async/async_work_group_copy.cl
libclc/trunk/generic/lib/async/async_work_group_strided_copy.cl
libclc/trunk/generic/lib/async/prefetch.cl
libclc/trunk/generic/lib/common/mix.cl
libclc/trunk/generic/lib/geometric/distance.cl
libclc/trunk/generic/lib/math/acos.cl
libclc/trunk/generic/lib/math/asin.cl
libclc/trunk/generic/lib/math/clc_sqrt.cl
libclc/trunk/generic/lib/math/exp10.cl
libclc/trunk/generic/lib/math/fdim.cl
libclc/trunk/generic/lib/math/fract.cl
libclc/trunk/generic/lib/math/frexp.cl
libclc/trunk/generic/lib/math/hypot.cl
libclc/trunk/generic/lib/math/lgamma_r.cl
libclc/trunk/generic/lib/math/log10.cl
libclc/trunk/generic/lib/math/mad.cl
libclc/trunk/generic/lib/math/modf.cl
libclc/trunk/generic/lib/math/sincos.cl
libclc/trunk/generic/lib/shared/clamp.cl
libclc/trunk/generic/lib/shared/max.cl
libclc/trunk/generic/lib/shared/min.cl
Modified: libclc/trunk/generic/include/clc/async/gentype.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/async/gentype.inc?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/async/gentype.inc (original)
+++ libclc/trunk/generic/include/clc/async/gentype.inc Tue Mar 6 09:48:35 2018
@@ -180,6 +180,7 @@
#undef __CLC_GENTYPE
#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#define __CLC_GENTYPE double
#include __CLC_BODY
@@ -202,3 +203,5 @@
#undef __CLC_GENTYPE
#endif
+
+#undef __CLC_BODY
Modified: libclc/trunk/generic/include/clc/geometric/floatn.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/floatn.inc?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/floatn.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/floatn.inc Tue Mar 6 09:48:35
2018
@@ -24,6 +24,7 @@
#ifndef __FLOAT_ONLY
#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#define __CLC_FLOAT double
#define __CLC_FPSIZE 64
Modified: libclc/trunk/generic/include/clc/math/binary_intrin.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/binary_intrin.inc?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/binary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/binary_intrin.inc Tue Mar 6 09:48:35
2018
@@ -6,6 +6,7 @@ _CLC_OVERLOAD float8 __CLC_FUNCTION(floa
_CLC_OVERLOAD float16 __CLC_FUNCTION(float16, float16) __asm(__CLC_INTRINSIC
".v16f32");
#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
_CLC_OVERLOAD double __CLC_FUNCTION(double, double) __asm(__CLC_INTRINSIC
".f64");
_CLC_OVERLOAD double2 __CLC_FUNCTION(double2, double2) __asm(__CLC_INTRINSIC
".v2f64");
_CLC_OVERLOAD double3 __CLC_FUNCTION(double3, double3) __asm(__CLC_INTRINSIC
".v3f64");
Modified: libclc/trunk/generic/include/clc/math/ternary_intrin.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/ternary_intrin.inc?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/ternary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/ternary_intrin.inc Tue Mar 6
09:48:35 2018
@@ -6,6 +6,7 @@ _CLC_OVERLOAD float8 __CLC_FUNCTION(floa
_CLC_OVERLOAD float16 __CLC_FUNCTION(float16, float16, float16)
__asm(__CLC_INTRINSIC ".v16f32");
#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
_CLC_OVERLOAD double __CLC_FUNCTION(double, double, double)
__asm(__CLC_INTRINSIC ".f64");
_CLC_OVERLOAD double2 __CLC_FUNCTION(double2, double2, double2)
__asm(__CLC_INTRINSIC ".v2f64");
_CLC_OVERLOAD double3 __CLC_FUNCTION(double3, double3, double3)
__asm(__CLC_INTRINSIC ".v3f64");
Modified: libclc/trunk/generic/include/clc/math/unary_intrin.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/unary_intrin.inc?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/unary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/unary_intrin.inc Tue Mar 6 09:48:35
2018
@@ -6,6 +6,7 @@ _CLC_OVERLOAD float8 __CLC_FUNCTION(floa
_CLC_OVERLOAD float16 __CLC_FUNCTION(float16 f) __asm(__CLC_INTRINSIC
".v16f32");
#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
_CLC_OVERLOAD double __CLC_FUNCTION(double d) __asm(__CLC_INTRINSIC ".f64");
_CLC_OVERLOAD double2 __CLC_FUNCTION(double2 d) __asm(__CLC_INTRINSIC
".v2f64");
_CLC_OVERLOAD double3 __CLC_FUNCTION(double3 d) __asm(__CLC_INTRINSIC
".v3f64");
Modified: libclc/trunk/generic/lib/async/async_work_group_copy.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/async/async_work_group_copy.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/async/async_work_group_copy.cl (original)
+++ libclc/trunk/generic/lib/async/async_work_group_copy.cl Tue Mar 6 09:48:35
2018
@@ -1,9 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <async_work_group_copy.inc>
#include <clc/async/gentype.inc>
-#undef __CLC_BODY
Modified: libclc/trunk/generic/lib/async/async_work_group_strided_copy.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/async/async_work_group_strided_copy.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/async/async_work_group_strided_copy.cl (original)
+++ libclc/trunk/generic/lib/async/async_work_group_strided_copy.cl Tue Mar 6
09:48:35 2018
@@ -1,9 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <async_work_group_strided_copy.inc>
#include <clc/async/gentype.inc>
-#undef __CLC_BODY
Modified: libclc/trunk/generic/lib/async/prefetch.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/async/prefetch.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/async/prefetch.cl (original)
+++ libclc/trunk/generic/lib/async/prefetch.cl Tue Mar 6 09:48:35 2018
@@ -1,9 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <prefetch.inc>
#include <clc/async/gentype.inc>
-#undef __CLC_BODY
Modified: libclc/trunk/generic/lib/common/mix.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/common/mix.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/common/mix.cl (original)
+++ libclc/trunk/generic/lib/common/mix.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <mix.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/geometric/distance.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/distance.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/geometric/distance.cl (original)
+++ libclc/trunk/generic/lib/geometric/distance.cl Tue Mar 6 09:48:35 2018
@@ -22,9 +22,5 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <distance.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/lib/math/acos.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/acos.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/acos.cl (original)
+++ libclc/trunk/generic/lib/math/acos.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <acos.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/asin.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/asin.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/asin.cl (original)
+++ libclc/trunk/generic/lib/math/asin.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <asin.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/clc_sqrt.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/clc_sqrt.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/clc_sqrt.cl (original)
+++ libclc/trunk/generic/lib/math/clc_sqrt.cl Tue Mar 6 09:48:35 2018
@@ -22,10 +22,6 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
// Map the llvm sqrt intrinsic to an OpenCL function.
#define __CLC_FUNCTION __clc_llvm_intr_sqrt
#define __CLC_INTRINSIC "llvm.sqrt"
Modified: libclc/trunk/generic/lib/math/exp10.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/exp10.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/exp10.cl (original)
+++ libclc/trunk/generic/lib/math/exp10.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <exp10.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/fdim.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/fdim.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/fdim.cl (original)
+++ libclc/trunk/generic/lib/math/fdim.cl Tue Mar 6 09:48:35 2018
@@ -2,9 +2,5 @@
#include "math.h"
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <fdim.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/fract.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/fract.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/fract.cl (original)
+++ libclc/trunk/generic/lib/math/fract.cl Tue Mar 6 09:48:35 2018
@@ -22,9 +22,5 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <fract.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/frexp.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/frexp.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/frexp.cl (original)
+++ libclc/trunk/generic/lib/math/frexp.cl Tue Mar 6 09:48:35 2018
@@ -2,9 +2,5 @@
#include "math.h"
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <frexp.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/hypot.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/hypot.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/hypot.cl (original)
+++ libclc/trunk/generic/lib/math/hypot.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <hypot.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/lgamma_r.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/lgamma_r.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/lgamma_r.cl (original)
+++ libclc/trunk/generic/lib/math/lgamma_r.cl Tue Mar 6 09:48:35 2018
@@ -3,9 +3,5 @@
#include "../clcmacro.h"
#include "math.h"
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <lgamma_r.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/log10.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/log10.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/log10.cl (original)
+++ libclc/trunk/generic/lib/math/log10.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <log10.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/mad.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/mad.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/mad.cl (original)
+++ libclc/trunk/generic/lib/math/mad.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <mad.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/modf.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/modf.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/modf.cl (original)
+++ libclc/trunk/generic/lib/math/modf.cl Tue Mar 6 09:48:35 2018
@@ -24,9 +24,5 @@
#include "math.h"
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <modf.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/sincos.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/sincos.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/sincos.cl (original)
+++ libclc/trunk/generic/lib/math/sincos.cl Tue Mar 6 09:48:35 2018
@@ -1,8 +1,4 @@
#include <clc/clc.h>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <sincos.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/clamp.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/clamp.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/clamp.cl (original)
+++ libclc/trunk/generic/lib/shared/clamp.cl Tue Mar 6 09:48:35 2018
@@ -3,9 +3,5 @@
#define __CLC_BODY <clamp.inc>
#include <clc/integer/gentype.inc>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <clamp.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/max.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/max.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/max.cl (original)
+++ libclc/trunk/generic/lib/shared/max.cl Tue Mar 6 09:48:35 2018
@@ -3,9 +3,5 @@
#define __CLC_BODY <max.inc>
#include <clc/integer/gentype.inc>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <max.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/min.cl
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/min.cl?rev=326816&r1=326815&r2=326816&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/min.cl (original)
+++ libclc/trunk/generic/lib/shared/min.cl Tue Mar 6 09:48:35 2018
@@ -3,9 +3,5 @@
#define __CLC_BODY <min.inc>
#include <clc/integer/gentype.inc>
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-#endif
-
#define __CLC_BODY <min.inc>
#include <clc/math/gentype.inc>
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
