[libclc] r185838 - Add __CLC_ prefix to all macro definitions in headers
Tom Stellard
thomas.stellard at amd.com
Mon Jul 8 10:27:03 PDT 2013
Author: tstellar
Date: Mon Jul 8 12:27:02 2013
New Revision: 185838
URL: http://llvm.org/viewvc/llvm-project?rev=185838&view=rev
Log:
Add __CLC_ prefix to all macro definitions in headers
libclc was defining and undefing GENTYPE and several other macros with
common names in its header files. This was preventing applications from
defining macros with identical names as command line arguments to the
compiler, because the definitions in the header files were masking the
macros defined as compiler arguements.
Reviewed-by: Aaron Watry <awatry at gmail.com>
Modified:
libclc/trunk/generic/include/clc/gentype.inc
libclc/trunk/generic/include/clc/geometric/distance.h
libclc/trunk/generic/include/clc/geometric/dot.h
libclc/trunk/generic/include/clc/geometric/dot.inc
libclc/trunk/generic/include/clc/geometric/floatn.inc
libclc/trunk/generic/include/clc/geometric/length.h
libclc/trunk/generic/include/clc/geometric/length.inc
libclc/trunk/generic/include/clc/geometric/normalize.h
libclc/trunk/generic/include/clc/geometric/normalize.inc
libclc/trunk/generic/include/clc/integer/abs.h
libclc/trunk/generic/include/clc/integer/abs.inc
libclc/trunk/generic/include/clc/integer/abs_diff.h
libclc/trunk/generic/include/clc/integer/abs_diff.inc
libclc/trunk/generic/include/clc/integer/add_sat.h
libclc/trunk/generic/include/clc/integer/add_sat.inc
libclc/trunk/generic/include/clc/integer/clz.h
libclc/trunk/generic/include/clc/integer/clz.inc
libclc/trunk/generic/include/clc/integer/gentype.inc
libclc/trunk/generic/include/clc/integer/rotate.h
libclc/trunk/generic/include/clc/integer/rotate.inc
libclc/trunk/generic/include/clc/integer/sub_sat.h
libclc/trunk/generic/include/clc/integer/sub_sat.inc
libclc/trunk/generic/include/clc/math/binary_decl.inc
libclc/trunk/generic/include/clc/math/binary_intrin.inc
libclc/trunk/generic/include/clc/math/ceil.h
libclc/trunk/generic/include/clc/math/cos.h
libclc/trunk/generic/include/clc/math/exp2.h
libclc/trunk/generic/include/clc/math/fabs.h
libclc/trunk/generic/include/clc/math/floor.h
libclc/trunk/generic/include/clc/math/fma.h
libclc/trunk/generic/include/clc/math/fmax.h
libclc/trunk/generic/include/clc/math/fmin.h
libclc/trunk/generic/include/clc/math/gentype.inc
libclc/trunk/generic/include/clc/math/hypot.h
libclc/trunk/generic/include/clc/math/hypot.inc
libclc/trunk/generic/include/clc/math/log2.h
libclc/trunk/generic/include/clc/math/mad.h
libclc/trunk/generic/include/clc/math/mad.inc
libclc/trunk/generic/include/clc/math/pow.h
libclc/trunk/generic/include/clc/math/sin.h
libclc/trunk/generic/include/clc/math/sqrt.h
libclc/trunk/generic/include/clc/math/ternary_intrin.inc
libclc/trunk/generic/include/clc/math/unary_decl.inc
libclc/trunk/generic/include/clc/math/unary_intrin.inc
libclc/trunk/generic/include/clc/shared/clamp.h
libclc/trunk/generic/include/clc/shared/clamp.inc
libclc/trunk/generic/include/clc/shared/max.h
libclc/trunk/generic/include/clc/shared/max.inc
libclc/trunk/generic/include/clc/shared/min.h
libclc/trunk/generic/include/clc/shared/min.inc
libclc/trunk/generic/lib/geometric/length.cl
libclc/trunk/generic/lib/geometric/length.inc
libclc/trunk/generic/lib/geometric/normalize.cl
libclc/trunk/generic/lib/geometric/normalize.inc
libclc/trunk/generic/lib/integer/abs.cl
libclc/trunk/generic/lib/integer/abs.inc
libclc/trunk/generic/lib/integer/abs_diff.cl
libclc/trunk/generic/lib/integer/abs_diff.inc
libclc/trunk/generic/lib/integer/rotate.cl
libclc/trunk/generic/lib/integer/rotate.inc
libclc/trunk/generic/lib/math/binary_impl.inc
libclc/trunk/generic/lib/math/fmax.cl
libclc/trunk/generic/lib/math/fmin.cl
libclc/trunk/generic/lib/math/hypot.cl
libclc/trunk/generic/lib/math/hypot.inc
libclc/trunk/generic/lib/math/mad.cl
libclc/trunk/generic/lib/math/mad.inc
libclc/trunk/generic/lib/shared/clamp.cl
libclc/trunk/generic/lib/shared/clamp.inc
libclc/trunk/generic/lib/shared/max.cl
libclc/trunk/generic/lib/shared/max.inc
libclc/trunk/generic/lib/shared/min.cl
libclc/trunk/generic/lib/shared/min.inc
libclc/trunk/generic/lib/shared/vload.cl
libclc/trunk/generic/lib/shared/vstore.cl
Modified: libclc/trunk/generic/include/clc/gentype.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/gentype.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/gentype.inc (original)
+++ libclc/trunk/generic/include/clc/gentype.inc Mon Jul 8 12:27:02 2013
@@ -1,51 +1,51 @@
-#define GENTYPE float
+#define __CLC_GENTYPE float
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE float2
+#define __CLC_GENTYPE float2
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE float3
+#define __CLC_GENTYPE float3
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE float4
+#define __CLC_GENTYPE float4
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE float8
+#define __CLC_GENTYPE float8
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE float16
+#define __CLC_GENTYPE float16
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
#ifdef cl_khr_fp64
-#define GENTYPE double
+#define __CLC_GENTYPE double
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE double2
+#define __CLC_GENTYPE double2
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE double3
+#define __CLC_GENTYPE double3
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE double4
+#define __CLC_GENTYPE double4
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE double8
+#define __CLC_GENTYPE double8
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
-#define GENTYPE double16
+#define __CLC_GENTYPE double16
#include BODY
-#undef GENTYPE
+#undef __CLC_GENTYPE
#endif
#undef BODY
Modified: libclc/trunk/generic/include/clc/geometric/distance.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/distance.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/distance.h (original)
+++ libclc/trunk/generic/include/clc/geometric/distance.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/geometric/distance.inc>
+#define __CLC_BODY <clc/geometric/distance.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/include/clc/geometric/dot.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/dot.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/dot.h (original)
+++ libclc/trunk/generic/include/clc/geometric/dot.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/geometric/dot.inc>
+#define __CLC_BODY <clc/geometric/dot.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/include/clc/geometric/dot.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/dot.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/dot.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/dot.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL FLOAT dot(FLOATN p0, FLOATN p1);
+_CLC_OVERLOAD _CLC_DECL __CLC_FLOAT dot(__CLC_FLOATN p0, __CLC_FLOATN p1);
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=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/floatn.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/floatn.inc Mon Jul 8 12:27:02 2013
@@ -1,45 +1,45 @@
-#define FLOAT float
+#define __CLC_FLOAT float
-#define FLOATN float
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN float
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN float2
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN float2
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN float3
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN float3
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN float4
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN float4
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#undef FLOAT
+#undef __CLC_FLOAT
#ifdef cl_khr_fp64
-#define FLOAT double
+#define __CLC_FLOAT double
-#define FLOATN double
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN double
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN double2
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN double2
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN double3
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN double3
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#define FLOATN double4
-#include BODY
-#undef FLOATN
+#define __CLC_FLOATN double4
+#include __CLC_BODY
+#undef __CLC_FLOATN
-#undef FLOAT
+#undef __CLC_FLOAT
#endif
-#undef BODY
+#undef __CLC_BODY
Modified: libclc/trunk/generic/include/clc/geometric/length.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/length.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/length.h (original)
+++ libclc/trunk/generic/include/clc/geometric/length.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/geometric/length.inc>
+#define __CLC_BODY <clc/geometric/length.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/include/clc/geometric/length.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/length.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/length.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/length.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL FLOAT length(FLOATN p0);
+_CLC_OVERLOAD _CLC_DECL __CLC_FLOAT length(__CLC_FLOATN p0);
Modified: libclc/trunk/generic/include/clc/geometric/normalize.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/normalize.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/normalize.h (original)
+++ libclc/trunk/generic/include/clc/geometric/normalize.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/geometric/normalize.inc>
+#define __CLC_BODY <clc/geometric/normalize.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/include/clc/geometric/normalize.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/geometric/normalize.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/geometric/normalize.inc (original)
+++ libclc/trunk/generic/include/clc/geometric/normalize.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL FLOATN normalize(FLOATN p);
+_CLC_OVERLOAD _CLC_DECL __CLC_FLOATN normalize(__CLC_FLOATN p);
Modified: libclc/trunk/generic/include/clc/integer/abs.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/abs.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/abs.h (original)
+++ libclc/trunk/generic/include/clc/integer/abs.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/abs.inc>
+#define __CLC_BODY <clc/integer/abs.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/abs.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/abs.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/abs.inc (original)
+++ libclc/trunk/generic/include/clc/integer/abs.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL UGENTYPE abs(GENTYPE x);
+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE abs(__CLC_GENTYPE x);
Modified: libclc/trunk/generic/include/clc/integer/abs_diff.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/abs_diff.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/abs_diff.h (original)
+++ libclc/trunk/generic/include/clc/integer/abs_diff.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/abs_diff.inc>
+#define __CLC_BODY <clc/integer/abs_diff.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/abs_diff.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/abs_diff.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/abs_diff.inc (original)
+++ libclc/trunk/generic/include/clc/integer/abs_diff.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL UGENTYPE abs_diff(GENTYPE x, GENTYPE y);
+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE abs_diff(__CLC_GENTYPE x, __CLC_GENTYPE y);
Modified: libclc/trunk/generic/include/clc/integer/add_sat.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/add_sat.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/add_sat.h (original)
+++ libclc/trunk/generic/include/clc/integer/add_sat.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/add_sat.inc>
+#define __CLC_BODY <clc/integer/add_sat.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/add_sat.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/add_sat.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/add_sat.inc (original)
+++ libclc/trunk/generic/include/clc/integer/add_sat.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE add_sat(GENTYPE x, GENTYPE y);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE add_sat(__CLC_GENTYPE x, __CLC_GENTYPE y);
Modified: libclc/trunk/generic/include/clc/integer/clz.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/clz.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/clz.h (original)
+++ libclc/trunk/generic/include/clc/integer/clz.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/clz.inc>
+#define __CLC_BODY <clc/integer/clz.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/clz.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/clz.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/clz.inc (original)
+++ libclc/trunk/generic/include/clc/integer/clz.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE clz(GENTYPE x);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clz(__CLC_GENTYPE x);
Modified: libclc/trunk/generic/include/clc/integer/gentype.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/gentype.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/gentype.inc (original)
+++ libclc/trunk/generic/include/clc/integer/gentype.inc Mon Jul 8 12:27:02 2013
@@ -1,435 +1,435 @@
//These 2 defines only change when switching between data sizes or base types to
//keep this file manageable.
-#define GENSIZE 8
-#define SCALAR_GENTYPE char
+#define __CLC_GENSIZE 8
+#define __CLC_SCALAR_GENTYPE char
-#define GENTYPE char
-#define UGENTYPE uchar
-#define SGENTYPE char
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE char2
-#define UGENTYPE uchar2
-#define SGENTYPE char2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE char3
-#define UGENTYPE uchar3
-#define SGENTYPE char3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE char4
-#define UGENTYPE uchar4
-#define SGENTYPE char4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE char8
-#define UGENTYPE uchar8
-#define SGENTYPE char8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE char16
-#define UGENTYPE uchar16
-#define SGENTYPE char16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE uchar
-
-#define GENTYPE uchar
-#define UGENTYPE uchar
-#define SGENTYPE char
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uchar2
-#define UGENTYPE uchar2
-#define SGENTYPE char2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uchar3
-#define UGENTYPE uchar3
-#define SGENTYPE char3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uchar4
-#define UGENTYPE uchar4
-#define SGENTYPE char4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uchar8
-#define UGENTYPE uchar8
-#define SGENTYPE char8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uchar16
-#define UGENTYPE uchar16
-#define SGENTYPE char16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef GENSIZE
-#define GENSIZE 16
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE short
-
-#define GENTYPE short
-#define UGENTYPE ushort
-#define SGENTYPE short
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE short2
-#define UGENTYPE ushort2
-#define SGENTYPE short2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE short3
-#define UGENTYPE ushort3
-#define SGENTYPE short3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE short4
-#define UGENTYPE ushort4
-#define SGENTYPE short4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE short8
-#define UGENTYPE ushort8
-#define SGENTYPE short8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE short16
-#define UGENTYPE ushort16
-#define SGENTYPE short16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE ushort
-
-#define GENTYPE ushort
-#define UGENTYPE ushort
-#define SGENTYPE short
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ushort2
-#define UGENTYPE ushort2
-#define SGENTYPE short2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ushort3
-#define UGENTYPE ushort3
-#define SGENTYPE short3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ushort4
-#define UGENTYPE ushort4
-#define SGENTYPE short4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ushort8
-#define UGENTYPE ushort8
-#define SGENTYPE short8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ushort16
-#define UGENTYPE ushort16
-#define SGENTYPE short16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef GENSIZE
-#define GENSIZE 32
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE int
-
-#define GENTYPE int
-#define UGENTYPE uint
-#define SGENTYPE int
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE int2
-#define UGENTYPE uint2
-#define SGENTYPE int2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE int3
-#define UGENTYPE uint3
-#define SGENTYPE int3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE int4
-#define UGENTYPE uint4
-#define SGENTYPE int4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE int8
-#define UGENTYPE uint8
-#define SGENTYPE int8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE int16
-#define UGENTYPE uint16
-#define SGENTYPE int16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE uint
-
-#define GENTYPE uint
-#define UGENTYPE uint
-#define SGENTYPE int
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uint2
-#define UGENTYPE uint2
-#define SGENTYPE int2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uint3
-#define UGENTYPE uint3
-#define SGENTYPE int3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uint4
-#define UGENTYPE uint4
-#define SGENTYPE int4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uint8
-#define UGENTYPE uint8
-#define SGENTYPE int8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE uint16
-#define UGENTYPE uint16
-#define SGENTYPE int16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef GENSIZE
-#define GENSIZE 64
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE long
-
-#define GENTYPE long
-#define UGENTYPE ulong
-#define SGENTYPE long
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE long2
-#define UGENTYPE ulong2
-#define SGENTYPE long2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE long3
-#define UGENTYPE ulong3
-#define SGENTYPE long3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE long4
-#define UGENTYPE ulong4
-#define SGENTYPE long4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE long8
-#define UGENTYPE ulong8
-#define SGENTYPE long8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE long16
-#define UGENTYPE ulong16
-#define SGENTYPE long16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef SCALAR_GENTYPE
-#define SCALAR_GENTYPE ulong
-
-#define GENTYPE ulong
-#define UGENTYPE ulong
-#define SGENTYPE long
-#define SCALAR 1
-#include BODY
-#undef SCALAR
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ulong2
-#define UGENTYPE ulong2
-#define SGENTYPE long2
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ulong3
-#define UGENTYPE ulong3
-#define SGENTYPE long3
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ulong4
-#define UGENTYPE ulong4
-#define SGENTYPE long4
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ulong8
-#define UGENTYPE ulong8
-#define SGENTYPE long8
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#define GENTYPE ulong16
-#define UGENTYPE ulong16
-#define SGENTYPE long16
-#include BODY
-#undef GENTYPE
-#undef UGENTYPE
-#undef SGENTYPE
-
-#undef GENSIZE
-#undef SCALAR_GENTYPE
-#undef BODY
+#define __CLC_GENTYPE char
+#define __CLC_U_GENTYPE uchar
+#define __CLC_S_GENTYPE char
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE char2
+#define __CLC_U_GENTYPE uchar2
+#define __CLC_S_GENTYPE char2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE char3
+#define __CLC_U_GENTYPE uchar3
+#define __CLC_S_GENTYPE char3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE char4
+#define __CLC_U_GENTYPE uchar4
+#define __CLC_S_GENTYPE char4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE char8
+#define __CLC_U_GENTYPE uchar8
+#define __CLC_S_GENTYPE char8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE char16
+#define __CLC_U_GENTYPE uchar16
+#define __CLC_S_GENTYPE char16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE uchar
+
+#define __CLC_GENTYPE uchar
+#define __CLC_U_GENTYPE uchar
+#define __CLC_S_GENTYPE char
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uchar2
+#define __CLC_U_GENTYPE uchar2
+#define __CLC_S_GENTYPE char2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uchar3
+#define __CLC_U_GENTYPE uchar3
+#define __CLC_S_GENTYPE char3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uchar4
+#define __CLC_U_GENTYPE uchar4
+#define __CLC_S_GENTYPE char4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uchar8
+#define __CLC_U_GENTYPE uchar8
+#define __CLC_S_GENTYPE char8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uchar16
+#define __CLC_U_GENTYPE uchar16
+#define __CLC_S_GENTYPE char16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_GENSIZE
+#define __CLC_GENSIZE 16
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE short
+
+#define __CLC_GENTYPE short
+#define __CLC_U_GENTYPE ushort
+#define __CLC_S_GENTYPE short
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE short2
+#define __CLC_U_GENTYPE ushort2
+#define __CLC_S_GENTYPE short2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE short3
+#define __CLC_U_GENTYPE ushort3
+#define __CLC_S_GENTYPE short3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE short4
+#define __CLC_U_GENTYPE ushort4
+#define __CLC_S_GENTYPE short4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE short8
+#define __CLC_U_GENTYPE ushort8
+#define __CLC_S_GENTYPE short8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE short16
+#define __CLC_U_GENTYPE ushort16
+#define __CLC_S_GENTYPE short16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE ushort
+
+#define __CLC_GENTYPE ushort
+#define __CLC_U_GENTYPE ushort
+#define __CLC_S_GENTYPE short
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ushort2
+#define __CLC_U_GENTYPE ushort2
+#define __CLC_S_GENTYPE short2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ushort3
+#define __CLC_U_GENTYPE ushort3
+#define __CLC_S_GENTYPE short3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ushort4
+#define __CLC_U_GENTYPE ushort4
+#define __CLC_S_GENTYPE short4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ushort8
+#define __CLC_U_GENTYPE ushort8
+#define __CLC_S_GENTYPE short8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ushort16
+#define __CLC_U_GENTYPE ushort16
+#define __CLC_S_GENTYPE short16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_GENSIZE
+#define __CLC_GENSIZE 32
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE int
+
+#define __CLC_GENTYPE int
+#define __CLC_U_GENTYPE uint
+#define __CLC_S_GENTYPE int
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE int2
+#define __CLC_U_GENTYPE uint2
+#define __CLC_S_GENTYPE int2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE int3
+#define __CLC_U_GENTYPE uint3
+#define __CLC_S_GENTYPE int3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE int4
+#define __CLC_U_GENTYPE uint4
+#define __CLC_S_GENTYPE int4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE int8
+#define __CLC_U_GENTYPE uint8
+#define __CLC_S_GENTYPE int8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE int16
+#define __CLC_U_GENTYPE uint16
+#define __CLC_S_GENTYPE int16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE uint
+
+#define __CLC_GENTYPE uint
+#define __CLC_U_GENTYPE uint
+#define __CLC_S_GENTYPE int
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uint2
+#define __CLC_U_GENTYPE uint2
+#define __CLC_S_GENTYPE int2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uint3
+#define __CLC_U_GENTYPE uint3
+#define __CLC_S_GENTYPE int3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uint4
+#define __CLC_U_GENTYPE uint4
+#define __CLC_S_GENTYPE int4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uint8
+#define __CLC_U_GENTYPE uint8
+#define __CLC_S_GENTYPE int8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE uint16
+#define __CLC_U_GENTYPE uint16
+#define __CLC_S_GENTYPE int16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_GENSIZE
+#define __CLC_GENSIZE 64
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE long
+
+#define __CLC_GENTYPE long
+#define __CLC_U_GENTYPE ulong
+#define __CLC_S_GENTYPE long
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE long2
+#define __CLC_U_GENTYPE ulong2
+#define __CLC_S_GENTYPE long2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE long3
+#define __CLC_U_GENTYPE ulong3
+#define __CLC_S_GENTYPE long3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE long4
+#define __CLC_U_GENTYPE ulong4
+#define __CLC_S_GENTYPE long4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE long8
+#define __CLC_U_GENTYPE ulong8
+#define __CLC_S_GENTYPE long8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE long16
+#define __CLC_U_GENTYPE ulong16
+#define __CLC_S_GENTYPE long16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_SCALAR_GENTYPE
+#define __CLC_SCALAR_GENTYPE ulong
+
+#define __CLC_GENTYPE ulong
+#define __CLC_U_GENTYPE ulong
+#define __CLC_S_GENTYPE long
+#define __CLC_SCALAR 1
+#include __CLC_BODY
+#undef __CLC_SCALAR
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ulong2
+#define __CLC_U_GENTYPE ulong2
+#define __CLC_S_GENTYPE long2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ulong3
+#define __CLC_U_GENTYPE ulong3
+#define __CLC_S_GENTYPE long3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ulong4
+#define __CLC_U_GENTYPE ulong4
+#define __CLC_S_GENTYPE long4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ulong8
+#define __CLC_U_GENTYPE ulong8
+#define __CLC_S_GENTYPE long8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#define __CLC_GENTYPE ulong16
+#define __CLC_U_GENTYPE ulong16
+#define __CLC_S_GENTYPE long16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_U_GENTYPE
+#undef __CLC_S_GENTYPE
+
+#undef __CLC_GENSIZE
+#undef __CLC_SCALAR_GENTYPE
+#undef __CLC_BODY
Modified: libclc/trunk/generic/include/clc/integer/rotate.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/rotate.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/rotate.h (original)
+++ libclc/trunk/generic/include/clc/integer/rotate.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/rotate.inc>
+#define __CLC_BODY <clc/integer/rotate.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/rotate.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/rotate.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/rotate.inc (original)
+++ libclc/trunk/generic/include/clc/integer/rotate.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE rotate(GENTYPE x, GENTYPE y);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE rotate(__CLC_GENTYPE x, __CLC_GENTYPE y);
Modified: libclc/trunk/generic/include/clc/integer/sub_sat.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/sub_sat.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/sub_sat.h (original)
+++ libclc/trunk/generic/include/clc/integer/sub_sat.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/integer/sub_sat.inc>
+#define __CLC_BODY <clc/integer/sub_sat.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/include/clc/integer/sub_sat.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/integer/sub_sat.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/integer/sub_sat.inc (original)
+++ libclc/trunk/generic/include/clc/integer/sub_sat.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE sub_sat(GENTYPE x, GENTYPE y);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE sub_sat(__CLC_GENTYPE x, __CLC_GENTYPE y);
Modified: libclc/trunk/generic/include/clc/math/binary_decl.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/binary_decl.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/binary_decl.inc (original)
+++ libclc/trunk/generic/include/clc/math/binary_decl.inc Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE FUNCTION(GENTYPE a, GENTYPE b);
-_CLC_OVERLOAD _CLC_DECL GENTYPE FUNCTION(GENTYPE a, float b);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE a, __CLC_GENTYPE b);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE a, float b);
#ifdef cl_khr_fp64
-_CLC_OVERLOAD _CLC_DECL GENTYPE FUNCTION(GENTYPE a, double b);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE a, double b);
#endif
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=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/binary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/binary_intrin.inc Mon Jul 8 12:27:02 2013
@@ -1,18 +1,18 @@
-_CLC_OVERLOAD float FUNCTION(float, float) __asm(INTRINSIC ".f32");
-_CLC_OVERLOAD float2 FUNCTION(float2, float2) __asm(INTRINSIC ".v2f32");
-_CLC_OVERLOAD float3 FUNCTION(float3, float3) __asm(INTRINSIC ".v3f32");
-_CLC_OVERLOAD float4 FUNCTION(float4, float4) __asm(INTRINSIC ".v4f32");
-_CLC_OVERLOAD float8 FUNCTION(float8, float8) __asm(INTRINSIC ".v8f32");
-_CLC_OVERLOAD float16 FUNCTION(float16, float16) __asm(INTRINSIC ".v16f32");
+_CLC_OVERLOAD float __CLC_FUNCTION(float, float) __asm(__CLC_INTRINSIC ".f32");
+_CLC_OVERLOAD float2 __CLC_FUNCTION(float2, float2) __asm(__CLC_INTRINSIC ".v2f32");
+_CLC_OVERLOAD float3 __CLC_FUNCTION(float3, float3) __asm(__CLC_INTRINSIC ".v3f32");
+_CLC_OVERLOAD float4 __CLC_FUNCTION(float4, float4) __asm(__CLC_INTRINSIC ".v4f32");
+_CLC_OVERLOAD float8 __CLC_FUNCTION(float8, float8) __asm(__CLC_INTRINSIC ".v8f32");
+_CLC_OVERLOAD float16 __CLC_FUNCTION(float16, float16) __asm(__CLC_INTRINSIC ".v16f32");
#ifdef cl_khr_fp64
-_CLC_OVERLOAD double FUNCTION(double, double) __asm(INTRINSIC ".f64");
-_CLC_OVERLOAD double2 FUNCTION(double2, double2) __asm(INTRINSIC ".v2f64");
-_CLC_OVERLOAD double3 FUNCTION(double3, double3) __asm(INTRINSIC ".v3f64");
-_CLC_OVERLOAD double4 FUNCTION(double4, double4) __asm(INTRINSIC ".v4f64");
-_CLC_OVERLOAD double8 FUNCTION(double8, double8) __asm(INTRINSIC ".v8f64");
-_CLC_OVERLOAD double16 FUNCTION(double16, double16) __asm(INTRINSIC ".v16f64");
+_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");
+_CLC_OVERLOAD double4 __CLC_FUNCTION(double4, double4) __asm(__CLC_INTRINSIC ".v4f64");
+_CLC_OVERLOAD double8 __CLC_FUNCTION(double8, double8) __asm(__CLC_INTRINSIC ".v8f64");
+_CLC_OVERLOAD double16 __CLC_FUNCTION(double16, double16) __asm(__CLC_INTRINSIC ".v16f64");
#endif
-#undef FUNCTION
-#undef INTRINSIC
+#undef __CLC_FUNCTION
+#undef __CLC_INTRINSIC
Modified: libclc/trunk/generic/include/clc/math/ceil.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/ceil.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/ceil.h (original)
+++ libclc/trunk/generic/include/clc/math/ceil.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef ceil
#define ceil __clc_ceil
-#define FUNCTION __clc_ceil
-#define INTRINSIC "llvm.ceil"
+#define __CLC_FUNCTION __clc_ceil
+#define __CLC_INTRINSIC "llvm.ceil"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/cos.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/cos.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/cos.h (original)
+++ libclc/trunk/generic/include/clc/math/cos.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef cos
#define cos __clc_cos
-#define FUNCTION __clc_cos
-#define INTRINSIC "llvm.cos"
+#define __CLC_FUNCTION __clc_cos
+#define __CLC_INTRINSIC "llvm.cos"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/exp2.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/exp2.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/exp2.h (original)
+++ libclc/trunk/generic/include/clc/math/exp2.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef exp2
#define exp2 __clc_exp2
-#define FUNCTION __clc_exp2
-#define INTRINSIC "llvm.exp2"
+#define __CLC_FUNCTION __clc_exp2
+#define __CLC_INTRINSIC "llvm.exp2"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/fabs.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fabs.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/fabs.h (original)
+++ libclc/trunk/generic/include/clc/math/fabs.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef fabs
#define fabs __clc_fabs
-#define FUNCTION __clc_fabs
-#define INTRINSIC "llvm.fabs"
+#define __CLC_FUNCTION __clc_fabs
+#define __CLC_INTRINSIC "llvm.fabs"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/floor.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/floor.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/floor.h (original)
+++ libclc/trunk/generic/include/clc/math/floor.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef floor
#define floor __clc_floor
-#define FUNCTION __clc_floor
-#define INTRINSIC "llvm.floor"
+#define __CLC_FUNCTION __clc_floor
+#define __CLC_INTRINSIC "llvm.floor"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/fma.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fma.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/fma.h (original)
+++ libclc/trunk/generic/include/clc/math/fma.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef fma
#define fma __clc_fma
-#define FUNCTION __clc_fma
-#define INTRINSIC "llvm.fma"
+#define __CLC_FUNCTION __clc_fma
+#define __CLC_INTRINSIC "llvm.fma"
#include <clc/math/ternary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/fmax.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fmax.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/fmax.h (original)
+++ libclc/trunk/generic/include/clc/math/fmax.h Mon Jul 8 12:27:02 2013
@@ -1,11 +1,11 @@
#undef fmax
#define fmax __clc_fmax
-#define BODY <clc/math/binary_decl.inc>
-#define FUNCTION __clc_fmax
+#define __CLC_BODY <clc/math/binary_decl.inc>
+#define __CLC_FUNCTION __clc_fmax
#include <clc/math/gentype.inc>
-#undef BODY
-#undef FUNCTION
+#undef __CLC_BODY
+#undef __CLC_FUNCTION
Modified: libclc/trunk/generic/include/clc/math/fmin.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/fmin.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/fmin.h (original)
+++ libclc/trunk/generic/include/clc/math/fmin.h Mon Jul 8 12:27:02 2013
@@ -1,11 +1,11 @@
#undef fmin
#define fmin __clc_fmin
-#define BODY <clc/math/binary_decl.inc>
-#define FUNCTION __clc_fmin
+#define __CLC_BODY <clc/math/binary_decl.inc>
+#define __CLC_FUNCTION __clc_fmin
#include <clc/math/gentype.inc>
-#undef BODY
-#undef FUNCTION
+#undef __CLC_BODY
+#undef __CLC_FUNCTION
Modified: libclc/trunk/generic/include/clc/math/gentype.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/gentype.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/gentype.inc (original)
+++ libclc/trunk/generic/include/clc/math/gentype.inc Mon Jul 8 12:27:02 2013
@@ -1,63 +1,63 @@
-#define SCALAR_GENTYPE float
+#define __CLC_SCALAR_GENTYPE float
-#define GENTYPE float
-#define SCALAR
-#include BODY
-#undef GENTYPE
-#undef SCALAR
-
-#define GENTYPE float2
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE float3
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE float4
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE float8
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE float16
-#include BODY
-#undef GENTYPE
+#define __CLC_GENTYPE float
+#define __CLC_SCALAR
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_SCALAR
+
+#define __CLC_GENTYPE float2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE float3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE float4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE float8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE float16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
-#undef SCALAR_GENTYPE
+#undef __CLC_SCALAR_GENTYPE
#ifdef cl_khr_fp64
-#define SCALAR_GENTYPE double
+#define __CLC_SCALAR_GENTYPE double
-#define SCALAR
-#define GENTYPE double
-#include BODY
-#undef GENTYPE
-#undef SCALAR
-
-#define GENTYPE double2
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE double3
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE double4
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE double8
-#include BODY
-#undef GENTYPE
-
-#define GENTYPE double16
-#include BODY
-#undef GENTYPE
+#define __CLC_SCALAR
+#define __CLC_GENTYPE double
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+#undef __CLC_SCALAR
+
+#define __CLC_GENTYPE double2
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE double3
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE double4
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE double8
+#include __CLC_BODY
+#undef __CLC_GENTYPE
+
+#define __CLC_GENTYPE double16
+#include __CLC_BODY
+#undef __CLC_GENTYPE
-#undef SCALAR_GENTYPE
+#undef __CLC_SCALAR_GENTYPE
#endif
-#undef BODY
+#undef __CLC_BODY
Modified: libclc/trunk/generic/include/clc/math/hypot.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/hypot.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/hypot.h (original)
+++ libclc/trunk/generic/include/clc/math/hypot.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/math/hypot.inc>
+#define __CLC_BODY <clc/math/hypot.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/include/clc/math/hypot.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/hypot.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/hypot.inc (original)
+++ libclc/trunk/generic/include/clc/math/hypot.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE hypot(GENTYPE x, GENTYPE y);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE hypot(__CLC_GENTYPE x, __CLC_GENTYPE y);
Modified: libclc/trunk/generic/include/clc/math/log2.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/log2.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/log2.h (original)
+++ libclc/trunk/generic/include/clc/math/log2.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef log2
#define log2 __clc_log2
-#define FUNCTION __clc_log2
-#define INTRINSIC "llvm.log2"
+#define __CLC_FUNCTION __clc_log2
+#define __CLC_INTRINSIC "llvm.log2"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/mad.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/mad.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/mad.h (original)
+++ libclc/trunk/generic/include/clc/math/mad.h Mon Jul 8 12:27:02 2013
@@ -1,2 +1,2 @@
-#define BODY <clc/math/mad.inc>
+#define __CLC_BODY <clc/math/mad.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/include/clc/math/mad.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/mad.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/mad.inc (original)
+++ libclc/trunk/generic/include/clc/math/mad.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE mad(GENTYPE a, GENTYPE b, GENTYPE c);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE mad(__CLC_GENTYPE a, __CLC_GENTYPE b, __CLC_GENTYPE c);
Modified: libclc/trunk/generic/include/clc/math/pow.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/pow.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/pow.h (original)
+++ libclc/trunk/generic/include/clc/math/pow.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef pow
#define pow __clc_pow
-#define FUNCTION __clc_pow
-#define INTRINSIC "llvm.pow"
+#define __CLC_FUNCTION __clc_pow
+#define __CLC_INTRINSIC "llvm.pow"
#include <clc/math/binary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/sin.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/sin.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/sin.h (original)
+++ libclc/trunk/generic/include/clc/math/sin.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef sin
#define sin __clc_sin
-#define FUNCTION __clc_sin
-#define INTRINSIC "llvm.sin"
+#define __CLC_FUNCTION __clc_sin
+#define __CLC_INTRINSIC "llvm.sin"
#include <clc/math/unary_intrin.inc>
Modified: libclc/trunk/generic/include/clc/math/sqrt.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/sqrt.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/sqrt.h (original)
+++ libclc/trunk/generic/include/clc/math/sqrt.h Mon Jul 8 12:27:02 2013
@@ -1,6 +1,6 @@
#undef sqrt
#define sqrt __clc_sqrt
-#define FUNCTION __clc_sqrt
-#define INTRINSIC "llvm.sqrt"
+#define __CLC_FUNCTION __clc_sqrt
+#define __CLC_INTRINSIC "llvm.sqrt"
#include <clc/math/unary_intrin.inc>
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=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/ternary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/ternary_intrin.inc Mon Jul 8 12:27:02 2013
@@ -1,18 +1,18 @@
-_CLC_OVERLOAD float FUNCTION(float, float, float) __asm(INTRINSIC ".f32");
-_CLC_OVERLOAD float2 FUNCTION(float2, float2, float2) __asm(INTRINSIC ".v2f32");
-_CLC_OVERLOAD float3 FUNCTION(float3, float3, float3) __asm(INTRINSIC ".v3f32");
-_CLC_OVERLOAD float4 FUNCTION(float4, float4, float4) __asm(INTRINSIC ".v4f32");
-_CLC_OVERLOAD float8 FUNCTION(float8, float8, float8) __asm(INTRINSIC ".v8f32");
-_CLC_OVERLOAD float16 FUNCTION(float16, float16, float16) __asm(INTRINSIC ".v16f32");
+_CLC_OVERLOAD float __CLC_FUNCTION(float, float, float) __asm(__CLC_INTRINSIC ".f32");
+_CLC_OVERLOAD float2 __CLC_FUNCTION(float2, float2, float2) __asm(__CLC_INTRINSIC ".v2f32");
+_CLC_OVERLOAD float3 __CLC_FUNCTION(float3, float3, float3) __asm(__CLC_INTRINSIC ".v3f32");
+_CLC_OVERLOAD float4 __CLC_FUNCTION(float4, float4, float4) __asm(__CLC_INTRINSIC ".v4f32");
+_CLC_OVERLOAD float8 __CLC_FUNCTION(float8, float8, float8) __asm(__CLC_INTRINSIC ".v8f32");
+_CLC_OVERLOAD float16 __CLC_FUNCTION(float16, float16, float16) __asm(__CLC_INTRINSIC ".v16f32");
#ifdef cl_khr_fp64
-_CLC_OVERLOAD double FUNCTION(double, double, double) __asm(INTRINSIC ".f64");
-_CLC_OVERLOAD double2 FUNCTION(double2, double2, double2) __asm(INTRINSIC ".v2f64");
-_CLC_OVERLOAD double3 FUNCTION(double3, double3, double3) __asm(INTRINSIC ".v3f64");
-_CLC_OVERLOAD double4 FUNCTION(double4, double4, double4) __asm(INTRINSIC ".v4f64");
-_CLC_OVERLOAD double8 FUNCTION(double8, double8, double8) __asm(INTRINSIC ".v8f64");
-_CLC_OVERLOAD double16 FUNCTION(double16, double16, double16) __asm(INTRINSIC ".v16f64");
+_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");
+_CLC_OVERLOAD double4 __CLC_FUNCTION(double4, double4, double4) __asm(__CLC_INTRINSIC ".v4f64");
+_CLC_OVERLOAD double8 __CLC_FUNCTION(double8, double8, double8) __asm(__CLC_INTRINSIC ".v8f64");
+_CLC_OVERLOAD double16 __CLC_FUNCTION(double16, double16, double16) __asm(__CLC_INTRINSIC ".v16f64");
#endif
-#undef FUNCTION
-#undef INTRINSIC
+#undef __CLC_FUNCTION
+#undef __CLC_INTRINSIC
Modified: libclc/trunk/generic/include/clc/math/unary_decl.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/math/unary_decl.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/unary_decl.inc (original)
+++ libclc/trunk/generic/include/clc/math/unary_decl.inc Mon Jul 8 12:27:02 2013
@@ -1 +1 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE FUNCTION(GENTYPE x);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);
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=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/math/unary_intrin.inc (original)
+++ libclc/trunk/generic/include/clc/math/unary_intrin.inc Mon Jul 8 12:27:02 2013
@@ -1,18 +1,18 @@
-_CLC_OVERLOAD float FUNCTION(float f) __asm(INTRINSIC ".f32");
-_CLC_OVERLOAD float2 FUNCTION(float2 f) __asm(INTRINSIC ".v2f32");
-_CLC_OVERLOAD float3 FUNCTION(float3 f) __asm(INTRINSIC ".v3f32");
-_CLC_OVERLOAD float4 FUNCTION(float4 f) __asm(INTRINSIC ".v4f32");
-_CLC_OVERLOAD float8 FUNCTION(float8 f) __asm(INTRINSIC ".v8f32");
-_CLC_OVERLOAD float16 FUNCTION(float16 f) __asm(INTRINSIC ".v16f32");
+_CLC_OVERLOAD float __CLC_FUNCTION(float f) __asm(__CLC_INTRINSIC ".f32");
+_CLC_OVERLOAD float2 __CLC_FUNCTION(float2 f) __asm(__CLC_INTRINSIC ".v2f32");
+_CLC_OVERLOAD float3 __CLC_FUNCTION(float3 f) __asm(__CLC_INTRINSIC ".v3f32");
+_CLC_OVERLOAD float4 __CLC_FUNCTION(float4 f) __asm(__CLC_INTRINSIC ".v4f32");
+_CLC_OVERLOAD float8 __CLC_FUNCTION(float8 f) __asm(__CLC_INTRINSIC ".v8f32");
+_CLC_OVERLOAD float16 __CLC_FUNCTION(float16 f) __asm(__CLC_INTRINSIC ".v16f32");
#ifdef cl_khr_fp64
-_CLC_OVERLOAD double FUNCTION(double d) __asm(INTRINSIC ".f64");
-_CLC_OVERLOAD double2 FUNCTION(double2 d) __asm(INTRINSIC ".v2f64");
-_CLC_OVERLOAD double3 FUNCTION(double3 d) __asm(INTRINSIC ".v3f64");
-_CLC_OVERLOAD double4 FUNCTION(double4 d) __asm(INTRINSIC ".v4f64");
-_CLC_OVERLOAD double8 FUNCTION(double8 d) __asm(INTRINSIC ".v8f64");
-_CLC_OVERLOAD double16 FUNCTION(double16 d) __asm(INTRINSIC ".v16f64");
+_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");
+_CLC_OVERLOAD double4 __CLC_FUNCTION(double4 d) __asm(__CLC_INTRINSIC ".v4f64");
+_CLC_OVERLOAD double8 __CLC_FUNCTION(double8 d) __asm(__CLC_INTRINSIC ".v8f64");
+_CLC_OVERLOAD double16 __CLC_FUNCTION(double16 d) __asm(__CLC_INTRINSIC ".v16f64");
#endif
-#undef FUNCTION
-#undef INTRINSIC
+#undef __CLC_FUNCTION
+#undef __CLC_INTRINSIC
Modified: libclc/trunk/generic/include/clc/shared/clamp.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/clamp.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/clamp.h (original)
+++ libclc/trunk/generic/include/clc/shared/clamp.h Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-#define BODY <clc/shared/clamp.inc>
+#define __CLC_BODY <clc/shared/clamp.inc>
#include <clc/integer/gentype.inc>
-#define BODY <clc/shared/clamp.inc>
+#define __CLC_BODY <clc/shared/clamp.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/include/clc/shared/clamp.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/clamp.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/clamp.inc (original)
+++ libclc/trunk/generic/include/clc/shared/clamp.inc Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, GENTYPE y, GENTYPE z);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE z);
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, SCALAR_GENTYPE y, SCALAR_GENTYPE z);
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_SCALAR_GENTYPE y, __CLC_SCALAR_GENTYPE z);
#endif
Modified: libclc/trunk/generic/include/clc/shared/max.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/max.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/max.h (original)
+++ libclc/trunk/generic/include/clc/shared/max.h Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-#define BODY <clc/shared/max.inc>
+#define __CLC_BODY <clc/shared/max.inc>
#include <clc/integer/gentype.inc>
-#define BODY <clc/shared/max.inc>
+#define __CLC_BODY <clc/shared/max.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/include/clc/shared/max.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/max.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/max.inc (original)
+++ libclc/trunk/generic/include/clc/shared/max.inc Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_GENTYPE b);
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, SCALAR_GENTYPE b);
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b);
#endif
Modified: libclc/trunk/generic/include/clc/shared/min.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/min.h?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/min.h (original)
+++ libclc/trunk/generic/include/clc/shared/min.h Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-#define BODY <clc/shared/min.inc>
+#define __CLC_BODY <clc/shared/min.inc>
#include <clc/integer/gentype.inc>
-#define BODY <clc/shared/min.inc>
+#define __CLC_BODY <clc/shared/min.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/include/clc/shared/min.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/shared/min.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/shared/min.inc (original)
+++ libclc/trunk/generic/include/clc/shared/min.inc Mon Jul 8 12:27:02 2013
@@ -1,5 +1,5 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE min(GENTYPE a, GENTYPE b);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_GENTYPE b);
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DECL GENTYPE min(GENTYPE a, SCALAR_GENTYPE b);
-#endif
\ No newline at end of file
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b);
+#endif
Modified: libclc/trunk/generic/lib/geometric/length.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/length.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/geometric/length.cl (original)
+++ libclc/trunk/generic/lib/geometric/length.cl Mon Jul 8 12:27:02 2013
@@ -4,5 +4,5 @@
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <length.inc>
+#define __CLC_BODY <length.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/lib/geometric/length.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/length.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/geometric/length.inc (original)
+++ libclc/trunk/generic/lib/geometric/length.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF FLOAT length(FLOATN p) {
+_CLC_OVERLOAD _CLC_DEF __CLC_FLOAT length(__CLC_FLOATN p) {
return native_sqrt(dot(p, p));
}
Modified: libclc/trunk/generic/lib/geometric/normalize.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/normalize.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/geometric/normalize.cl (original)
+++ libclc/trunk/generic/lib/geometric/normalize.cl Mon Jul 8 12:27:02 2013
@@ -4,5 +4,5 @@
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <normalize.inc>
+#define __CLC_BODY <normalize.inc>
#include <clc/geometric/floatn.inc>
Modified: libclc/trunk/generic/lib/geometric/normalize.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/geometric/normalize.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/geometric/normalize.inc (original)
+++ libclc/trunk/generic/lib/geometric/normalize.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF FLOATN normalize(FLOATN p) {
+_CLC_OVERLOAD _CLC_DEF __CLC_FLOATN normalize(__CLC_FLOATN p) {
return p/length(p);
}
Modified: libclc/trunk/generic/lib/integer/abs.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/abs.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/abs.cl (original)
+++ libclc/trunk/generic/lib/integer/abs.cl Mon Jul 8 12:27:02 2013
@@ -1,4 +1,4 @@
#include <clc/clc.h>
-#define BODY <abs.inc>
+#define __CLC_BODY <abs.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/lib/integer/abs.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/abs.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/abs.inc (original)
+++ libclc/trunk/generic/lib/integer/abs.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF UGENTYPE abs(GENTYPE x) {
- return __builtin_astype((GENTYPE)(x > (GENTYPE)(0) ? x : -x), UGENTYPE);
+_CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE abs(__CLC_GENTYPE x) {
+ return __builtin_astype((__CLC_GENTYPE)(x > (__CLC_GENTYPE)(0) ? x : -x), __CLC_U_GENTYPE);
}
Modified: libclc/trunk/generic/lib/integer/abs_diff.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/abs_diff.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/abs_diff.cl (original)
+++ libclc/trunk/generic/lib/integer/abs_diff.cl Mon Jul 8 12:27:02 2013
@@ -1,4 +1,4 @@
#include <clc/clc.h>
-#define BODY <abs_diff.inc>
+#define __CLC_BODY <abs_diff.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/lib/integer/abs_diff.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/abs_diff.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/abs_diff.inc (original)
+++ libclc/trunk/generic/lib/integer/abs_diff.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF UGENTYPE abs_diff(GENTYPE x, GENTYPE y) {
- return __builtin_astype((GENTYPE)(x > y ? x-y : y-x), UGENTYPE);
+_CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE abs_diff(__CLC_GENTYPE x, __CLC_GENTYPE y) {
+ return __builtin_astype((__CLC_GENTYPE)(x > y ? x-y : y-x), __CLC_U_GENTYPE);
}
Modified: libclc/trunk/generic/lib/integer/rotate.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/rotate.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/rotate.cl (original)
+++ libclc/trunk/generic/lib/integer/rotate.cl Mon Jul 8 12:27:02 2013
@@ -1,4 +1,4 @@
#include <clc/clc.h>
-#define BODY <rotate.inc>
+#define __CLC_BODY <rotate.inc>
#include <clc/integer/gentype.inc>
Modified: libclc/trunk/generic/lib/integer/rotate.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/integer/rotate.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/integer/rotate.inc (original)
+++ libclc/trunk/generic/lib/integer/rotate.inc Mon Jul 8 12:27:02 2013
@@ -7,36 +7,36 @@
* Eventually, someone should feel free to implement an llvm-specific version
*/
-_CLC_OVERLOAD _CLC_DEF GENTYPE rotate(GENTYPE x, GENTYPE n){
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE rotate(__CLC_GENTYPE x, __CLC_GENTYPE n){
//Try to avoid extra work if someone's spinning the value through multiple
//full rotations
- n = n % (GENTYPE)GENSIZE;
+ n = n % (__CLC_GENTYPE)__CLC_GENSIZE;
-#ifdef SCALAR
+#ifdef __CLC_SCALAR
if (n > 0){
- return (x << n) | (((UGENTYPE)x) >> (GENSIZE - n));
+ return (x << n) | (((__CLC_U_GENTYPE)x) >> (__CLC_GENSIZE - n));
} else if (n == 0){
return x;
} else {
- return ( (((UGENTYPE)x) >> -n) | (x << (GENSIZE + n)) );
+ return ( (((__CLC_U_GENTYPE)x) >> -n) | (x << (__CLC_GENSIZE + n)) );
}
#else
//XXX: There's a lot of __builtin_astype calls to cast everything to
- // unsigned ... This should be improved so that if GENTYPE==UGENTYPE, no
+ // unsigned ... This should be improved so that if __CLC_GENTYPE==__CLC_U_GENTYPE, no
// casts are required.
- UGENTYPE x_1 = __builtin_astype(x, UGENTYPE);
+ __CLC_U_GENTYPE x_1 = __builtin_astype(x, __CLC_U_GENTYPE);
- //XXX: Is (UGENTYPE >> SGENTYPE) | (UGENTYPE << SGENTYPE) legal?
+ //XXX: Is (__CLC_U_GENTYPE >> S__CLC_GENTYPE) | (__CLC_U_GENTYPE << S__CLC_GENTYPE) legal?
// If so, then combine the amt and shifts into a single set of statements
- UGENTYPE amt;
- amt = (n < (GENTYPE)0 ? __builtin_astype((GENTYPE)0-n, UGENTYPE) : (UGENTYPE)0);
- x_1 = (x_1 >> amt) | (x_1 << ((UGENTYPE)GENSIZE - amt));
+ __CLC_U_GENTYPE amt;
+ amt = (n < (__CLC_GENTYPE)0 ? __builtin_astype((__CLC_GENTYPE)0-n, __CLC_U_GENTYPE) : (__CLC_U_GENTYPE)0);
+ x_1 = (x_1 >> amt) | (x_1 << ((__CLC_U_GENTYPE)__CLC_GENSIZE - amt));
- amt = (n < (GENTYPE)0 ? (UGENTYPE)0 : __builtin_astype(n, UGENTYPE));
- x_1 = (x_1 << amt) | (x_1 >> ((UGENTYPE)GENSIZE - amt));
+ amt = (n < (__CLC_GENTYPE)0 ? (__CLC_U_GENTYPE)0 : __builtin_astype(n, __CLC_U_GENTYPE));
+ x_1 = (x_1 << amt) | (x_1 >> ((__CLC_U_GENTYPE)__CLC_GENSIZE - amt));
- return __builtin_astype(x_1, GENTYPE);
+ return __builtin_astype(x_1, __CLC_GENTYPE);
#endif
-}
\ No newline at end of file
+}
Modified: libclc/trunk/generic/lib/math/binary_impl.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/binary_impl.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/binary_impl.inc (original)
+++ libclc/trunk/generic/lib/math/binary_impl.inc Mon Jul 8 12:27:02 2013
@@ -1,18 +1,18 @@
-#ifndef SCALAR
+#ifndef __CLC_SCALAR
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, GENTYPE y) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, __CLC_GENTYPE y) {
return FUNCTION_IMPL(x, y);
}
#endif
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, double y) {
- GENTYPE vec_y = (GENTYPE) (y);
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, double y) {
+ __CLC_GENTYPE vec_y = (__CLC_GENTYPE) (y);
return FUNCTION_IMPL(x, vec_y);
}
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, float y) {
- GENTYPE vec_y = (GENTYPE) (y);
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, float y) {
+ __CLC_GENTYPE vec_y = (__CLC_GENTYPE) (y);
return FUNCTION_IMPL(x, vec_y);
}
Modified: libclc/trunk/generic/lib/math/fmax.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/fmax.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/fmax.cl (original)
+++ libclc/trunk/generic/lib/math/fmax.cl Mon Jul 8 12:27:02 2013
@@ -7,5 +7,5 @@
#define FUNCTION __clc_fmax
#define FUNCTION_IMPL(x, y) ((x) < (y) ? (y) : (x))
-#define BODY <binary_impl.inc>
+#define __CLC_BODY <binary_impl.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/fmin.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/fmin.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/fmin.cl (original)
+++ libclc/trunk/generic/lib/math/fmin.cl Mon Jul 8 12:27:02 2013
@@ -7,5 +7,5 @@
#define FUNCTION __clc_fmin
#define FUNCTION_IMPL(x, y) ((y) < (x) ? (y) : (x))
-#define BODY <binary_impl.inc>
+#define __CLC_BODY <binary_impl.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=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/hypot.cl (original)
+++ libclc/trunk/generic/lib/math/hypot.cl Mon Jul 8 12:27:02 2013
@@ -4,5 +4,5 @@
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <hypot.inc>
+#define __CLC_BODY <hypot.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/hypot.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/hypot.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/hypot.inc (original)
+++ libclc/trunk/generic/lib/math/hypot.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE hypot(GENTYPE x, GENTYPE y) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE hypot(__CLC_GENTYPE x, __CLC_GENTYPE y) {
return sqrt(x*x + y*y);
}
Modified: libclc/trunk/generic/lib/math/mad.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/mad.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/mad.cl (original)
+++ libclc/trunk/generic/lib/math/mad.cl Mon Jul 8 12:27:02 2013
@@ -4,5 +4,5 @@
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <mad.inc>
+#define __CLC_BODY <mad.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/math/mad.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/math/mad.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/math/mad.inc (original)
+++ libclc/trunk/generic/lib/math/mad.inc Mon Jul 8 12:27:02 2013
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE mad(GENTYPE a, GENTYPE b, GENTYPE c) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE mad(__CLC_GENTYPE a, __CLC_GENTYPE b, __CLC_GENTYPE c) {
return a * b + c;
}
Modified: libclc/trunk/generic/lib/shared/clamp.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/clamp.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/clamp.cl (original)
+++ libclc/trunk/generic/lib/shared/clamp.cl Mon Jul 8 12:27:02 2013
@@ -1,11 +1,11 @@
#include <clc/clc.h>
-#define BODY <clamp.inc>
+#define __CLC_BODY <clamp.inc>
#include <clc/integer/gentype.inc>
#ifdef cl_khr_fp64
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <clamp.inc>
+#define __CLC_BODY <clamp.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/clamp.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/clamp.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/clamp.inc (original)
+++ libclc/trunk/generic/lib/shared/clamp.inc Mon Jul 8 12:27:02 2013
@@ -1,9 +1,9 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE clamp(GENTYPE x, GENTYPE y, GENTYPE z) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE z) {
return (x > z ? z : (x < y ? y : x));
}
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DEF GENTYPE clamp(GENTYPE x, SCALAR_GENTYPE y, SCALAR_GENTYPE z) {
- return (x > (GENTYPE)z ? (GENTYPE)z : (x < (GENTYPE)y ? (GENTYPE)y : x));
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_SCALAR_GENTYPE y, __CLC_SCALAR_GENTYPE z) {
+ return (x > (__CLC_GENTYPE)z ? (__CLC_GENTYPE)z : (x < (__CLC_GENTYPE)y ? (__CLC_GENTYPE)y : x));
}
-#endif
\ No newline at end of file
+#endif
Modified: libclc/trunk/generic/lib/shared/max.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/max.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/max.cl (original)
+++ libclc/trunk/generic/lib/shared/max.cl Mon Jul 8 12:27:02 2013
@@ -1,11 +1,11 @@
#include <clc/clc.h>
-#define BODY <max.inc>
+#define __CLC_BODY <max.inc>
#include <clc/integer/gentype.inc>
#ifdef cl_khr_fp64
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <max.inc>
+#define __CLC_BODY <max.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/max.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/max.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/max.inc (original)
+++ libclc/trunk/generic/lib/shared/max.inc Mon Jul 8 12:27:02 2013
@@ -1,9 +1,9 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_GENTYPE b) {
return (a > b ? a : b);
}
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, SCALAR_GENTYPE b) {
- return (a > (GENTYPE)b ? a : (GENTYPE)b);
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b) {
+ return (a > (__CLC_GENTYPE)b ? a : (__CLC_GENTYPE)b);
}
-#endif
\ No newline at end of file
+#endif
Modified: libclc/trunk/generic/lib/shared/min.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/min.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/min.cl (original)
+++ libclc/trunk/generic/lib/shared/min.cl Mon Jul 8 12:27:02 2013
@@ -1,11 +1,11 @@
#include <clc/clc.h>
-#define BODY <min.inc>
+#define __CLC_BODY <min.inc>
#include <clc/integer/gentype.inc>
#ifdef cl_khr_fp64
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
#endif
-#define BODY <min.inc>
+#define __CLC_BODY <min.inc>
#include <clc/math/gentype.inc>
Modified: libclc/trunk/generic/lib/shared/min.inc
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/min.inc?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/min.inc (original)
+++ libclc/trunk/generic/lib/shared/min.inc Mon Jul 8 12:27:02 2013
@@ -1,9 +1,9 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE min(GENTYPE a, GENTYPE b) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_GENTYPE b) {
return (a < b ? a : b);
}
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DEF GENTYPE min(GENTYPE a, SCALAR_GENTYPE b) {
- return (a < (GENTYPE)b ? a : (GENTYPE)b);
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b) {
+ return (a < (__CLC_GENTYPE)b ? a : (__CLC_GENTYPE)b);
}
#endif
Modified: libclc/trunk/generic/lib/shared/vload.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/vload.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/vload.cl (original)
+++ libclc/trunk/generic/lib/shared/vload.cl Mon Jul 8 12:27:02 2013
@@ -21,11 +21,11 @@
return (PRIM_TYPE##16)(vload8(offset, x), vload8(offset+8, x)); \
} \
-#define VLOAD_ADDR_SPACES(SCALAR_GENTYPE) \
- VLOAD_VECTORIZE(SCALAR_GENTYPE, __private) \
- VLOAD_VECTORIZE(SCALAR_GENTYPE, __local) \
- VLOAD_VECTORIZE(SCALAR_GENTYPE, __constant) \
- VLOAD_VECTORIZE(SCALAR_GENTYPE, __global) \
+#define VLOAD_ADDR_SPACES(__CLC_SCALAR_GENTYPE) \
+ VLOAD_VECTORIZE(__CLC_SCALAR_GENTYPE, __private) \
+ VLOAD_VECTORIZE(__CLC_SCALAR_GENTYPE, __local) \
+ VLOAD_VECTORIZE(__CLC_SCALAR_GENTYPE, __constant) \
+ VLOAD_VECTORIZE(__CLC_SCALAR_GENTYPE, __global) \
//int/uint are special... see below
#define VLOAD_TYPES() \
@@ -93,4 +93,4 @@ _CLC_OVERLOAD _CLC_DEF uint8 vload8(size
}
_CLC_OVERLOAD _CLC_DEF uint16 vload16(size_t offset, const global uint *x) {
return __clc_vload16_uint__global(offset, x);
-}
\ No newline at end of file
+}
Modified: libclc/trunk/generic/lib/shared/vstore.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/shared/vstore.cl?rev=185838&r1=185837&r2=185838&view=diff
==============================================================================
--- libclc/trunk/generic/lib/shared/vstore.cl (original)
+++ libclc/trunk/generic/lib/shared/vstore.cl Mon Jul 8 12:27:02 2013
@@ -29,10 +29,10 @@
vstore8(vec.hi, offset+8, mem); \
} \
-#define VSTORE_ADDR_SPACES(SCALAR_GENTYPE) \
- VSTORE_VECTORIZE(SCALAR_GENTYPE, __private) \
- VSTORE_VECTORIZE(SCALAR_GENTYPE, __local) \
- VSTORE_VECTORIZE(SCALAR_GENTYPE, __global) \
+#define VSTORE_ADDR_SPACES(__CLC_SCALAR___CLC_GENTYPE) \
+ VSTORE_VECTORIZE(__CLC_SCALAR___CLC_GENTYPE, __private) \
+ VSTORE_VECTORIZE(__CLC_SCALAR___CLC_GENTYPE, __local) \
+ VSTORE_VECTORIZE(__CLC_SCALAR___CLC_GENTYPE, __global) \
//int/uint are special... see below
#define VSTORE_TYPES() \
More information about the cfe-commits
mailing list