diff --git a/libclc/clc/include/clc/address_space/clc_qualifier.h b/libclc/clc/include/clc/address_space/clc_qualifier.h index 28b8ab33d5df..e495f1801268 100644 --- a/libclc/clc/include/clc/address_space/clc_qualifier.h +++ b/libclc/clc/include/clc/address_space/clc_qualifier.h @@ -9,7 +9,7 @@ #ifndef __CLC_ADDRESS_SPACE_CLC_QUALIFIER_H__ #define __CLC_ADDRESS_SPACE_CLC_QUALIFIER_H__ -#include +#include "clc/clcfunc.h" #if _CLC_GENERIC_AS_SUPPORTED diff --git a/libclc/clc/include/clc/async/clc_prefetch.h b/libclc/clc/include/clc/async/clc_prefetch.h index 62ff4a77f894..beb2145070d4 100644 --- a/libclc/clc/include/clc/async/clc_prefetch.h +++ b/libclc/clc/include/clc/async/clc_prefetch.h @@ -9,10 +9,10 @@ #ifndef __CLC_ASYNC_CLC_PREFETCH_H__ #define __CLC_ASYNC_CLC_PREFETCH_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/async/clc_prefetch_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/async/clc_prefetch_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_ASYNC_CLC_PREFETCH_H__ diff --git a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h index 31b816722350..5c68b21929c4 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h @@ -9,16 +9,16 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__ #define __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_compare_exchange #define __CLC_COMPARE_EXCHANGE -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_COMPARE_EXCHANGE #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_dec.h b/libclc/clc/include/clc/atomic/clc_atomic_dec.h index 66302b6b9ade..faef087ff4b5 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_dec.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_dec.h @@ -9,13 +9,13 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_DEC_H__ #define __CLC_ATOMIC_CLC_ATOMIC_DEC_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_dec #define __CLC_NO_VALUE_ARG -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_NO_VALUE_ARG #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h index 321cfb403085..6b4c743ec011 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h @@ -9,15 +9,15 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__ #define __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_exchange -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h index 4ef29fce50af..47a07ff5adae 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h @@ -9,15 +9,15 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_add -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h index 688c11287db5..4c3099a8fd3d 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h @@ -9,12 +9,12 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_and -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h index a4e44b88a697..9752ed217442 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h @@ -9,15 +9,15 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_max -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h index b58b538649e1..a19b05390920 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h @@ -9,15 +9,15 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_min -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h index ab303cc673ba..f574895d91ec 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h @@ -9,12 +9,12 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_or -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h index d9deae085a61..dfb98d18dbf2 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h @@ -9,15 +9,15 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_sub -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h index fe13a641fc1c..4cd6293e7bc5 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h @@ -9,12 +9,12 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_fetch_xor -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h index fee7c0506abc..ea17a2f350c0 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h @@ -9,7 +9,7 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__ -#include +#include "clc/internal/clc.h" #define __CLC_DECLARE_ATOMIC_FLAG_CLEAR(ADDRSPACE) \ _CLC_OVERLOAD _CLC_DECL void __clc_atomic_flag_clear( \ diff --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h index afc373204ad7..8cf4c8e3ec83 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h @@ -9,7 +9,7 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__ #define __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__ -#include +#include "clc/internal/clc.h" #define __CLC_DECLARE_ATOMIC_FLAG_TEST_AND_SET(ADDRSPACE) \ _CLC_OVERLOAD _CLC_DECL bool __clc_atomic_flag_test_and_set( \ diff --git a/libclc/clc/include/clc/atomic/clc_atomic_inc.h b/libclc/clc/include/clc/atomic/clc_atomic_inc.h index c6fcdad30949..fb81c2c56fc0 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_inc.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_inc.h @@ -9,13 +9,13 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_INC_H__ #define __CLC_ATOMIC_CLC_ATOMIC_INC_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_inc #define __CLC_NO_VALUE_ARG -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_NO_VALUE_ARG #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_load.h b/libclc/clc/include/clc/atomic/clc_atomic_load.h index 3abfce86b194..da8c0d99e7d0 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_load.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_load.h @@ -9,16 +9,16 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__ #define __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_load #define __CLC_NO_VALUE_ARG -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_NO_VALUE_ARG #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/atomic/clc_atomic_store.h b/libclc/clc/include/clc/atomic/clc_atomic_store.h index 94d77621735d..78698db9786b 100644 --- a/libclc/clc/include/clc/atomic/clc_atomic_store.h +++ b/libclc/clc/include/clc/atomic/clc_atomic_store.h @@ -9,16 +9,16 @@ #ifndef __CLC_ATOMIC_CLC_ATOMIC_STORE_H__ #define __CLC_ATOMIC_CLC_ATOMIC_STORE_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_atomic_store #define __CLC_RETURN_VOID -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/atomic/atomic_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_RETURN_VOID #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/clc_convert.h b/libclc/clc/include/clc/clc_convert.h index 97cfa667c8b1..544b2bbdf396 100644 --- a/libclc/clc/include/clc/clc_convert.h +++ b/libclc/clc/include/clc/clc_convert.h @@ -9,7 +9,7 @@ #ifndef __CLC_CLC_CONVERT_H__ #define __CLC_CLC_CONVERT_H__ -#include +#include "clc/internal/clc.h" #define _CLC_CONVERT_DECL(FROM_TYPE, TO_TYPE, SUFFIX) \ _CLC_OVERLOAD _CLC_DECL TO_TYPE __clc_convert_##TO_TYPE##SUFFIX(FROM_TYPE x); diff --git a/libclc/clc/include/clc/collective/clc_work_group_broadcast.h b/libclc/clc/include/clc/collective/clc_work_group_broadcast.h index 1416575854e0..60832fba30f4 100644 --- a/libclc/clc/include/clc/collective/clc_work_group_broadcast.h +++ b/libclc/clc/include/clc/collective/clc_work_group_broadcast.h @@ -11,10 +11,10 @@ #include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/collective/clc_work_group_broadcast_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/collective/clc_work_group_broadcast_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_COLLECTIVE_CLC_WORK_GROUP_BROADCAST_H__ diff --git a/libclc/clc/include/clc/collective/clc_work_group_reduce.h b/libclc/clc/include/clc/collective/clc_work_group_reduce.h index 31ecb486fbdc..f525110bd462 100644 --- a/libclc/clc/include/clc/collective/clc_work_group_reduce.h +++ b/libclc/clc/include/clc/collective/clc_work_group_reduce.h @@ -11,10 +11,10 @@ #include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/collective/clc_work_group_reduce_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/collective/clc_work_group_reduce_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_COLLECTIVE_CLC_WORK_GROUP_REDUCE_H__ diff --git a/libclc/clc/include/clc/common/clc_degrees.h b/libclc/clc/include/clc/common/clc_degrees.h index 5f04fac1f261..d1ccb61fc7ba 100644 --- a/libclc/clc/include/clc/common/clc_degrees.h +++ b/libclc/clc/include/clc/common/clc_degrees.h @@ -9,10 +9,10 @@ #ifndef __CLC_COMMON_CLC_DEGREES_H__ #define __CLC_COMMON_CLC_DEGREES_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_degrees -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/common/clc_radians.h b/libclc/clc/include/clc/common/clc_radians.h index 03d7c4b9e301..f391a1cf79bd 100644 --- a/libclc/clc/include/clc/common/clc_radians.h +++ b/libclc/clc/include/clc/common/clc_radians.h @@ -9,10 +9,10 @@ #ifndef __CLC_COMMON_CLC_RADIANS_H__ #define __CLC_COMMON_CLC_RADIANS_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_radians -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/common/clc_sign.h b/libclc/clc/include/clc/common/clc_sign.h index 9737f1e54441..1d59579a3fcb 100644 --- a/libclc/clc/include/clc/common/clc_sign.h +++ b/libclc/clc/include/clc/common/clc_sign.h @@ -10,9 +10,9 @@ #define __CLC_COMMON_CLC_SIGN_H__ #define __CLC_FUNCTION __clc_sign -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/common/clc_smoothstep.h b/libclc/clc/include/clc/common/clc_smoothstep.h index 46ae63e76dca..12ce642aea3e 100644 --- a/libclc/clc/include/clc/common/clc_smoothstep.h +++ b/libclc/clc/include/clc/common/clc_smoothstep.h @@ -12,7 +12,7 @@ // note: Unlike OpenCL __clc_smoothstep is only defined for three matching // argument types. -#define __CLC_BODY -#include +#define __CLC_BODY "clc/common/clc_smoothstep_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_COMMON_CLC_SMOOTHSTEP_H__ diff --git a/libclc/clc/include/clc/common/clc_step.h b/libclc/clc/include/clc/common/clc_step.h index 6b093d06896c..a4b0f2c9cb50 100644 --- a/libclc/clc/include/clc/common/clc_step.h +++ b/libclc/clc/include/clc/common/clc_step.h @@ -10,9 +10,9 @@ #define __CLC_COMMON_CLC_STEP_H__ #define __CLC_FUNCTION __clc_step -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/binary_def.inc b/libclc/clc/include/clc/geometric/binary_def.inc index bbd4f5798002..c29d85ff9a3a 100644 --- a/libclc/clc/include/clc/geometric/binary_def.inc +++ b/libclc/clc/include/clc/geometric/binary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/geometric/clc_cross.h b/libclc/clc/include/clc/geometric/clc_cross.h index c0a9cacbc338..cf9d35c3d026 100644 --- a/libclc/clc/include/clc/geometric/clc_cross.h +++ b/libclc/clc/include/clc/geometric/clc_cross.h @@ -9,7 +9,7 @@ #ifndef __CLC_GEOMETRIC_CLC_CROSS_H__ #define __CLC_GEOMETRIC_CLC_CROSS_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL float3 __clc_cross(float3 p0, float3 p1); _CLC_OVERLOAD _CLC_CONST _CLC_DECL float4 __clc_cross(float4 p0, float4 p1); diff --git a/libclc/clc/include/clc/geometric/clc_distance.h b/libclc/clc/include/clc/geometric/clc_distance.h index 1acea411a08b..701331463f44 100644 --- a/libclc/clc/include/clc/geometric/clc_distance.h +++ b/libclc/clc/include/clc/geometric/clc_distance.h @@ -10,9 +10,9 @@ #define __CLC_GEOMETRIC_CLC_DISTANCE_H__ #define __CLC_FUNCTION __clc_distance -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/clc_dot.h b/libclc/clc/include/clc/geometric/clc_dot.h index a5a97d1bdd2b..c691778c538b 100644 --- a/libclc/clc/include/clc/geometric/clc_dot.h +++ b/libclc/clc/include/clc/geometric/clc_dot.h @@ -10,9 +10,9 @@ #define __CLC_GEOMETRIC_CLC_DOT_H__ #define __CLC_FUNCTION __clc_dot -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/clc_fast_distance.h b/libclc/clc/include/clc/geometric/clc_fast_distance.h index 47292130e9d6..424c0db73752 100644 --- a/libclc/clc/include/clc/geometric/clc_fast_distance.h +++ b/libclc/clc/include/clc/geometric/clc_fast_distance.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_fast_distance -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/clc_fast_length.h b/libclc/clc/include/clc/geometric/clc_fast_length.h index 2244d8c77fea..ebc8b86dca31 100644 --- a/libclc/clc/include/clc/geometric/clc_fast_length.h +++ b/libclc/clc/include/clc/geometric/clc_fast_length.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_fast_length -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/clc_fast_normalize.h b/libclc/clc/include/clc/geometric/clc_fast_normalize.h index ee9747c1af1e..a6e77bb66a8b 100644 --- a/libclc/clc/include/clc/geometric/clc_fast_normalize.h +++ b/libclc/clc/include/clc/geometric/clc_fast_normalize.h @@ -12,8 +12,8 @@ #define __CLC_FLOAT_ONLY #define __CLC_GEOMETRIC_RET_GENTYPE #define __CLC_FUNCTION __clc_fast_normalize -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/unary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_GEOMETRIC_RET_GENTYPE diff --git a/libclc/clc/include/clc/geometric/clc_length.h b/libclc/clc/include/clc/geometric/clc_length.h index f8ce12db0787..5997d1e60144 100644 --- a/libclc/clc/include/clc/geometric/clc_length.h +++ b/libclc/clc/include/clc/geometric/clc_length.h @@ -10,9 +10,9 @@ #define __CLC_GEOMETRIC_CLC_LENGTH_H__ #define __CLC_FUNCTION __clc_length -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/geometric/clc_normalize.h b/libclc/clc/include/clc/geometric/clc_normalize.h index 3058a72b2bbb..59edff3fd701 100644 --- a/libclc/clc/include/clc/geometric/clc_normalize.h +++ b/libclc/clc/include/clc/geometric/clc_normalize.h @@ -11,8 +11,8 @@ #define __CLC_GEOMETRIC_RET_GENTYPE #define __CLC_FUNCTION __clc_normalize -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/unary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_GEOMETRIC_RET_GENTYPE diff --git a/libclc/clc/include/clc/geometric/unary_def.inc b/libclc/clc/include/clc/geometric/unary_def.inc index 78c144b35af2..dab8a59ace51 100644 --- a/libclc/clc/include/clc/geometric/unary_def.inc +++ b/libclc/clc/include/clc/geometric/unary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/integer/clc_abs.h b/libclc/clc/include/clc/integer/clc_abs.h index 120fb0f6a759..f223cb4ae60e 100644 --- a/libclc/clc/include/clc/integer/clc_abs.h +++ b/libclc/clc/include/clc/integer/clc_abs.h @@ -9,7 +9,7 @@ #ifndef __CLC_INTEGER_CLC_ABS_H__ #define __CLC_INTEGER_CLC_ABS_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/integer/clc_abs_decl.inc" +#include "clc/integer/gentype.inc" #endif // __CLC_INTEGER_CLC_ABS_H__ diff --git a/libclc/clc/include/clc/integer/clc_abs_diff.h b/libclc/clc/include/clc/integer/clc_abs_diff.h index c789a4ca50ec..78e3c30015a4 100644 --- a/libclc/clc/include/clc/integer/clc_abs_diff.h +++ b/libclc/clc/include/clc/integer/clc_abs_diff.h @@ -9,7 +9,7 @@ #ifndef __CLC_INTEGER_CLC_ABS_DIFF_H__ #define __CLC_INTEGER_CLC_ABS_DIFF_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/integer/clc_abs_diff_decl.inc" +#include "clc/integer/gentype.inc" #endif // __CLC_INTEGER_CLC_ABS_DIFF_H__ diff --git a/libclc/clc/include/clc/integer/clc_add_sat.h b/libclc/clc/include/clc/integer/clc_add_sat.h index 8c3495f6c519..24ef9d4b6e5d 100644 --- a/libclc/clc/include/clc/integer/clc_add_sat.h +++ b/libclc/clc/include/clc/integer/clc_add_sat.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_ADD_SAT_H__ #define __CLC_FUNCTION __clc_add_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_bit_reverse.h b/libclc/clc/include/clc/integer/clc_bit_reverse.h index de0c354b3fa4..3be068bb0cb7 100644 --- a/libclc/clc/include/clc/integer/clc_bit_reverse.h +++ b/libclc/clc/include/clc/integer/clc_bit_reverse.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_BIT_REVERSE_H__ #define __CLC_FUNCTION __clc_bit_reverse -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h index 7998196512b3..7b2175b597db 100644 --- a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h +++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h @@ -9,13 +9,13 @@ #ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__ #define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_bitfield_extract_signed #define __CLC_RETTYPE __CLC_S_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "clc/integer/clc_bitfield_extract_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_RETTYPE #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h index 84614056417f..fe09b971cb14 100644 --- a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h +++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h @@ -6,18 +6,18 @@ // //===----------------------------------------------------------------------===// -#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__ -#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__ +#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__ +#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_bitfield_extract_unsigned #define __CLC_RETTYPE __CLC_U_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "clc/integer/clc_bitfield_extract_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_RETTYPE #undef __CLC_FUNCTION -#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__ +#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H__ diff --git a/libclc/clc/include/clc/integer/clc_bitfield_insert.h b/libclc/clc/include/clc/integer/clc_bitfield_insert.h index d5944497a4b5..9262e2467423 100644 --- a/libclc/clc/include/clc/integer/clc_bitfield_insert.h +++ b/libclc/clc/include/clc/integer/clc_bitfield_insert.h @@ -9,10 +9,10 @@ #ifndef __CLC_INTEGER_CLC_BITFIELD_INSERT_H__ #define __CLC_INTEGER_CLC_BITFIELD_INSERT_H__ -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_bitfield_insert -#define __CLC_BODY -#include +#define __CLC_BODY "clc/integer/clc_bitfield_insert_decl.inc" +#include "clc/integer/gentype.inc" #endif // __CLC_INTEGER_CLC_BITFIELD_INSERT_H__ diff --git a/libclc/clc/include/clc/integer/clc_clz.h b/libclc/clc/include/clc/integer/clc_clz.h index dd62cc935f8c..b30004b21de5 100644 --- a/libclc/clc/include/clc/integer/clc_clz.h +++ b/libclc/clc/include/clc/integer/clc_clz.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_CLZ_H__ #define __CLC_FUNCTION __clc_clz -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_ctz.h b/libclc/clc/include/clc/integer/clc_ctz.h index 3f2079e023f6..1f505e5676a7 100644 --- a/libclc/clc/include/clc/integer/clc_ctz.h +++ b/libclc/clc/include/clc/integer/clc_ctz.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_CTZ_H__ #define __CLC_FUNCTION __clc_ctz -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_hadd.h b/libclc/clc/include/clc/integer/clc_hadd.h index 679369d3c9d4..548414592425 100644 --- a/libclc/clc/include/clc/integer/clc_hadd.h +++ b/libclc/clc/include/clc/integer/clc_hadd.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_HADD_H__ #define __CLC_FUNCTION __clc_hadd -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_mad24.h b/libclc/clc/include/clc/integer/clc_mad24.h index e19bd905d22e..1376a13b544c 100644 --- a/libclc/clc/include/clc/integer/clc_mad24.h +++ b/libclc/clc/include/clc/integer/clc_mad24.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_MAD24_H__ #define __CLC_FUNCTION __clc_mad24 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_decl.inc" -#include +#include "clc/integer/gentype24.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_mad_hi.h b/libclc/clc/include/clc/integer/clc_mad_hi.h index 07e8c0bb6bee..bef85050fb76 100644 --- a/libclc/clc/include/clc/integer/clc_mad_hi.h +++ b/libclc/clc/include/clc/integer/clc_mad_hi.h @@ -9,7 +9,7 @@ #ifndef __CLC_INTEGER_CLC_MAD_HI_H__ #define __CLC_INTEGER_CLC_MAD_HI_H__ -#include +#include "clc/integer/clc_mul_hi.h" #define __clc_mad_hi(a, b, c) (__clc_mul_hi((a), (b)) + (c)) diff --git a/libclc/clc/include/clc/integer/clc_mad_sat.h b/libclc/clc/include/clc/integer/clc_mad_sat.h index 845378b3e7c4..3002f18b276e 100644 --- a/libclc/clc/include/clc/integer/clc_mad_sat.h +++ b/libclc/clc/include/clc/integer/clc_mad_sat.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_MAD_SAT_H__ #define __CLC_FUNCTION __clc_mad_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_mul24.h b/libclc/clc/include/clc/integer/clc_mul24.h index f813de55c71e..004b49038aba 100644 --- a/libclc/clc/include/clc/integer/clc_mul24.h +++ b/libclc/clc/include/clc/integer/clc_mul24.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_MUL24_H__ #define __CLC_FUNCTION __clc_mul24 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype24.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_mul_hi.h b/libclc/clc/include/clc/integer/clc_mul_hi.h index e4738e5570e8..a77109815166 100644 --- a/libclc/clc/include/clc/integer/clc_mul_hi.h +++ b/libclc/clc/include/clc/integer/clc_mul_hi.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_MUL_HI_H__ #define __CLC_FUNCTION __clc_mul_hi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_popcount.h b/libclc/clc/include/clc/integer/clc_popcount.h index 55ca6ccfcec2..3233487d223c 100644 --- a/libclc/clc/include/clc/integer/clc_popcount.h +++ b/libclc/clc/include/clc/integer/clc_popcount.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_POPCOUNT_H__ #define __CLC_FUNCTION __clc_popcount -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_INTRINSIC #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_rhadd.h b/libclc/clc/include/clc/integer/clc_rhadd.h index b8b0b1a3a56e..4534233f917d 100644 --- a/libclc/clc/include/clc/integer/clc_rhadd.h +++ b/libclc/clc/include/clc/integer/clc_rhadd.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_RHADD_H__ #define __CLC_FUNCTION __clc_rhadd -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_rotate.h b/libclc/clc/include/clc/integer/clc_rotate.h index 513bf9852623..c13f33c198c0 100644 --- a/libclc/clc/include/clc/integer/clc_rotate.h +++ b/libclc/clc/include/clc/integer/clc_rotate.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_ROTATE_H__ #define __CLC_FUNCTION __clc_rotate -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_sub_sat.h b/libclc/clc/include/clc/integer/clc_sub_sat.h index 94a5484adefc..62b167e756d4 100644 --- a/libclc/clc/include/clc/integer/clc_sub_sat.h +++ b/libclc/clc/include/clc/integer/clc_sub_sat.h @@ -10,9 +10,9 @@ #define __CLC_INTEGER_CLC_SUB_SAT_H__ #define __CLC_FUNCTION __clc_sub_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/integer/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/integer/clc_upsample.h b/libclc/clc/include/clc/integer/clc_upsample.h index ca3b8a910299..9380cc32616b 100644 --- a/libclc/clc/include/clc/integer/clc_upsample.h +++ b/libclc/clc/include/clc/integer/clc_upsample.h @@ -9,7 +9,7 @@ #ifndef __CLC_INTEGER_CLC_UPSAMPLE_H__ #define __CLC_INTEGER_CLC_UPSAMPLE_H__ -#include +#include "clc/clcfunc.h" #define __CLC_UPSAMPLE_DECL(BGENTYPE, GENTYPE, UGENTYPE) \ _CLC_OVERLOAD _CLC_DECL BGENTYPE __clc_upsample(GENTYPE hi, UGENTYPE lo); diff --git a/libclc/clc/include/clc/integer/gentype.inc b/libclc/clc/include/clc/integer/gentype.inc index 36d7ae95d174..74c1ce7cd311 100644 --- a/libclc/clc/include/clc/integer/gentype.inc +++ b/libclc/clc/include/clc/integer/gentype.inc @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clcfunc.h" +#include "clc/utils.h" #define __CLC_AS_GENTYPE __CLC_XCONCAT(__clc_as_, __CLC_GENTYPE) #define __CLC_CONVERT_GENTYPE __CLC_XCONCAT(__clc_convert_, __CLC_GENTYPE) diff --git a/libclc/clc/include/clc/integer/gentype24.inc b/libclc/clc/include/clc/integer/gentype24.inc index c74ce0c3bab4..c6dd9a1063d8 100644 --- a/libclc/clc/include/clc/integer/gentype24.inc +++ b/libclc/clc/include/clc/integer/gentype24.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/clcfunc.h" #define __CLC_GENSIZE 32 #undef __CLC_SCALAR_GENTYPE diff --git a/libclc/clc/include/clc/internal/clc.h b/libclc/clc/include/clc/internal/clc.h index fcfb223d5a12..99ce15309fdd 100644 --- a/libclc/clc/include/clc/internal/clc.h +++ b/libclc/clc/include/clc/internal/clc.h @@ -24,12 +24,12 @@ #endif /* Function Attributes */ -#include +#include "clc/clcfunc.h" /* 6.1 Supported Data Types */ /* 6.2.4.2 Reinterpreting Types Using __clc_as_type() and __clc_as_typen() */ -#include +#include "clc/clc_as_type.h" #pragma OPENCL EXTENSION all : disable diff --git a/libclc/clc/include/clc/internal/math/clc_sw_fma.h b/libclc/clc/include/clc/internal/math/clc_sw_fma.h index 4338fb01861c..55718f26b037 100644 --- a/libclc/clc/include/clc/internal/math/clc_sw_fma.h +++ b/libclc/clc/include/clc/internal/math/clc_sw_fma.h @@ -11,9 +11,9 @@ #define __CLC_FUNCTION __clc_sw_fma #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_acos.h b/libclc/clc/include/clc/math/clc_acos.h index 1d484fa5b56c..653f5ce1e6d5 100644 --- a/libclc/clc/include/clc/math/clc_acos.h +++ b/libclc/clc/include/clc/math/clc_acos.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ACOS_H__ #define __CLC_MATH_CLC_ACOS_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_acos -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_acosh.h b/libclc/clc/include/clc/math/clc_acosh.h index 9492724bb27b..ce866c33a628 100644 --- a/libclc/clc/include/clc/math/clc_acosh.h +++ b/libclc/clc/include/clc/math/clc_acosh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ACOSH_H__ #define __CLC_MATH_CLC_ACOSH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_acosh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_acospi.h b/libclc/clc/include/clc/math/clc_acospi.h index 90cfc06b7dff..8221b20e6cb1 100644 --- a/libclc/clc/include/clc/math/clc_acospi.h +++ b/libclc/clc/include/clc/math/clc_acospi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ACOSPI_H__ #define __CLC_MATH_CLC_ACOSPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_acospi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_asin.h b/libclc/clc/include/clc/math/clc_asin.h index f6246c49f802..ec87b576026b 100644 --- a/libclc/clc/include/clc/math/clc_asin.h +++ b/libclc/clc/include/clc/math/clc_asin.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ASIN_H__ #define __CLC_MATH_CLC_ASIN_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_asin -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_asinh.h b/libclc/clc/include/clc/math/clc_asinh.h index 05e44fa438ce..2b08649ad591 100644 --- a/libclc/clc/include/clc/math/clc_asinh.h +++ b/libclc/clc/include/clc/math/clc_asinh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ASINH_H__ #define __CLC_MATH_CLC_ASINH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_asinh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_asinpi.h b/libclc/clc/include/clc/math/clc_asinpi.h index 8f308dd06022..0798677edf07 100644 --- a/libclc/clc/include/clc/math/clc_asinpi.h +++ b/libclc/clc/include/clc/math/clc_asinpi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ASINPI_H__ #define __CLC_MATH_CLC_ASINPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_asinpi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_atan.h b/libclc/clc/include/clc/math/clc_atan.h index 203e46c2b8a4..d242cc5faab1 100644 --- a/libclc/clc/include/clc/math/clc_atan.h +++ b/libclc/clc/include/clc/math/clc_atan.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ATAN_H__ #define __CLC_MATH_CLC_ATAN_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_atan -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_atan2.h b/libclc/clc/include/clc/math/clc_atan2.h index 6edc9dda48f4..cffef6bd34af 100644 --- a/libclc/clc/include/clc/math/clc_atan2.h +++ b/libclc/clc/include/clc/math/clc_atan2.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ATAN2_H__ #define __CLC_MATH_CLC_ATAN2_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_atan2 -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_atan2pi.h b/libclc/clc/include/clc/math/clc_atan2pi.h index 2f26d1d9ae98..b26c7c66ab28 100644 --- a/libclc/clc/include/clc/math/clc_atan2pi.h +++ b/libclc/clc/include/clc/math/clc_atan2pi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ATAN2PI_H__ #define __CLC_MATH_CLC_ATAN2PI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_atan2pi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_atanh.h b/libclc/clc/include/clc/math/clc_atanh.h index 85f9fc53be1a..26eedfdfcddf 100644 --- a/libclc/clc/include/clc/math/clc_atanh.h +++ b/libclc/clc/include/clc/math/clc_atanh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ATANH_H__ #define __CLC_MATH_CLC_ATANH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_atanh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_atanpi.h b/libclc/clc/include/clc/math/clc_atanpi.h index 2b3c6b373ed4..3a3efa917736 100644 --- a/libclc/clc/include/clc/math/clc_atanpi.h +++ b/libclc/clc/include/clc/math/clc_atanpi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ATANPI_H__ #define __CLC_MATH_CLC_ATANPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_atanpi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_cbrt.h b/libclc/clc/include/clc/math/clc_cbrt.h index fd9b750c8fd8..2a1caa3720b6 100644 --- a/libclc/clc/include/clc/math/clc_cbrt.h +++ b/libclc/clc/include/clc/math/clc_cbrt.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_CBRT_H__ #define __CLC_MATH_CLC_CBRT_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_cbrt -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_ceil.h b/libclc/clc/include/clc/math/clc_ceil.h index 45668224c617..d48cb3bca94b 100644 --- a/libclc/clc/include/clc/math/clc_ceil.h +++ b/libclc/clc/include/clc/math/clc_ceil.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_CEIL_H__ #define __CLC_MATH_CLC_CEIL_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_ceil -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_copysign.h b/libclc/clc/include/clc/math/clc_copysign.h index 563dd2827839..7d1f29212afc 100644 --- a/libclc/clc/include/clc/math/clc_copysign.h +++ b/libclc/clc/include/clc/math/clc_copysign.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_COPYSIGN_H__ #define __CLC_MATH_CLC_COPYSIGN_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_copysign -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_cos.h b/libclc/clc/include/clc/math/clc_cos.h index 44681608efc3..a116566fd62e 100644 --- a/libclc/clc/include/clc/math/clc_cos.h +++ b/libclc/clc/include/clc/math/clc_cos.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_COS_H__ #define __CLC_MATH_CLC_COS_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_cos -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_cosh.h b/libclc/clc/include/clc/math/clc_cosh.h index 7bcfa2ea26e0..fee11e577dc3 100644 --- a/libclc/clc/include/clc/math/clc_cosh.h +++ b/libclc/clc/include/clc/math/clc_cosh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_COSH_H__ #define __CLC_MATH_CLC_COSH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_cosh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_cospi.h b/libclc/clc/include/clc/math/clc_cospi.h index 4d82100649b0..480cea5f5522 100644 --- a/libclc/clc/include/clc/math/clc_cospi.h +++ b/libclc/clc/include/clc/math/clc_cospi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_COSPI_H__ #define __CLC_MATH_CLC_COSPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_cospi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_div_cr.h b/libclc/clc/include/clc/math/clc_div_cr.h index c88dc7573506..bebd6db8119f 100644 --- a/libclc/clc/include/clc/math/clc_div_cr.h +++ b/libclc/clc/include/clc/math/clc_div_cr.h @@ -17,9 +17,9 @@ // correctly rounded and opencl precision versions. #define __CLC_FUNCTION __clc_div_cr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_div_fast.h b/libclc/clc/include/clc/math/clc_div_fast.h index 357bac4adc3d..b9368b10cb80 100644 --- a/libclc/clc/include/clc/math/clc_div_fast.h +++ b/libclc/clc/include/clc/math/clc_div_fast.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_DIV_FAST_H__ #define __CLC_FUNCTION __clc_div_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_ep.h b/libclc/clc/include/clc/math/clc_ep.h index a53e8ca539ea..7e93ce417ff9 100644 --- a/libclc/clc/include/clc/math/clc_ep.h +++ b/libclc/clc/include/clc/math/clc_ep.h @@ -15,7 +15,7 @@ #include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/clc_ep_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_MATH_CLC_EP_H__ diff --git a/libclc/clc/include/clc/math/clc_ep_log.h b/libclc/clc/include/clc/math/clc_ep_log.h index cdd5f2fffbd3..8ac9546a844e 100644 --- a/libclc/clc/include/clc/math/clc_ep_log.h +++ b/libclc/clc/include/clc/math/clc_ep_log.h @@ -9,7 +9,7 @@ #ifndef __CLC_MATH_CLC_EP_LOG_H__ #define __CLC_MATH_CLC_EP_LOG_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/clc_ep_log_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_MATH_CLC_EP_LOG_H__ diff --git a/libclc/clc/include/clc/math/clc_erf.h b/libclc/clc/include/clc/math/clc_erf.h index 01a21b36b352..ffb0a329e58c 100644 --- a/libclc/clc/include/clc/math/clc_erf.h +++ b/libclc/clc/include/clc/math/clc_erf.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ERF_H__ #define __CLC_MATH_CLC_ERF_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_erf -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_erfc.h b/libclc/clc/include/clc/math/clc_erfc.h index efd581542879..6ea5819807bb 100644 --- a/libclc/clc/include/clc/math/clc_erfc.h +++ b/libclc/clc/include/clc/math/clc_erfc.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ERFC_H__ #define __CLC_MATH_CLC_ERFC_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_erfc -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_exp.h b/libclc/clc/include/clc/math/clc_exp.h index 84369bb8fbdd..b60b1f38504f 100644 --- a/libclc/clc/include/clc/math/clc_exp.h +++ b/libclc/clc/include/clc/math/clc_exp.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_EXP_H__ #define __CLC_MATH_CLC_EXP_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_exp -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_exp10.h b/libclc/clc/include/clc/math/clc_exp10.h index 500271cb0742..946748e9826c 100644 --- a/libclc/clc/include/clc/math/clc_exp10.h +++ b/libclc/clc/include/clc/math/clc_exp10.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_EXP10_H__ #define __CLC_MATH_CLC_EXP10_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_exp10 -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_exp2.h b/libclc/clc/include/clc/math/clc_exp2.h index 4ad0ddea48a7..2ca9b09408d9 100644 --- a/libclc/clc/include/clc/math/clc_exp2.h +++ b/libclc/clc/include/clc/math/clc_exp2.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_EXP2_H__ #define __CLC_MATH_CLC_EXP2_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_exp2 -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_exp2_fast.h b/libclc/clc/include/clc/math/clc_exp2_fast.h index a42e6c9b7fd4..4bd5535d4fce 100644 --- a/libclc/clc/include/clc/math/clc_exp2_fast.h +++ b/libclc/clc/include/clc/math/clc_exp2_fast.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_EXP2_FAST_H__ #define __CLC_FUNCTION __clc_exp2_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_exp_helper.h b/libclc/clc/include/clc/math/clc_exp_helper.h index e1a2647c7b7c..18647deebe38 100644 --- a/libclc/clc/include/clc/math/clc_exp_helper.h +++ b/libclc/clc/include/clc/math/clc_exp_helper.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_EXP_HELPER #define __CLC_DOUBLE_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc/math/clc_exp_helper_decl.inc" -#include +#include "clc/math/gentype.inc" #endif // __CLC_MATH_CLC_EXP_HELPER diff --git a/libclc/clc/include/clc/math/clc_expm1.h b/libclc/clc/include/clc/math/clc_expm1.h index 5c60960ca5b0..f117213ac0e5 100644 --- a/libclc/clc/include/clc/math/clc_expm1.h +++ b/libclc/clc/include/clc/math/clc_expm1.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_EXPM1_H__ #define __CLC_MATH_CLC_EXPM1_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_expm1 -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fabs.h b/libclc/clc/include/clc/math/clc_fabs.h index 1ef38a8c7595..c9439d6eeb9e 100644 --- a/libclc/clc/include/clc/math/clc_fabs.h +++ b/libclc/clc/include/clc/math/clc_fabs.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_FABS_H__ #define __CLC_MATH_CLC_FABS_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_fabs -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fdim.h b/libclc/clc/include/clc/math/clc_fdim.h index 50ad045db62c..7bb0cc9f68f6 100644 --- a/libclc/clc/include/clc/math/clc_fdim.h +++ b/libclc/clc/include/clc/math/clc_fdim.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_FDIM_H__ #define __CLC_MATH_CLC_FDIM_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_fdim -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_floor.h b/libclc/clc/include/clc/math/clc_floor.h index d243819e0a42..9f926df5f281 100644 --- a/libclc/clc/include/clc/math/clc_floor.h +++ b/libclc/clc/include/clc/math/clc_floor.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_FLOOR_H__ #define __CLC_MATH_CLC_FLOOR_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_floor -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fma.h b/libclc/clc/include/clc/math/clc_fma.h index 5e87f4c47085..e8aad41e021b 100644 --- a/libclc/clc/include/clc/math/clc_fma.h +++ b/libclc/clc/include/clc/math/clc_fma.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_FMA_H__ #define __CLC_FUNCTION __clc_fma -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fmax.h b/libclc/clc/include/clc/math/clc_fmax.h index f367a9b6ea1c..6e1da7734d33 100644 --- a/libclc/clc/include/clc/math/clc_fmax.h +++ b/libclc/clc/include/clc/math/clc_fmax.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_FMAX_H__ #define __CLC_FUNCTION __clc_fmax -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fmin.h b/libclc/clc/include/clc/math/clc_fmin.h index 47ed3fad2d8c..818601124e5d 100644 --- a/libclc/clc/include/clc/math/clc_fmin.h +++ b/libclc/clc/include/clc/math/clc_fmin.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_FMIN_H__ #define __CLC_FUNCTION __clc_fmin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fmod.h b/libclc/clc/include/clc/math/clc_fmod.h index 44179babd7fe..46b6f0d84685 100644 --- a/libclc/clc/include/clc/math/clc_fmod.h +++ b/libclc/clc/include/clc/math/clc_fmod.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_FMOD_H__ #define __CLC_FUNCTION __clc_fmod -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_fract.h b/libclc/clc/include/clc/math/clc_fract.h index af762ecc59ea..0a073d5f0290 100644 --- a/libclc/clc/include/clc/math/clc_fract.h +++ b/libclc/clc/include/clc/math/clc_fract.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_FRACT_H__ #define __CLC_FUNCTION __clc_fract -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_frexp.h b/libclc/clc/include/clc/math/clc_frexp.h index d6ed2754d0d4..6d256f44973c 100644 --- a/libclc/clc/include/clc/math/clc_frexp.h +++ b/libclc/clc/include/clc/math/clc_frexp.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_FREXP_H__ #define __CLC_FUNCTION __clc_frexp -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_decl_with_int_ptr.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_cos.h b/libclc/clc/include/clc/math/clc_half_cos.h index d0122987899c..1c61c1700411 100644 --- a/libclc/clc/include/clc/math/clc_half_cos.h +++ b/libclc/clc/include/clc/math/clc_half_cos.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_divide.h b/libclc/clc/include/clc/math/clc_half_divide.h index e5d5cdc9df34..96c0735591e5 100644 --- a/libclc/clc/include/clc/math/clc_half_divide.h +++ b/libclc/clc/include/clc/math/clc_half_divide.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_divide -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_exp.h b/libclc/clc/include/clc/math/clc_half_exp.h index 2284eaf8df36..f2e68e8bc3be 100644 --- a/libclc/clc/include/clc/math/clc_half_exp.h +++ b/libclc/clc/include/clc/math/clc_half_exp.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_exp10.h b/libclc/clc/include/clc/math/clc_half_exp10.h index 662df93e0685..9eb5a0884025 100644 --- a/libclc/clc/include/clc/math/clc_half_exp10.h +++ b/libclc/clc/include/clc/math/clc_half_exp10.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_exp2.h b/libclc/clc/include/clc/math/clc_half_exp2.h index d2af0f2e3fa9..6f2a60db220e 100644 --- a/libclc/clc/include/clc/math/clc_half_exp2.h +++ b/libclc/clc/include/clc/math/clc_half_exp2.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_log.h b/libclc/clc/include/clc/math/clc_half_log.h index 8ae30e5abe5f..38cacae95e1a 100644 --- a/libclc/clc/include/clc/math/clc_half_log.h +++ b/libclc/clc/include/clc/math/clc_half_log.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_log10.h b/libclc/clc/include/clc/math/clc_half_log10.h index fe5248350aba..2aebff382deb 100644 --- a/libclc/clc/include/clc/math/clc_half_log10.h +++ b/libclc/clc/include/clc/math/clc_half_log10.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_log2.h b/libclc/clc/include/clc/math/clc_half_log2.h index c57aa1bffb33..4d796f282576 100644 --- a/libclc/clc/include/clc/math/clc_half_log2.h +++ b/libclc/clc/include/clc/math/clc_half_log2.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_powr.h b/libclc/clc/include/clc/math/clc_half_powr.h index 188b32b8b49c..6b902a95f229 100644 --- a/libclc/clc/include/clc/math/clc_half_powr.h +++ b/libclc/clc/include/clc/math/clc_half_powr.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_recip.h b/libclc/clc/include/clc/math/clc_half_recip.h index f5f71fa1988c..e86e9c412e22 100644 --- a/libclc/clc/include/clc/math/clc_half_recip.h +++ b/libclc/clc/include/clc/math/clc_half_recip.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_recip -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_rsqrt.h b/libclc/clc/include/clc/math/clc_half_rsqrt.h index d5a05ac8b84a..d46b161489d8 100644 --- a/libclc/clc/include/clc/math/clc_half_rsqrt.h +++ b/libclc/clc/include/clc/math/clc_half_rsqrt.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_sin.h b/libclc/clc/include/clc/math/clc_half_sin.h index d2d3da9b11db..d4b7b7e628de 100644 --- a/libclc/clc/include/clc/math/clc_half_sin.h +++ b/libclc/clc/include/clc/math/clc_half_sin.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_sqrt.h b/libclc/clc/include/clc/math/clc_half_sqrt.h index a54b8122cb15..89ed5a8bf492 100644 --- a/libclc/clc/include/clc/math/clc_half_sqrt.h +++ b/libclc/clc/include/clc/math/clc_half_sqrt.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_half_tan.h b/libclc/clc/include/clc/math/clc_half_tan.h index 503ebe29c3ce..08d77ded73e7 100644 --- a/libclc/clc/include/clc/math/clc_half_tan.h +++ b/libclc/clc/include/clc/math/clc_half_tan.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_tan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_hypot.h b/libclc/clc/include/clc/math/clc_hypot.h index 40b354154fa5..82acffa2f013 100644 --- a/libclc/clc/include/clc/math/clc_hypot.h +++ b/libclc/clc/include/clc/math/clc_hypot.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_HYPOT_H__ #define __CLC_MATH_CLC_HYPOT_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_hypot -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_ilogb.h b/libclc/clc/include/clc/math/clc_ilogb.h index 6aeaf6be3ac6..d77fa4e37cd2 100644 --- a/libclc/clc/include/clc/math/clc_ilogb.h +++ b/libclc/clc/include/clc/math/clc_ilogb.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_ILOGB_H__ #define __CLC_FUNCTION __clc_ilogb -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_decl_with_int_return.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_ldexp.h b/libclc/clc/include/clc/math/clc_ldexp.h index e90732680e2a..31a794243984 100644 --- a/libclc/clc/include/clc/math/clc_ldexp.h +++ b/libclc/clc/include/clc/math/clc_ldexp.h @@ -9,7 +9,7 @@ #ifndef __CLC_MATH_CLC_LDEXP_H__ #define __CLC_MATH_CLC_LDEXP_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/clc_ldexp.inc" +#include "clc/math/gentype.inc" #endif // __CLC_MATH_CLC_LDEXP_H__ diff --git a/libclc/clc/include/clc/math/clc_lgamma.h b/libclc/clc/include/clc/math/clc_lgamma.h index f54c5e2b61b6..d70b778da4df 100644 --- a/libclc/clc/include/clc/math/clc_lgamma.h +++ b/libclc/clc/include/clc/math/clc_lgamma.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_LGAMMA_H__ #define __CLC_MATH_CLC_LGAMMA_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_lgamma -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_lgamma_r.h b/libclc/clc/include/clc/math/clc_lgamma_r.h index 262e62372227..93e8c8dcfcbe 100644 --- a/libclc/clc/include/clc/math/clc_lgamma_r.h +++ b/libclc/clc/include/clc/math/clc_lgamma_r.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_LGAMMA_R_H__ #define __CLC_FUNCTION __clc_lgamma_r -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl_with_int_ptr.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_log.h b/libclc/clc/include/clc/math/clc_log.h index 8b0e44b425a8..f867f5bb0a63 100644 --- a/libclc/clc/include/clc/math/clc_log.h +++ b/libclc/clc/include/clc/math/clc_log.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_LOG_H__ #define __CLC_FUNCTION __clc_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_log10.h b/libclc/clc/include/clc/math/clc_log10.h index 6e086690c6ad..67dae5222c8f 100644 --- a/libclc/clc/include/clc/math/clc_log10.h +++ b/libclc/clc/include/clc/math/clc_log10.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_LOG10_H__ #define __CLC_FUNCTION __clc_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_log1p.h b/libclc/clc/include/clc/math/clc_log1p.h index 1be8c8548d48..5453fb49fd5e 100644 --- a/libclc/clc/include/clc/math/clc_log1p.h +++ b/libclc/clc/include/clc/math/clc_log1p.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_LOG1P_H__ #define __CLC_MATH_CLC_LOG1P_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_log1p -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_log2.h b/libclc/clc/include/clc/math/clc_log2.h index c5f9e37f3984..6df487ca1b2f 100644 --- a/libclc/clc/include/clc/math/clc_log2.h +++ b/libclc/clc/include/clc/math/clc_log2.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_LOG2_H__ #define __CLC_FUNCTION __clc_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_log2_fast.h b/libclc/clc/include/clc/math/clc_log2_fast.h index 5160afbedebf..5f885b14f837 100644 --- a/libclc/clc/include/clc/math/clc_log2_fast.h +++ b/libclc/clc/include/clc/math/clc_log2_fast.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_LOG2_FAST_H__ #define __CLC_FUNCTION __clc_log2_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_logb.h b/libclc/clc/include/clc/math/clc_logb.h index 75a2ce7e578b..30ed02e5d0ba 100644 --- a/libclc/clc/include/clc/math/clc_logb.h +++ b/libclc/clc/include/clc/math/clc_logb.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_LOGB_H__ #define __CLC_FUNCTION __clc_logb -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_mad.h b/libclc/clc/include/clc/math/clc_mad.h index 117e361380ed..68858c456a90 100644 --- a/libclc/clc/include/clc/math/clc_mad.h +++ b/libclc/clc/include/clc/math/clc_mad.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_MAD_H__ #define __CLC_MATH_CLC_MAD_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_decl.inc" #define __CLC_FUNCTION __clc_mad -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_maxmag.h b/libclc/clc/include/clc/math/clc_maxmag.h index 857ad7867b05..71e1523704ff 100644 --- a/libclc/clc/include/clc/math/clc_maxmag.h +++ b/libclc/clc/include/clc/math/clc_maxmag.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_MAXMAG_H__ #define __CLC_MATH_CLC_MAXMAG_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_maxmag -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_minmag.h b/libclc/clc/include/clc/math/clc_minmag.h index 9615d029bfed..959a2551bea0 100644 --- a/libclc/clc/include/clc/math/clc_minmag.h +++ b/libclc/clc/include/clc/math/clc_minmag.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_MINMAG_H__ #define __CLC_MATH_CLC_MINMAG_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_minmag -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_modf.h b/libclc/clc/include/clc/math/clc_modf.h index aa8f9e20892a..d336d6e3f265 100644 --- a/libclc/clc/include/clc/math/clc_modf.h +++ b/libclc/clc/include/clc/math/clc_modf.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_MODF_H__ #define __CLC_FUNCTION __clc_modf -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_nan.h b/libclc/clc/include/clc/math/clc_nan.h index 2b0fe197c167..0216cb78439e 100644 --- a/libclc/clc/include/clc/math/clc_nan.h +++ b/libclc/clc/include/clc/math/clc_nan.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_NAN_H__ #define __CLC_FUNCTION __clc_nan -#define __CLC_BODY +#define __CLC_BODY "clc/math/clc_nan_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_cos.h b/libclc/clc/include/clc/math/clc_native_cos.h index eefd133911e4..de240d8442a3 100644 --- a/libclc/clc/include/clc/math/clc_native_cos.h +++ b/libclc/clc/include/clc/math/clc_native_cos.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_divide.h b/libclc/clc/include/clc/math/clc_native_divide.h index 97d97c2670a6..b4fffe8c9d25 100644 --- a/libclc/clc/include/clc/math/clc_native_divide.h +++ b/libclc/clc/include/clc/math/clc_native_divide.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_divide -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_exp.h b/libclc/clc/include/clc/math/clc_native_exp.h index 30c0d1edf18f..1ef08f93d59a 100644 --- a/libclc/clc/include/clc/math/clc_native_exp.h +++ b/libclc/clc/include/clc/math/clc_native_exp.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_exp10.h b/libclc/clc/include/clc/math/clc_native_exp10.h index a88b5a389737..b9130cc4fa42 100644 --- a/libclc/clc/include/clc/math/clc_native_exp10.h +++ b/libclc/clc/include/clc/math/clc_native_exp10.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_exp2.h b/libclc/clc/include/clc/math/clc_native_exp2.h index 09f4bfe6979d..f5c6a990c9c3 100644 --- a/libclc/clc/include/clc/math/clc_native_exp2.h +++ b/libclc/clc/include/clc/math/clc_native_exp2.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_log.h b/libclc/clc/include/clc/math/clc_native_log.h index c32fc812d477..a4e9fb38ec2e 100644 --- a/libclc/clc/include/clc/math/clc_native_log.h +++ b/libclc/clc/include/clc/math/clc_native_log.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_log10.h b/libclc/clc/include/clc/math/clc_native_log10.h index 329b8a743755..ec65954b7153 100644 --- a/libclc/clc/include/clc/math/clc_native_log10.h +++ b/libclc/clc/include/clc/math/clc_native_log10.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_log2.h b/libclc/clc/include/clc/math/clc_native_log2.h index b8ad663b470d..6accba946894 100644 --- a/libclc/clc/include/clc/math/clc_native_log2.h +++ b/libclc/clc/include/clc/math/clc_native_log2.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_powr.h b/libclc/clc/include/clc/math/clc_native_powr.h index 3a0c8cc8b9d5..acfa7565cb4f 100644 --- a/libclc/clc/include/clc/math/clc_native_powr.h +++ b/libclc/clc/include/clc/math/clc_native_powr.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_recip.h b/libclc/clc/include/clc/math/clc_native_recip.h index a6540e846f2b..6661913ebac6 100644 --- a/libclc/clc/include/clc/math/clc_native_recip.h +++ b/libclc/clc/include/clc/math/clc_native_recip.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_recip -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_rsqrt.h b/libclc/clc/include/clc/math/clc_native_rsqrt.h index 0c8f3da03929..60eb45a9fec8 100644 --- a/libclc/clc/include/clc/math/clc_native_rsqrt.h +++ b/libclc/clc/include/clc/math/clc_native_rsqrt.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_sin.h b/libclc/clc/include/clc/math/clc_native_sin.h index 22ab7868e20f..23b3a8e6d6a7 100644 --- a/libclc/clc/include/clc/math/clc_native_sin.h +++ b/libclc/clc/include/clc/math/clc_native_sin.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_sqrt.h b/libclc/clc/include/clc/math/clc_native_sqrt.h index fd071f1d463a..de0770a53a84 100644 --- a/libclc/clc/include/clc/math/clc_native_sqrt.h +++ b/libclc/clc/include/clc/math/clc_native_sqrt.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_native_tan.h b/libclc/clc/include/clc/math/clc_native_tan.h index 4b381312d8d5..ec7291366217 100644 --- a/libclc/clc/include/clc/math/clc_native_tan.h +++ b/libclc/clc/include/clc/math/clc_native_tan.h @@ -11,9 +11,9 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_tan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_nextafter.h b/libclc/clc/include/clc/math/clc_nextafter.h index f24742b9e9c3..500cbaf847d6 100644 --- a/libclc/clc/include/clc/math/clc_nextafter.h +++ b/libclc/clc/include/clc/math/clc_nextafter.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_NEXTAFTER_H__ #define __CLC_MATH_CLC_NEXTAFTER_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_nextafter -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_nextdown.h b/libclc/clc/include/clc/math/clc_nextdown.h index f401abf1ca3a..fbc8fd50db6f 100644 --- a/libclc/clc/include/clc/math/clc_nextdown.h +++ b/libclc/clc/include/clc/math/clc_nextdown.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_NEXTDOWN_H__ #define __CLC_FUNCTION __clc_nextdown -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_nextup.h b/libclc/clc/include/clc/math/clc_nextup.h index bfa44e8fc491..ee84ff01f032 100644 --- a/libclc/clc/include/clc/math/clc_nextup.h +++ b/libclc/clc/include/clc/math/clc_nextup.h @@ -10,8 +10,8 @@ #define __CLC_MATH_CLC_NEXTUP_H__ #define __CLC_FUNCTION __clc_nextup -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_pow.h b/libclc/clc/include/clc/math/clc_pow.h index f7399873a499..f1c85c45b77d 100644 --- a/libclc/clc/include/clc/math/clc_pow.h +++ b/libclc/clc/include/clc/math/clc_pow.h @@ -9,15 +9,15 @@ #ifndef __CLC_MATH_CLC_POW_H__ #define __CLC_MATH_CLC_POW_H__ -#define __CLC_BODY #define __CLC_FUNCTION __clc_pow -#include +#define __CLC_BODY "clc/shared/binary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" #define __CLC_FUNCTION __clc_pow_fast -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_FLOAT_ONLY diff --git a/libclc/clc/include/clc/math/clc_pown.h b/libclc/clc/include/clc/math/clc_pown.h index 3e2b359468b4..1f1995b7b537 100644 --- a/libclc/clc/include/clc/math/clc_pown.h +++ b/libclc/clc/include/clc/math/clc_pown.h @@ -10,14 +10,14 @@ #define __CLC_MATH_CLC_POWN_H__ #define __CLC_FUNCTION __clc_pown -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_pown_fast -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_FLOAT_ONLY diff --git a/libclc/clc/include/clc/math/clc_powr.h b/libclc/clc/include/clc/math/clc_powr.h index 67c591ca6aa8..3215297f24ae 100644 --- a/libclc/clc/include/clc/math/clc_powr.h +++ b/libclc/clc/include/clc/math/clc_powr.h @@ -10,14 +10,14 @@ #define __CLC_MATH_CLC_POWR_H__ #define __CLC_FUNCTION __clc_powr -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_powr_fast -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_FLOAT_ONLY diff --git a/libclc/clc/include/clc/math/clc_recip_fast.h b/libclc/clc/include/clc/math/clc_recip_fast.h index 82890d606249..b6d18da0b034 100644 --- a/libclc/clc/include/clc/math/clc_recip_fast.h +++ b/libclc/clc/include/clc/math/clc_recip_fast.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_RECIP_FAST_H__ #define __CLC_FUNCTION __clc_recip_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_remainder.h b/libclc/clc/include/clc/math/clc_remainder.h index a7700c95103b..3677414d2b11 100644 --- a/libclc/clc/include/clc/math/clc_remainder.h +++ b/libclc/clc/include/clc/math/clc_remainder.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_REMAINDER_H__ #define __CLC_FUNCTION __clc_remainder -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_remquo.h b/libclc/clc/include/clc/math/clc_remquo.h index 48a8844a6e38..7896d4e2a76d 100644 --- a/libclc/clc/include/clc/math/clc_remquo.h +++ b/libclc/clc/include/clc/math/clc_remquo.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_REMQUO_H__ #define __CLC_FUNCTION __clc_remquo -#define __CLC_BODY +#define __CLC_BODY "clc/math/remquo_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_rint.h b/libclc/clc/include/clc/math/clc_rint.h index 17b1549f439b..fe008ec7c9a2 100644 --- a/libclc/clc/include/clc/math/clc_rint.h +++ b/libclc/clc/include/clc/math/clc_rint.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_RINT_H__ #define __CLC_MATH_CLC_RINT_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_rint -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_rootn.h b/libclc/clc/include/clc/math/clc_rootn.h index 26d111a8671d..c27f77880a93 100644 --- a/libclc/clc/include/clc/math/clc_rootn.h +++ b/libclc/clc/include/clc/math/clc_rootn.h @@ -10,14 +10,14 @@ #define __CLC_MATH_CLC_ROOTN_H__ #define __CLC_FUNCTION __clc_rootn -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_rootn_fast -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_decl_with_int_second_arg.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_FLOAT_ONLY diff --git a/libclc/clc/include/clc/math/clc_round.h b/libclc/clc/include/clc/math/clc_round.h index 78ebf4db99e9..c56cbcbdd3d6 100644 --- a/libclc/clc/include/clc/math/clc_round.h +++ b/libclc/clc/include/clc/math/clc_round.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_ROUND_H__ #define __CLC_MATH_CLC_ROUND_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_round -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_rsqrt.h b/libclc/clc/include/clc/math/clc_rsqrt.h index 59402fbead2b..73a9c7b82f30 100644 --- a/libclc/clc/include/clc/math/clc_rsqrt.h +++ b/libclc/clc/include/clc/math/clc_rsqrt.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_RSQRT_H__ #define __CLC_MATH_CLC_RSQRT_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_rsqrt -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sin.h b/libclc/clc/include/clc/math/clc_sin.h index de4c722ca123..b74962be0c93 100644 --- a/libclc/clc/include/clc/math/clc_sin.h +++ b/libclc/clc/include/clc/math/clc_sin.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_SIN_H__ #define __CLC_MATH_CLC_SIN_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_sin -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sincos.h b/libclc/clc/include/clc/math/clc_sincos.h index e26dc7c024c9..a3f6acfb8178 100644 --- a/libclc/clc/include/clc/math/clc_sincos.h +++ b/libclc/clc/include/clc/math/clc_sincos.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_SINCOS_H__ #define __CLC_MATH_CLC_SINCOS_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl_with_ptr.inc" #define __CLC_FUNCTION __clc_sincos -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sincos_helpers.h b/libclc/clc/include/clc/math/clc_sincos_helpers.h index 67bc54d433ef..4dd6ac74354a 100644 --- a/libclc/clc/include/clc/math/clc_sincos_helpers.h +++ b/libclc/clc/include/clc/math/clc_sincos_helpers.h @@ -10,13 +10,13 @@ #define __CLC_MATH_CLC_SINCOS_HELPERS_H__ #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc/math/clc_sincos_helpers_decl.inc" -#include +#include "clc/math/gentype.inc" #define __CLC_DOUBLE_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc/math/clc_sincos_helpers_fp64_decl.inc" -#include +#include "clc/math/gentype.inc" #endif // __CLC_MATH_CLC_SINCOS_HELPERS_H__ diff --git a/libclc/clc/include/clc/math/clc_sinh.h b/libclc/clc/include/clc/math/clc_sinh.h index fa9cabe79cb0..4be80207ff76 100644 --- a/libclc/clc/include/clc/math/clc_sinh.h +++ b/libclc/clc/include/clc/math/clc_sinh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_SINH_H__ #define __CLC_MATH_CLC_SINH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_sinh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sinpi.h b/libclc/clc/include/clc/math/clc_sinpi.h index db563c2e7e14..c6597928dd2e 100644 --- a/libclc/clc/include/clc/math/clc_sinpi.h +++ b/libclc/clc/include/clc/math/clc_sinpi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_SINPI_H__ #define __CLC_MATH_CLC_SINPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_sinpi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sqrt.h b/libclc/clc/include/clc/math/clc_sqrt.h index 708451553329..c661e12500ea 100644 --- a/libclc/clc/include/clc/math/clc_sqrt.h +++ b/libclc/clc/include/clc/math/clc_sqrt.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_SQRT_H__ #define __CLC_MATH_CLC_SQRT_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_sqrt -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sqrt_cr.h b/libclc/clc/include/clc/math/clc_sqrt_cr.h index e50911c7f5d9..bf16424cfbf8 100644 --- a/libclc/clc/include/clc/math/clc_sqrt_cr.h +++ b/libclc/clc/include/clc/math/clc_sqrt_cr.h @@ -17,9 +17,9 @@ // correctly rounded and opencl precision versions. #define __CLC_FUNCTION __clc_sqrt_cr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_sqrt_fast.h b/libclc/clc/include/clc/math/clc_sqrt_fast.h index 3d0f50197932..9ae2470efd26 100644 --- a/libclc/clc/include/clc/math/clc_sqrt_fast.h +++ b/libclc/clc/include/clc/math/clc_sqrt_fast.h @@ -10,9 +10,9 @@ #define __CLC_MATH_CLC_SQRT_FAST_H__ #define __CLC_FUNCTION __clc_sqrt_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_subnormal_config.h b/libclc/clc/include/clc/math/clc_subnormal_config.h index 14693ed01e03..b157720533d7 100644 --- a/libclc/clc/include/clc/math/clc_subnormal_config.h +++ b/libclc/clc/include/clc/math/clc_subnormal_config.h @@ -8,7 +8,7 @@ #ifndef __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__ #define __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__ -#include +#include "clc/clcfunc.h" _CLC_DECL bool __clc_subnormals_disabled(); _CLC_DECL bool __clc_fp16_subnormals_supported(); diff --git a/libclc/clc/include/clc/math/clc_tan.h b/libclc/clc/include/clc/math/clc_tan.h index 028ff28ecd69..9d0943301b91 100644 --- a/libclc/clc/include/clc/math/clc_tan.h +++ b/libclc/clc/include/clc/math/clc_tan.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_TAN_H__ #define __CLC_MATH_CLC_TAN_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_tan -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_tanh.h b/libclc/clc/include/clc/math/clc_tanh.h index 88fce2340d99..3be3b0a44dc2 100644 --- a/libclc/clc/include/clc/math/clc_tanh.h +++ b/libclc/clc/include/clc/math/clc_tanh.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_TANH_H__ #define __CLC_MATH_CLC_TANH_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_tanh -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_tanpi.h b/libclc/clc/include/clc/math/clc_tanpi.h index 596bb72b4b8d..922d17046a61 100644 --- a/libclc/clc/include/clc/math/clc_tanpi.h +++ b/libclc/clc/include/clc/math/clc_tanpi.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_TANPI_H__ #define __CLC_MATH_CLC_TANPI_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_tanpi -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_tgamma.h b/libclc/clc/include/clc/math/clc_tgamma.h index dd76e041875d..aeddbca0a54c 100644 --- a/libclc/clc/include/clc/math/clc_tgamma.h +++ b/libclc/clc/include/clc/math/clc_tgamma.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_TGAMMA_H__ #define __CLC_MATH_CLC_TGAMMA_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_tgamma -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/clc_trunc.h b/libclc/clc/include/clc/math/clc_trunc.h index 33445f9fe15d..90be54dec3cb 100644 --- a/libclc/clc/include/clc/math/clc_trunc.h +++ b/libclc/clc/include/clc/math/clc_trunc.h @@ -9,10 +9,10 @@ #ifndef __CLC_MATH_CLC_TRUNC_H__ #define __CLC_MATH_CLC_TRUNC_H__ -#define __CLC_BODY +#define __CLC_BODY "clc/math/unary_decl.inc" #define __CLC_FUNCTION __clc_trunc -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/math/gentype.inc b/libclc/clc/include/clc/math/gentype.inc index bee877c56212..302dbd2279d3 100644 --- a/libclc/clc/include/clc/math/gentype.inc +++ b/libclc/clc/include/clc/math/gentype.inc @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clcfunc.h" +#include "clc/utils.h" // Define some useful macros for type conversions. #define __CLC_AS_GENTYPE __CLC_XCONCAT(__clc_as_, __CLC_GENTYPE) diff --git a/libclc/clc/include/clc/math/math.h b/libclc/clc/include/clc/math/math.h index 59418eaac26f..f11296bdd00c 100644 --- a/libclc/clc/include/clc/math/math.h +++ b/libclc/clc/include/clc/math/math.h @@ -9,9 +9,9 @@ #ifndef __CLC_MATH_MATH_H__ #define __CLC_MATH_MATH_H__ -#include -#include -#include +#include "clc/clc_as_type.h" +#include "clc/clcfunc.h" +#include "clc/math/clc_subnormal_config.h" #define SNAN 0x001 #define QNAN 0x002 diff --git a/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc b/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc index db6472ad0e64..f62d24ed86b0 100644 --- a/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc +++ b/libclc/clc/include/clc/math/unary_def_with_int_ptr.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/math/unary_def_with_int_return.inc b/libclc/clc/include/clc/math/unary_def_with_int_return.inc index 7a47aae8ce63..ff7a9aa2bf1e 100644 --- a/libclc/clc/include/clc/math/unary_def_with_int_return.inc +++ b/libclc/clc/include/clc/math/unary_def_with_int_return.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/math/unary_def_with_ptr.inc b/libclc/clc/include/clc/math/unary_def_with_ptr.inc index 8a490e1bba16..8d6f7251eaa8 100644 --- a/libclc/clc/include/clc/math/unary_def_with_ptr.inc +++ b/libclc/clc/include/clc/math/unary_def_with_ptr.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h index 0776caddde0d..6a8bf2eaa674 100644 --- a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h +++ b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h @@ -9,8 +9,8 @@ #ifndef __CLC_MEM_FENCE_CLC_MEM_FENCE_H__ #define __CLC_MEM_FENCE_CLC_MEM_FENCE_H__ -#include -#include +#include "clc/internal/clc.h" +#include "clc/mem_fence/clc_mem_semantic.h" _CLC_OVERLOAD _CLC_DECL void __clc_mem_fence(int memory_scope, int memory_order, diff --git a/libclc/clc/include/clc/misc/clc_shuffle.h b/libclc/clc/include/clc/misc/clc_shuffle.h index ba3d7a2bddd6..4665a3f4d99c 100644 --- a/libclc/clc/include/clc/misc/clc_shuffle.h +++ b/libclc/clc/include/clc/misc/clc_shuffle.h @@ -12,12 +12,12 @@ #define __CLC_FUNCTION __clc_shuffle // Integer-type decls -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle_decl.inc" +#include "clc/integer/gentype.inc" // Floating-point decls -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/misc/clc_shuffle2.h b/libclc/clc/include/clc/misc/clc_shuffle2.h index 84bafba12b21..3d67724d6ca8 100644 --- a/libclc/clc/include/clc/misc/clc_shuffle2.h +++ b/libclc/clc/include/clc/misc/clc_shuffle2.h @@ -12,12 +12,12 @@ #define __CLC_FUNCTION __clc_shuffle2 // Integer-type decls -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle2_decl.inc" +#include "clc/integer/gentype.inc" // Floating-point decls -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle2_decl.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/misc/shuffle2_def.inc b/libclc/clc/include/clc/misc/shuffle2_def.inc index c319f57f880f..afc3b88d847c 100644 --- a/libclc/clc/include/clc/misc/shuffle2_def.inc +++ b/libclc/clc/include/clc/misc/shuffle2_def.inc @@ -9,7 +9,7 @@ #if (__CLC_VECSIZE_OR_1 == 2 || __CLC_VECSIZE_OR_1 == 4 || \ __CLC_VECSIZE_OR_1 == 8 || __CLC_VECSIZE_OR_1 == 16) -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/misc/shuffle_def.inc b/libclc/clc/include/clc/misc/shuffle_def.inc index 0f0340979c55..b4e0006f12c0 100644 --- a/libclc/clc/include/clc/misc/shuffle_def.inc +++ b/libclc/clc/include/clc/misc/shuffle_def.inc @@ -9,7 +9,7 @@ #if (__CLC_VECSIZE_OR_1 == 2 || __CLC_VECSIZE_OR_1 == 4 || \ __CLC_VECSIZE_OR_1 == 8 || __CLC_VECSIZE_OR_1 == 16) -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/relational/clc_all.h b/libclc/clc/include/clc/relational/clc_all.h index a99e2ae172d5..e24fdcc5e929 100644 --- a/libclc/clc/include/clc/relational/clc_all.h +++ b/libclc/clc/include/clc/relational/clc_all.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ALL_H__ #define __CLC_RELATIONAL_CLC_ALL_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ALL_DECL(TYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL int __clc_all(TYPE v); diff --git a/libclc/clc/include/clc/relational/clc_any.h b/libclc/clc/include/clc/relational/clc_any.h index 5e52be4563f3..90e24c943efe 100644 --- a/libclc/clc/include/clc/relational/clc_any.h +++ b/libclc/clc/include/clc/relational/clc_any.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ANY_H__ #define __CLC_RELATIONAL_CLC_ANY_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ANY_DECL(TYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL int __clc_any(TYPE v); diff --git a/libclc/clc/include/clc/relational/clc_bitselect.h b/libclc/clc/include/clc/relational/clc_bitselect.h index 815a4f4d9b6e..190eb8f0ce43 100644 --- a/libclc/clc/include/clc/relational/clc_bitselect.h +++ b/libclc/clc/include/clc/relational/clc_bitselect.h @@ -9,9 +9,9 @@ #ifndef __CLC_RELATIONAL_CLC_BITSELECT_H__ #define __CLC_RELATIONAL_CLC_BITSELECT_H__ -#define __CLC_BODY -#include -#define __CLC_BODY -#include +#define __CLC_BODY "clc/relational/clc_bitselect_decl.inc" +#include "clc/math/gentype.inc" +#define __CLC_BODY "clc/relational/clc_bitselect_decl.inc" +#include "clc/integer/gentype.inc" #endif // __CLC_RELATIONAL_CLC_BITSELECT_H__ diff --git a/libclc/clc/include/clc/relational/clc_isequal.h b/libclc/clc/include/clc/relational/clc_isequal.h index 18e05387759e..ed87198fba0a 100644 --- a/libclc/clc/include/clc/relational/clc_isequal.h +++ b/libclc/clc/include/clc/relational/clc_isequal.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ISEQUAL_H__ #define __CLC_RELATIONAL_CLC_ISEQUAL_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ISEQUAL_DECL(TYPE, RETTYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL RETTYPE __clc_isequal(TYPE x, TYPE y); diff --git a/libclc/clc/include/clc/relational/clc_isfinite.h b/libclc/clc/include/clc/relational/clc_isfinite.h index 596b81f51b85..59d608898e30 100644 --- a/libclc/clc/include/clc/relational/clc_isfinite.h +++ b/libclc/clc/include/clc/relational/clc_isfinite.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISFINITE_H__ #define __CLC_FUNCTION __clc_isfinite -#define __CLC_BODY +#define __CLC_BODY "clc/relational/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isgreater.h b/libclc/clc/include/clc/relational/clc_isgreater.h index fc5b3cdad084..923c20761b9b 100644 --- a/libclc/clc/include/clc/relational/clc_isgreater.h +++ b/libclc/clc/include/clc/relational/clc_isgreater.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISGREATER_H__ #define __CLC_FUNCTION __clc_isgreater -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isgreaterequal.h b/libclc/clc/include/clc/relational/clc_isgreaterequal.h index 6209a066cf46..5c96e499a76f 100644 --- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h +++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__ #define __CLC_FUNCTION __clc_isgreaterequal -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isinf.h b/libclc/clc/include/clc/relational/clc_isinf.h index a64b18bd564d..19b8a3db9c6d 100644 --- a/libclc/clc/include/clc/relational/clc_isinf.h +++ b/libclc/clc/include/clc/relational/clc_isinf.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ISINF_H__ #define __CLC_RELATIONAL_CLC_ISINF_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ISINF_DECL(RET_TYPE, ARG_TYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_isinf(ARG_TYPE); diff --git a/libclc/clc/include/clc/relational/clc_isless.h b/libclc/clc/include/clc/relational/clc_isless.h index 4e340db12177..773d6a02f9a5 100644 --- a/libclc/clc/include/clc/relational/clc_isless.h +++ b/libclc/clc/include/clc/relational/clc_isless.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISLESS_H__ #define __CLC_FUNCTION __clc_isless -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_islessequal.h b/libclc/clc/include/clc/relational/clc_islessequal.h index 14c5a1030183..5cba47232194 100644 --- a/libclc/clc/include/clc/relational/clc_islessequal.h +++ b/libclc/clc/include/clc/relational/clc_islessequal.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__ #define __CLC_FUNCTION __clc_islessequal -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_islessgreater.h b/libclc/clc/include/clc/relational/clc_islessgreater.h index 530564bbf059..14a12150690c 100644 --- a/libclc/clc/include/clc/relational/clc_islessgreater.h +++ b/libclc/clc/include/clc/relational/clc_islessgreater.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISLESSGREATER_H__ #define __CLC_FUNCTION __clc_islessgreater -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isnan.h b/libclc/clc/include/clc/relational/clc_isnan.h index 48cfa7f7fbb8..34702e56256c 100644 --- a/libclc/clc/include/clc/relational/clc_isnan.h +++ b/libclc/clc/include/clc/relational/clc_isnan.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ISNAN_H__ #define __CLC_RELATIONAL_CLC_ISNAN_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ISNAN_DECL(RET_TYPE, ARG_TYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_isnan(ARG_TYPE); diff --git a/libclc/clc/include/clc/relational/clc_isnormal.h b/libclc/clc/include/clc/relational/clc_isnormal.h index 9572b0200468..3463b3ee2543 100644 --- a/libclc/clc/include/clc/relational/clc_isnormal.h +++ b/libclc/clc/include/clc/relational/clc_isnormal.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISNORMAL_H__ #define __CLC_FUNCTION __clc_isnormal -#define __CLC_BODY +#define __CLC_BODY "clc/relational/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isnotequal.h b/libclc/clc/include/clc/relational/clc_isnotequal.h index f90622db9fe1..87f415427d05 100644 --- a/libclc/clc/include/clc/relational/clc_isnotequal.h +++ b/libclc/clc/include/clc/relational/clc_isnotequal.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__ #define __CLC_FUNCTION __clc_isnotequal -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_isordered.h b/libclc/clc/include/clc/relational/clc_isordered.h index 3f5cc097f4a7..c9bf4f94ee6a 100644 --- a/libclc/clc/include/clc/relational/clc_isordered.h +++ b/libclc/clc/include/clc/relational/clc_isordered.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISORDERED_H__ #define __CLC_FUNCTION __clc_isordered -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_issubnormal.h b/libclc/clc/include/clc/relational/clc_issubnormal.h index 548d50a08a6e..46b5d40066ae 100644 --- a/libclc/clc/include/clc/relational/clc_issubnormal.h +++ b/libclc/clc/include/clc/relational/clc_issubnormal.h @@ -9,7 +9,7 @@ #ifndef __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__ #define __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__ -#include +#include "clc/clcfunc.h" #define _CLC_ISSUBNORMAL_DECL(RET_TYPE, ARG_TYPE) \ _CLC_OVERLOAD _CLC_CONST _CLC_DECL RET_TYPE __clc_issubnormal(ARG_TYPE); diff --git a/libclc/clc/include/clc/relational/clc_isunordered.h b/libclc/clc/include/clc/relational/clc_isunordered.h index 6134ba849d22..cedf47363d44 100644 --- a/libclc/clc/include/clc/relational/clc_isunordered.h +++ b/libclc/clc/include/clc/relational/clc_isunordered.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_ISUNORDERED_H__ #define __CLC_FUNCTION __clc_isunordered -#define __CLC_BODY +#define __CLC_BODY "clc/relational/binary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/relational/clc_select.h b/libclc/clc/include/clc/relational/clc_select.h index de0a9afa6b8c..31a95274e88b 100644 --- a/libclc/clc/include/clc/relational/clc_select.h +++ b/libclc/clc/include/clc/relational/clc_select.h @@ -9,14 +9,14 @@ #ifndef __CLC_RELATIONAL_CLC_SELECT_H__ #define __CLC_RELATIONAL_CLC_SELECT_H__ -#include +#include "clc/utils.h" #define __CLC_SELECT_FN __clc_select -#define __CLC_BODY -#include -#define __CLC_BODY -#include +#define __CLC_BODY "clc/relational/clc_select_decl.inc" +#include "clc/math/gentype.inc" +#define __CLC_BODY "clc/relational/clc_select_decl.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SELECT_FN diff --git a/libclc/clc/include/clc/relational/clc_signbit.h b/libclc/clc/include/clc/relational/clc_signbit.h index a8e04ce494f2..45677fba6cb8 100644 --- a/libclc/clc/include/clc/relational/clc_signbit.h +++ b/libclc/clc/include/clc/relational/clc_signbit.h @@ -10,9 +10,9 @@ #define __CLC_RELATIONAL_CLC_SIGNBIT_H__ #define __CLC_FUNCTION __clc_signbit -#define __CLC_BODY +#define __CLC_BODY "clc/relational/unary_decl.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION diff --git a/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc b/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc index 25cf52c84811..5d226318572d 100644 --- a/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc +++ b/libclc/clc/include/clc/shared/binary_decl_with_int_second_arg.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x, __CLC_INTN y); diff --git a/libclc/clc/include/clc/shared/binary_def.inc b/libclc/clc/include/clc/shared/binary_def.inc index 5487ad926768..847a360e3a62 100644 --- a/libclc/clc/include/clc/shared/binary_def.inc +++ b/libclc/clc/include/clc/shared/binary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/shared/binary_def_scalarize.inc b/libclc/clc/include/clc/shared/binary_def_scalarize.inc index 2505f2ee0da2..7a6929bb4bfd 100644 --- a/libclc/clc/include/clc/shared/binary_def_scalarize.inc +++ b/libclc/clc/include/clc/shared/binary_def_scalarize.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifdef __CLC_SCALAR diff --git a/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc b/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc index 2c32754044db..0fce26821a08 100644 --- a/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc +++ b/libclc/clc/include/clc/shared/binary_def_with_int_second_arg.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc b/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc index 7a6283d7190d..06ae65ed87d0 100644 --- a/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc +++ b/libclc/clc/include/clc/shared/binary_def_with_scalar_second_arg.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/shared/clc_clamp.h b/libclc/clc/include/clc/shared/clc_clamp.h index 587a24ef9af1..8134806be789 100644 --- a/libclc/clc/include/clc/shared/clc_clamp.h +++ b/libclc/clc/include/clc/shared/clc_clamp.h @@ -9,10 +9,10 @@ #ifndef __CLC_SHARED_CLC_CLAMP_H__ #define __CLC_SHARED_CLC_CLAMP_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_clamp_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_clamp_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_CLAMP_H__ diff --git a/libclc/clc/include/clc/shared/clc_less_aligned_types.h b/libclc/clc/include/clc/shared/clc_less_aligned_types.h index 73e436147ce0..331e213eb6a4 100644 --- a/libclc/clc/include/clc/shared/clc_less_aligned_types.h +++ b/libclc/clc/include/clc/shared/clc_less_aligned_types.h @@ -14,10 +14,10 @@ #ifndef __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__ #define __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_less_aligned_types.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_less_aligned_types.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__ diff --git a/libclc/clc/include/clc/shared/clc_max.h b/libclc/clc/include/clc/shared/clc_max.h index 1f5edca52660..89ac45b735c0 100644 --- a/libclc/clc/include/clc/shared/clc_max.h +++ b/libclc/clc/include/clc/shared/clc_max.h @@ -9,10 +9,10 @@ #ifndef __CLC_SHARED_CLC_MAX_H__ #define __CLC_SHARED_CLC_MAX_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_max_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_max_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_MAX_H__ diff --git a/libclc/clc/include/clc/shared/clc_min.h b/libclc/clc/include/clc/shared/clc_min.h index edda93effa6c..317e1718e9a2 100644 --- a/libclc/clc/include/clc/shared/clc_min.h +++ b/libclc/clc/include/clc/shared/clc_min.h @@ -9,10 +9,10 @@ #ifndef __CLC_SHARED_CLC_MIN_H__ #define __CLC_SHARED_CLC_MIN_H__ -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_min_decl.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_min_decl.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_MIN_H__ diff --git a/libclc/clc/include/clc/shared/clc_vload.h b/libclc/clc/include/clc/shared/clc_vload.h index c3dbe0696cc1..563015e1b4e5 100644 --- a/libclc/clc/include/clc/shared/clc_vload.h +++ b/libclc/clc/include/clc/shared/clc_vload.h @@ -9,12 +9,12 @@ #ifndef __CLC_SHARED_CLC_VLOAD_H__ #define __CLC_SHARED_CLC_VLOAD_H__ -#include +#include "clc/shared/clc_less_aligned_types.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_vload.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_vload.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_VLOAD_H__ diff --git a/libclc/clc/include/clc/shared/clc_vstore.h b/libclc/clc/include/clc/shared/clc_vstore.h index 647dc7da1afb..f65fdbe643ae 100644 --- a/libclc/clc/include/clc/shared/clc_vstore.h +++ b/libclc/clc/include/clc/shared/clc_vstore.h @@ -9,12 +9,12 @@ #ifndef __CLC_SHARED_CLC_VSTORE_H__ #define __CLC_SHARED_CLC_VSTORE_H__ -#include +#include "clc/shared/clc_less_aligned_types.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_vstore.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/clc_vstore.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SHARED_CLC_VSTORE_H__ diff --git a/libclc/clc/include/clc/shared/ternary_def.inc b/libclc/clc/include/clc/shared/ternary_def.inc index 566cfb4ca58c..4de174863b3b 100644 --- a/libclc/clc/include/clc/shared/ternary_def.inc +++ b/libclc/clc/include/clc/shared/ternary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/shared/ternary_def_scalarize.inc b/libclc/clc/include/clc/shared/ternary_def_scalarize.inc index 7bdaee85a612..2b5848b14dd8 100644 --- a/libclc/clc/include/clc/shared/ternary_def_scalarize.inc +++ b/libclc/clc/include/clc/shared/ternary_def_scalarize.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifdef __CLC_SCALAR diff --git a/libclc/clc/include/clc/shared/unary_def.inc b/libclc/clc/include/clc/shared/unary_def.inc index b6826b023c70..72ca5d159b13 100644 --- a/libclc/clc/include/clc/shared/unary_def.inc +++ b/libclc/clc/include/clc/shared/unary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifndef __CLC_IMPL_FUNCTION #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/clc/include/clc/shared/unary_def_scalarize.inc b/libclc/clc/include/clc/shared/unary_def_scalarize.inc index e941918312da..c52404b6549e 100644 --- a/libclc/clc/include/clc/shared/unary_def_scalarize.inc +++ b/libclc/clc/include/clc/shared/unary_def_scalarize.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifdef __CLC_SCALAR diff --git a/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc b/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc index 544057b0e137..9e30e49144ce 100644 --- a/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc +++ b/libclc/clc/include/clc/shared/unary_def_scalarize_loop.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #if __CLC_VECSIZE_OR_1 >= 2 diff --git a/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc b/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc index fff91d36e626..76fcd70353e4 100644 --- a/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc +++ b/libclc/clc/include/clc/shared/unary_def_with_ptr_scalarize.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #ifdef __CLC_SCALAR diff --git a/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h b/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h index 1e17b078f483..d61f57860fe5 100644 --- a/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h +++ b/libclc/clc/include/clc/subgroup/clc_sub_group_broadcast.h @@ -13,10 +13,10 @@ #define __CLC_FUNCTION __clc_sub_group_broadcast -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SUBGROUP_CLC_SUB_GROUP_BROADCAST_H__ diff --git a/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h b/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h index 6454b9915dff..ca8f3cbea214 100644 --- a/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h +++ b/libclc/clc/include/clc/subgroup/clc_sub_group_reduce.h @@ -11,10 +11,10 @@ #include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_sub_group_reduce.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_sub_group_reduce.inc" +#include "clc/math/gentype.inc" #endif // __CLC_SUBGROUP_CLC_SUB_GROUP_REDUCE_H__ diff --git a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h index e98dc38e1b0b..c9a855b8101b 100644 --- a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h +++ b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h @@ -9,8 +9,8 @@ #ifndef __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__ #define __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__ -#include -#include +#include "clc/internal/clc.h" +#include "clc/mem_fence/clc_mem_semantic.h" _CLC_OVERLOAD _CLC_DECL void __clc_work_group_barrier(int memory_scope, diff --git a/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h b/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h index 3a1137ef3998..b6e094bf8cae 100644 --- a/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h +++ b/libclc/clc/include/clc/workitem/clc_get_enqueued_local_size.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_ENQUEUED_LOCAL_SIZE_H__ #define __CLC_WORKITEM_CLC_GET_ENQUEUED_LOCAL_SIZE_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_enqueued_local_size(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_global_id.h b/libclc/clc/include/clc/workitem/clc_get_global_id.h index 8a78c78bbc16..d5d7b8a4d2e5 100644 --- a/libclc/clc/include/clc/workitem/clc_get_global_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_global_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__ #define __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_id(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_global_offset.h b/libclc/clc/include/clc/workitem/clc_get_global_offset.h index bf6d4e5c7642..2634f96bbfb3 100644 --- a/libclc/clc/include/clc/workitem/clc_get_global_offset.h +++ b/libclc/clc/include/clc/workitem/clc_get_global_offset.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__ #define __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_offset(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_global_size.h b/libclc/clc/include/clc/workitem/clc_get_global_size.h index 87b88d7d1b4b..897b7027f4a6 100644 --- a/libclc/clc/include/clc/workitem/clc_get_global_size.h +++ b/libclc/clc/include/clc/workitem/clc_get_global_size.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__ #define __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_size(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_group_id.h b/libclc/clc/include/clc/workitem/clc_get_group_id.h index cc1b0f13ad79..44d938b3e77b 100644 --- a/libclc/clc/include/clc/workitem/clc_get_group_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_group_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_GROUP_ID_H__ #define __CLC_WORKITEM_CLC_GET_GROUP_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_group_id(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_local_id.h b/libclc/clc/include/clc/workitem/clc_get_local_id.h index a25e5ebaa5e4..2bc8ccf76eb9 100644 --- a/libclc/clc/include/clc/workitem/clc_get_local_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_local_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__ #define __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_id(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h index 9548644f05ca..2afed829fdae 100644 --- a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__ #define __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_linear_id(); diff --git a/libclc/clc/include/clc/workitem/clc_get_local_size.h b/libclc/clc/include/clc/workitem/clc_get_local_size.h index 1272227b65e1..f2c356568e40 100644 --- a/libclc/clc/include/clc/workitem/clc_get_local_size.h +++ b/libclc/clc/include/clc/workitem/clc_get_local_size.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__ #define __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_size(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h index 0e3b67f64b80..a5c98aeba94b 100644 --- a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h +++ b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__ #define __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_max_sub_group_size(void); diff --git a/libclc/clc/include/clc/workitem/clc_get_num_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_groups.h index 6071fc3f141f..38f5cc8f5f00 100644 --- a/libclc/clc/include/clc/workitem/clc_get_num_groups.h +++ b/libclc/clc/include/clc/workitem/clc_get_num_groups.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__ #define __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_num_groups(uint dim); diff --git a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h index f94e89826892..b584df98e44a 100644 --- a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h +++ b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__ #define __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_num_sub_groups(); diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h index 61b54ecde476..44a4459aa48b 100644 --- a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__ #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_id(); diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h index a158153bde1e..52e4b3f28083 100644 --- a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h +++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__ #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_local_id(); diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h index c4b1d928b20d..4603bfdcbeb2 100644 --- a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h +++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__ #define __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_size(); diff --git a/libclc/clc/include/clc/workitem/clc_get_work_dim.h b/libclc/clc/include/clc/workitem/clc_get_work_dim.h index e93d3773b8ca..eaf547b9646a 100644 --- a/libclc/clc/include/clc/workitem/clc_get_work_dim.h +++ b/libclc/clc/include/clc/workitem/clc_get_work_dim.h @@ -9,7 +9,7 @@ #ifndef __CLC_WORKITEM_CLC_GET_WORK_DIM_H__ #define __CLC_WORKITEM_CLC_GET_WORK_DIM_H__ -#include +#include "clc/internal/clc.h" _CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_work_dim(); diff --git a/libclc/clc/lib/amdgpu/math/clc_exp.cl b/libclc/clc/lib/amdgpu/math/clc_exp.cl index ae82bbb3a5c6..bf8521740d1f 100644 --- a/libclc/clc/lib/amdgpu/math/clc_exp.cl +++ b/libclc/clc/lib/amdgpu/math/clc_exp.cl @@ -10,6 +10,6 @@ #define __CLC_FUNCTION __clc_exp #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_exp10.cl b/libclc/clc/lib/amdgpu/math/clc_exp10.cl index b7fc6bf8cabb..b3734ec63d7a 100644 --- a/libclc/clc/lib/amdgpu/math/clc_exp10.cl +++ b/libclc/clc/lib/amdgpu/math/clc_exp10.cl @@ -10,6 +10,6 @@ #define __CLC_FUNCTION __clc_exp10 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_exp2.cl index 4b351fdd935f..5ba9033769eb 100644 --- a/libclc/clc/lib/amdgpu/math/clc_exp2.cl +++ b/libclc/clc/lib/amdgpu/math/clc_exp2.cl @@ -10,6 +10,6 @@ #define __CLC_FUNCTION __clc_exp2 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_exp2_fast.cl b/libclc/clc/lib/amdgpu/math/clc_exp2_fast.cl index b73bc9f6e260..10288cd52680 100644 --- a/libclc/clc/lib/amdgpu/math/clc_exp2_fast.cl +++ b/libclc/clc/lib/amdgpu/math/clc_exp2_fast.cl @@ -13,21 +13,21 @@ #define __CLC_MIN_VECSIZE 1 #define __CLC_FUNCTION __clc_exp2_fast #define __CLC_IMPL_FUNCTION(x) __builtin_amdgcn_exp2f(x) -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_FLOAT_ONLY #define __CLC_HALF_ONLY #define __CLC_IMPL_FUNCTION(x) __clc_exp2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_HALF_ONLY #define __CLC_DOUBLE_ONLY #define __CLC_IMPL_FUNCTION(x) __clc_exp2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_DOUBLE_ONLY diff --git a/libclc/clc/lib/amdgpu/math/clc_frexp.cl b/libclc/clc/lib/amdgpu/math/clc_frexp.cl index 9234f84b274d..2acd830688ff 100644 --- a/libclc/clc/lib/amdgpu/math/clc_frexp.cl +++ b/libclc/clc/lib/amdgpu/math/clc_frexp.cl @@ -6,38 +6,38 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_frexp.h" -#define __CLC_BODY +#define __CLC_BODY "clc_frexp_builtin.inc" #define __CLC_ADDRESS_SPACE private #define __CLC_PRIVATE -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE #undef __CLC_PRIVATE -#define __CLC_BODY +#define __CLC_BODY "clc_frexp_builtin.inc" #define __CLC_ADDRESS_SPACE global -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE -#define __CLC_BODY +#define __CLC_BODY "clc_frexp_builtin.inc" #define __CLC_ADDRESS_SPACE local -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED -#define __CLC_BODY +#define __CLC_BODY "clc_frexp_builtin.inc" #define __CLC_ADDRESS_SPACE generic -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE #endif #define __CLC_FUNCTION __clc_frexp #define __CLC_ARG2_TYPE int #define __CLC_ADDRSPACE private -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_with_ptr_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_ADDRSPACE #undef __CLC_ARG2_TYPE #undef __CLC_FUNCTION diff --git a/libclc/clc/lib/amdgpu/math/clc_half_exp.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp.cl index c332708615e1..496c898887f8 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_exp.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_exp.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_exp.h" #define __CLC_FUNC exp #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl index 5560f7ac9796..de582386ead1 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_exp10.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_exp10.h" #define __CLC_FUNC exp10 #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl index 3e38cbee3285..91c6d517b2b8 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_exp2.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_native_exp2.h" #define __CLC_FUNC exp2 #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_log.cl b/libclc/clc/lib/amdgpu/math/clc_half_log.cl index 0b731c202e20..016e32c526dd 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_log.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_log.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log.h" #define __CLC_FUNC log #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_log10.cl b/libclc/clc/lib/amdgpu/math/clc_half_log10.cl index 1fd8ba520411..1dcab8b19a25 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_log10.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_log10.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log10.h" #define __CLC_FUNC log10 #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_log2.cl b/libclc/clc/lib/amdgpu/math/clc_half_log2.cl index e4d27421f8fe..7c8debcc9e27 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_log2.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_log2.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log2.h" #define __CLC_FUNC log2 #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc b/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc index d62343400f2c..12e92b3bdd97 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc +++ b/libclc/clc/lib/amdgpu/math/clc_half_native_unary.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #define __CLC_HALF_FUNC(x) __CLC_CONCAT(__clc_half_, x) #define __CLC_NATIVE_FUNC(x) __CLC_CONCAT(__clc_native_, x) diff --git a/libclc/clc/lib/amdgpu/math/clc_half_recip.cl b/libclc/clc/lib/amdgpu/math/clc_half_recip.cl index 0a1c17037531..99847f2db519 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_recip.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_recip.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_recip.h" #define __CLC_FUNC recip #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl b/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl index a17ac508b5ad..0f6504057e7c 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_rsqrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_rsqrt.h" #define __CLC_FUNC rsqrt #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl b/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl index 142a87881853..6620d1a55a38 100644 --- a/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl +++ b/libclc/clc/lib/amdgpu/math/clc_half_sqrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_sqrt.h" #define __CLC_FUNC sqrt #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_half_native_unary.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_ldexp.cl b/libclc/clc/lib/amdgpu/math/clc_ldexp.cl index bc6028ed13b2..00716a0f0756 100644 --- a/libclc/clc/lib/amdgpu/math/clc_ldexp.cl +++ b/libclc/clc/lib/amdgpu/math/clc_ldexp.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_ldexp.h" #define __CLC_FUNCTION __clc_ldexp #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_ldexp -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_log2_fast.cl b/libclc/clc/lib/amdgpu/math/clc_log2_fast.cl index a47fc84b26a0..bf0e6be7bb03 100644 --- a/libclc/clc/lib/amdgpu/math/clc_log2_fast.cl +++ b/libclc/clc/lib/amdgpu/math/clc_log2_fast.cl @@ -5,21 +5,21 @@ #define __CLC_MIN_VECSIZE 1 #define __CLC_FUNCTION __clc_log2_fast #define __CLC_IMPL_FUNCTION(x) __builtin_amdgcn_logf(x) -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_FLOAT_ONLY #define __CLC_HALF_ONLY #define __CLC_IMPL_FUNCTION(x) __clc_log2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_HALF_ONLY #define __CLC_DOUBLE_ONLY #define __CLC_IMPL_FUNCTION(x) __clc_log2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" #undef __CLC_IMPL_FUNCTION #undef __CLC_DOUBLE_ONLY diff --git a/libclc/clc/lib/amdgpu/math/clc_native_exp.cl b/libclc/clc/lib/amdgpu/math/clc_native_exp.cl index 946b9beed5be..ea5fe6c806a0 100644 --- a/libclc/clc/lib/amdgpu/math/clc_native_exp.cl +++ b/libclc/clc/lib/amdgpu/math/clc_native_exp.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_native_exp2.h" -#define __CLC_BODY +#define __CLC_BODY "clc_native_exp.inc" #define __CLC_FLOAT_ONLY -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl b/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl index a940323b60a7..46917b95bfd2 100644 --- a/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl +++ b/libclc/clc/lib/amdgpu/math/clc_native_exp2.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_MIN_VECSIZE 1 #define __CLC_FUNCTION __clc_native_exp2 #define __CLC_IMPL_FUNCTION __builtin_amdgcn_exp2f -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/math/clc_native_log10.cl b/libclc/clc/lib/amdgpu/math/clc_native_log10.cl index c356b22b6b6e..286cf68f5bcb 100644 --- a/libclc/clc/lib/amdgpu/math/clc_native_log10.cl +++ b/libclc/clc/lib/amdgpu/math/clc_native_log10.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_native_log2.h" -#define __CLC_BODY +#define __CLC_BODY "clc_native_log10.inc" #define __CLC_FLOAT_ONLY -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl b/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl index f54c9e214752..c5054ffe32ec 100644 --- a/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl +++ b/libclc/clc/lib/amdgpu/mem_fence/clc_mem_fence.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/mem_fence/clc_mem_fence.h" #define BUILTIN_FENCE_ORDER(memory_order, ...) \ switch (memory_order) { \ diff --git a/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl index d6dc95b57491..969833bcd67d 100644 --- a/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl +++ b/libclc/clc/lib/amdgpu/subgroup/clc_sub_group_broadcast.cl @@ -78,8 +78,8 @@ __clc_sub_group_broadcast(double x, uint sub_group_local_id) { return __builtin_astype(broadcast, double); } -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast_scalarize.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/subgroup/clc_subgroup_broadcast_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl b/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl index 0950af0aaf0d..178b95d44d9e 100644 --- a/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl +++ b/libclc/clc/lib/amdgpu/synchronization/clc_work_group_barrier.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/mem_fence/clc_mem_fence.h" +#include "clc/synchronization/clc_work_group_barrier.h" _CLC_OVERLOAD _CLC_DEF void __clc_work_group_barrier(int memory_scope, diff --git a/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl index eca855072004..5fe6803685eb 100644 --- a/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl +++ b/libclc/clc/lib/amdgpu/workitem/clc_get_global_offset.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "clc/workitem/clc_get_global_offset.h" #include -#include _CLC_DEF _CLC_OVERLOAD size_t __clc_get_global_offset(uint dim) { __constant amdhsa_implicit_kernarg_v5 *implicit_args = diff --git a/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl index 4dab7905ba30..56dc11c789e5 100644 --- a/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl +++ b/libclc/clc/lib/amdgpu/workitem/clc_get_group_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_group_id.h" _CLC_DEF _CLC_OVERLOAD size_t __clc_get_group_id(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl index 8d1d16d4762f..bda46aa47518 100644 --- a/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl +++ b/libclc/clc/lib/amdgpu/workitem/clc_get_local_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_local_id.h" _CLC_DEF _CLC_OVERLOAD size_t __clc_get_local_id(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl b/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl index 1c66d0be410f..9811772db9c4 100644 --- a/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl +++ b/libclc/clc/lib/amdgpu/workitem/clc_get_work_dim.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// +#include "clc/workitem/clc_get_work_dim.h" #include -#include _CLC_OVERLOAD _CLC_DEF uint __clc_get_work_dim() { __constant amdhsa_implicit_kernarg_v5 *implicit_args = diff --git a/libclc/clc/lib/clspv/math/clc_sw_fma.cl b/libclc/clc/lib/clspv/math/clc_sw_fma.cl index c28b9441b05f..306aad514212 100644 --- a/libclc/clc/lib/clspv/math/clc_sw_fma.cl +++ b/libclc/clc/lib/clspv/math/clc_sw_fma.cl @@ -10,18 +10,18 @@ // (__clc_sw_fma), but avoids the use of ulong in favor of uint2. The logic has // been updated as appropriate. -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_as_type.h" +#include "clc/float/definitions.h" +#include "clc/integer/clc_abs.h" +#include "clc/integer/clc_clz.h" +#include "clc/integer/clc_hadd.h" +#include "clc/integer/clc_mul_hi.h" +#include "clc/integer/definitions.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_max.h" struct fp { uint2 mantissa; @@ -270,5 +270,5 @@ _CLC_DEF _CLC_OVERLOAD float __clc_sw_fma(float a, float b, float c) { #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_sw_fma -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/ternary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/async/clc_prefetch.cl b/libclc/clc/lib/generic/async/clc_prefetch.cl index 1b8da199eb4a..58e32b0e0ae8 100644 --- a/libclc/clc/lib/generic/async/clc_prefetch.cl +++ b/libclc/clc/lib/generic/async/clc_prefetch.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/async/clc_prefetch.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_prefetch.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_prefetch.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl b/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl index 796dedcef385..8cc9f767d822 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_compare_exchange.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_compare_exchange.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_compare_exchange.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl b/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl index 4603e7ebd86d..a6c5119c6027 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_dec.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_dec.h" #define __CLC_FUNCTION __clc_atomic_dec #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_udec #define __CLC_INC_DEC -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl b/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl index b2c26758103c..e13878073926 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_exchange.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_exchange.h" #define __CLC_FUNCTION __clc_atomic_exchange #define __CLC_IMPL_FUNCTION __scoped_atomic_exchange_n -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" #undef __CLC_CASTTYPE #undef __CLC_AS_RETTYPE @@ -21,5 +21,5 @@ #define __CLC_AS_RETTYPE(x) __CLC_AS_GENTYPE(x) #define __CLC_AS_CASTTYPE __CLC_AS_S_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl index 06fa21344ec8..d8536aa5f1cb 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_add.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_add.h" #define __CLC_FUNCTION __clc_atomic_fetch_add #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_add -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl index 7b9750d8d4db..ef21d8241796 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_and.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_and.h" #define __CLC_FUNCTION __clc_atomic_fetch_and #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_and -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl index 6401d3e9439f..6a4995f955d3 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_max.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_max.h" #define __CLC_FUNCTION __clc_atomic_fetch_max #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_max -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl index 51e3904a5c6e..b138bfd21a3a 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_min.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_min.h" #define __CLC_FUNCTION __clc_atomic_fetch_min #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_min -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl index e92e351db3f4..2d95e73a2657 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_or.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_or.h" #define __CLC_FUNCTION __clc_atomic_fetch_or #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_or -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl index fbbf7a4def56..0797fd8f3e89 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_sub.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_sub.h" #define __CLC_FUNCTION __clc_atomic_fetch_sub #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_sub -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl index d041fd164d38..9a32125f8ca9 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_fetch_xor.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_xor.h" #define __CLC_FUNCTION __clc_atomic_fetch_xor #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_xor -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl b/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl index e03e63bd82d5..60fc30fde25c 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_flag_clear.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_flag_clear.h" +#include "clc/atomic/clc_atomic_store.h" #define __CLC_ATOMIC_FLAG_FALSE 0 diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl b/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl index 4a033e3532af..515458ec88ad 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_flag_test_and_set.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_exchange.h" +#include "clc/atomic/clc_atomic_flag_test_and_set.h" #define __CLC_ATOMIC_FLAG_TRUE 1 diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl b/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl index 53915c588768..cd9ff8786fb9 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_inc.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_inc.h" #define __CLC_FUNCTION __clc_atomic_inc #define __CLC_IMPL_FUNCTION __scoped_atomic_fetch_uinc #define __CLC_INC_DEC -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_load.cl b/libclc/clc/lib/generic/atomic/clc_atomic_load.cl index af808553a711..5a8cb8da017c 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_load.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_load.cl @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_load.h" #define __CLC_FUNCTION __clc_atomic_load #define __CLC_IMPL_FUNCTION __scoped_atomic_load_n #define __CLC_NO_VALUE_ARG -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" #undef __CLC_CASTTYPE #undef __CLC_AS_RETTYPE #define __CLC_CASTTYPE __CLC_BIT_INTN #define __CLC_AS_RETTYPE(x) __CLC_AS_GENTYPE(x) -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/atomic/clc_atomic_store.cl b/libclc/clc/lib/generic/atomic/clc_atomic_store.cl index 66ae2ba98556..e0429b0acf86 100644 --- a/libclc/clc/lib/generic/atomic/clc_atomic_store.cl +++ b/libclc/clc/lib/generic/atomic/clc_atomic_store.cl @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_store.h" #define __CLC_FUNCTION __clc_atomic_store #define __CLC_IMPL_FUNCTION __scoped_atomic_store_n #define __CLC_RETURN_VOID -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/integer/gentype.inc" #undef __CLC_CASTTYPE #undef __CLC_AS_CASTTYPE #define __CLC_CASTTYPE __CLC_BIT_INTN #define __CLC_AS_CASTTYPE __CLC_AS_S_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl b/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl index d54bda65773f..ebf2d2eb1710 100644 --- a/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl +++ b/libclc/clc/lib/generic/collective/clc_work_group_broadcast.cl @@ -16,8 +16,8 @@ #pragma OPENCL EXTENSION __cl_clang_function_scope_local_variables : enable -#define __CLC_BODY -#include +#define __CLC_BODY "clc_work_group_broadcast.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_work_group_broadcast.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl b/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl index a28b5cf1c2c5..dbe0eaba656e 100644 --- a/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl +++ b/libclc/clc/lib/generic/collective/clc_work_group_reduce.cl @@ -23,8 +23,8 @@ enum __CLC_WORK_GROUP_REDUCE_OP { __CLC_WORK_GROUP_REDUCE_MAX }; -#define __CLC_BODY -#include +#define __CLC_BODY "clc_work_group_reduce.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_work_group_reduce.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/common/clc_degrees.cl b/libclc/clc/lib/generic/common/clc_degrees.cl index 9c48f50f3518..6938c6ca1202 100644 --- a/libclc/clc/lib/generic/common/clc_degrees.cl +++ b/libclc/clc/lib/generic/common/clc_degrees.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/common/clc_degrees.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_degrees.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/common/clc_radians.cl b/libclc/clc/lib/generic/common/clc_radians.cl index 6e8d6f363810..31340ddd1971 100644 --- a/libclc/clc/lib/generic/common/clc_radians.cl +++ b/libclc/clc/lib/generic/common/clc_radians.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/common/clc_radians.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_radians.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/common/clc_sign.cl b/libclc/clc/lib/generic/common/clc_sign.cl index 07cfe4bfcfff..0dc29abf9563 100644 --- a/libclc/clc/lib/generic/common/clc_sign.cl +++ b/libclc/clc/lib/generic/common/clc_sign.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/math/clc_copysign.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sign.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/common/clc_smoothstep.cl b/libclc/clc/lib/generic/common/clc_smoothstep.cl index 1c4d4a5a9b0b..73d15c0dcded 100644 --- a/libclc/clc/lib/generic/common/clc_smoothstep.cl +++ b/libclc/clc/lib/generic/common/clc_smoothstep.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/common/clc_smoothstep.h" +#include "clc/internal/clc.h" +#include "clc/shared/clc_clamp.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_smoothstep.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/common/clc_step.cl b/libclc/clc/lib/generic/common/clc_step.cl index 6bb9a66760e2..62370fe135a8 100644 --- a/libclc/clc/lib/generic/common/clc_step.cl +++ b/libclc/clc/lib/generic/common/clc_step.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/common/clc_step.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_step.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl b/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl index 41dc43f67aa6..aa5dbaf1ab73 100644 --- a/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl +++ b/libclc/clc/lib/generic/conversion/clc_convert_float2float.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/common/clc_sign.h" +#include "clc/float/definitions.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_nextafter.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_clamp.h" #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE) @@ -25,24 +25,24 @@ #pragma OPENCL EXTENSION cl_khr_fp16 : enable #define __CLC_SCALAR_TYPE_SRC half #define __CLC_SCALAR_TYPE_SRC_S short -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S #endif // cl_khr_fp16 #define __CLC_SCALAR_TYPE_SRC float #define __CLC_SCALAR_TYPE_SRC_S int -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S #ifdef cl_khr_fp64 #define __CLC_SCALAR_TYPE_SRC double #define __CLC_SCALAR_TYPE_SRC_S long -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S #endif // cl_khr_fp64 diff --git a/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl b/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl index cc7016fcbefb..18036aef27b9 100644 --- a/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl +++ b/libclc/clc/lib/generic/conversion/clc_convert_float2int.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/definitions.h" +#include "clc/math/clc_ceil.h" +#include "clc/math/clc_floor.h" +#include "clc/math/clc_rint.h" +#include "clc/relational/clc_select.h" #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST) @@ -28,29 +28,29 @@ #define __CLC_SCALAR_TYPE_DST char #define __CLC_GENSIZE_DST 8 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float2int.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #undef __CLC_GENSIZE_DST #define __CLC_SCALAR_TYPE_DST short #define __CLC_GENSIZE_DST 16 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float2int.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #undef __CLC_GENSIZE_DST #define __CLC_SCALAR_TYPE_DST int #define __CLC_GENSIZE_DST 32 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float2int.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #undef __CLC_GENSIZE_DST #define __CLC_SCALAR_TYPE_DST long #define __CLC_GENSIZE_DST 64 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float2int.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #undef __CLC_GENSIZE_DST diff --git a/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl b/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl index 70bb027d9e43..33e81a95a5f6 100644 --- a/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl +++ b/libclc/clc/lib/generic/conversion/clc_convert_int2float.cl @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/common/clc_sign.h" +#include "clc/float/definitions.h" +#include "clc/integer/clc_abs.h" +#include "clc/integer/definitions.h" +#include "clc/math/clc_nextafter.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_clamp.h" +#include "clc/shared/clc_max.h" +#include "clc/shared/clc_min.h" #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE) @@ -33,14 +33,14 @@ #define __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC char -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC uchar -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S @@ -50,14 +50,14 @@ #define __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC short -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC ushort -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S @@ -67,14 +67,14 @@ #define __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC int -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC uint -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_SCALAR_TYPE_SRC_S @@ -84,14 +84,14 @@ #define __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC long -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GEN_S #define __CLC_SCALAR_TYPE_SRC ulong -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GENTYPE_SRC diff --git a/libclc/clc/lib/generic/conversion/clc_convert_integer.cl b/libclc/clc/lib/generic/conversion/clc_convert_integer.cl index bef4ff7b3ad6..2d509ab70c91 100644 --- a/libclc/clc/lib/generic/conversion/clc_convert_integer.cl +++ b/libclc/clc/lib/generic/conversion/clc_convert_integer.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/definitions.h" +#include "clc/shared/clc_clamp.h" +#include "clc/shared/clc_max.h" +#include "clc/shared/clc_min.h" #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC) @@ -25,30 +25,30 @@ #define __CLC_SCALAR_TYPE_SRC char #define __CLC_GENSIZE_SRC 8 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GENSIZE_SRC #define __CLC_SCALAR_TYPE_SRC short #define __CLC_GENSIZE_SRC 16 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GENSIZE_SRC #define __CLC_SCALAR_TYPE_SRC int #define __CLC_GENSIZE_SRC 32 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GENSIZE_SRC #if defined cles_khr_int64 || !defined(__EMBEDDED_PROFILE__) #define __CLC_SCALAR_TYPE_SRC long #define __CLC_GENSIZE_SRC 64 -#define __CLC_BODY -#include +#define __CLC_BODY "clc_convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #undef __CLC_GENSIZE_SRC #endif // defined cles_khr_int64 || !defined(__EMBEDDED_PROFILE__) diff --git a/libclc/clc/lib/generic/geometric/clc_cross.cl b/libclc/clc/lib/generic/geometric/clc_cross.cl index 4ed1d5797d9a..e7f82b346593 100644 --- a/libclc/clc/lib/generic/geometric/clc_cross.cl +++ b/libclc/clc/lib/generic/geometric/clc_cross.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_cross.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_distance.cl b/libclc/clc/lib/generic/geometric/clc_distance.cl index ba22c9e17330..c317195ecb1e 100644 --- a/libclc/clc/lib/generic/geometric/clc_distance.cl +++ b/libclc/clc/lib/generic/geometric/clc_distance.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/geometric/clc_length.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_distance.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_dot.cl b/libclc/clc/lib/generic/geometric/clc_dot.cl index a30f9bc6e301..52d75d3e2f26 100644 --- a/libclc/clc/lib/generic/geometric/clc_dot.cl +++ b/libclc/clc/lib/generic/geometric/clc_dot.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_dot.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_fast_distance.cl b/libclc/clc/lib/generic/geometric/clc_fast_distance.cl index 6b645df0b3dd..9e40b589f973 100644 --- a/libclc/clc/lib/generic/geometric/clc_fast_distance.cl +++ b/libclc/clc/lib/generic/geometric/clc_fast_distance.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/geometric/clc_fast_length.h" +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_fast_distance.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_fast_length.cl b/libclc/clc/lib/generic/geometric/clc_fast_length.cl index ce6ec5283e52..484a0dcd60d3 100644 --- a/libclc/clc/lib/generic/geometric/clc_fast_length.cl +++ b/libclc/clc/lib/generic/geometric/clc_fast_length.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include +#include "clc/geometric/clc_dot.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_half_sqrt.h" _CLC_OVERLOAD _CLC_DEF float __clc_fast_length(float p) { return __clc_fabs(p); diff --git a/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl b/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl index a5883efe7bd9..47910cf191a3 100644 --- a/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl +++ b/libclc/clc/lib/generic/geometric/clc_fast_normalize.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/geometric/clc_dot.h" +#include "clc/geometric/clc_normalize.h" +#include "clc/math/clc_half_rsqrt.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY -#include +#define __CLC_BODY "clc_fast_normalize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_length.cl b/libclc/clc/lib/generic/geometric/clc_length.cl index d9a9166b92ae..9e41b35b3159 100644 --- a/libclc/clc/lib/generic/geometric/clc_length.cl +++ b/libclc/clc/lib/generic/geometric/clc_length.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/geometric/clc_dot.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sqrt.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_length.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/geometric/clc_normalize.cl b/libclc/clc/lib/generic/geometric/clc_normalize.cl index ec4a67647c13..18188bf11b66 100644 --- a/libclc/clc/lib/generic/geometric/clc_normalize.cl +++ b/libclc/clc/lib/generic/geometric/clc_normalize.cl @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/common/clc_sign.h" +#include "clc/float/definitions.h" +#include "clc/geometric/clc_dot.h" +#include "clc/geometric/clc_normalize.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_rsqrt.h" +#include "clc/relational/clc_all.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_normalize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_abs.cl b/libclc/clc/lib/generic/integer/clc_abs.cl index c2bea5bec812..269dcf1e564c 100644 --- a/libclc/clc/lib/generic/integer/clc_abs.cl +++ b/libclc/clc/lib/generic/integer/clc_abs.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_abs.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_abs_diff.cl b/libclc/clc/lib/generic/integer/clc_abs_diff.cl index c168b06060aa..80a92934dd03 100644 --- a/libclc/clc/lib/generic/integer/clc_abs_diff.cl +++ b/libclc/clc/lib/generic/integer/clc_abs_diff.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_abs_diff.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_add_sat.cl b/libclc/clc/lib/generic/integer/clc_add_sat.cl index 08337bf533fc..f60afb65f14c 100644 --- a/libclc/clc/lib/generic/integer/clc_add_sat.cl +++ b/libclc/clc/lib/generic/integer/clc_add_sat.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_add_sat #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_add_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_bit_reverse.cl b/libclc/clc/lib/generic/integer/clc_bit_reverse.cl index 9bf57e2c7d83..5cc72d13cadc 100644 --- a/libclc/clc/lib/generic/integer/clc_bit_reverse.cl +++ b/libclc/clc/lib/generic/integer/clc_bit_reverse.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_bit_reverse.h" #define __CLC_FUNCTION __clc_bit_reverse #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_bitreverse -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl b/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl index d779ed6a4359..014efc99ab73 100644 --- a/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl +++ b/libclc/clc/lib/generic/integer/clc_bitfield_extract_signed.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_bitfield_extract_signed.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_bitfield_extract_signed.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl b/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl index bf7db401034d..8f7af6e604f5 100644 --- a/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl +++ b/libclc/clc/lib/generic/integer/clc_bitfield_extract_unsigned.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_bitfield_extract_unsigned.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_bitfield_extract_unsigned.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl b/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl index a40fc804f218..4678bcfb2247 100644 --- a/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl +++ b/libclc/clc/lib/generic/integer/clc_bitfield_insert.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_bitfield_insert.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_bitfield_insert.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_clz.cl b/libclc/clc/lib/generic/integer/clc_clz.cl index 48c4400f199f..4f54cf3416f5 100644 --- a/libclc/clc/lib/generic/integer/clc_clz.cl +++ b/libclc/clc/lib/generic/integer/clc_clz.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/integer/clc_clz.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_clz.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_ctz.cl b/libclc/clc/lib/generic/integer/clc_ctz.cl index 42cfa90c3e66..01c4df09cd60 100644 --- a/libclc/clc/lib/generic/integer/clc_ctz.cl +++ b/libclc/clc/lib/generic/integer/clc_ctz.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/integer/clc_ctz.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_ctz.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_hadd.cl b/libclc/clc/lib/generic/integer/clc_hadd.cl index 0f11e547c1ca..dee74b6d7c55 100644 --- a/libclc/clc/lib/generic/integer/clc_hadd.cl +++ b/libclc/clc/lib/generic/integer/clc_hadd.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_hadd.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_mad24.cl b/libclc/clc/lib/generic/integer/clc_mad24.cl index 12b72a20b35c..bb394dd70e84 100644 --- a/libclc/clc/lib/generic/integer/clc_mad24.cl +++ b/libclc/clc/lib/generic/integer/clc_mad24.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/integer/clc_mul24.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_mad24.inc" +#include "clc/integer/gentype24.inc" diff --git a/libclc/clc/lib/generic/integer/clc_mad_sat.cl b/libclc/clc/lib/generic/integer/clc_mad_sat.cl index 93088dc9f0b6..77470d17306e 100644 --- a/libclc/clc/lib/generic/integer/clc_mad_sat.cl +++ b/libclc/clc/lib/generic/integer/clc_mad_sat.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/clc_add_sat.h" +#include "clc/integer/clc_mad24.h" +#include "clc/integer/clc_mul_hi.h" +#include "clc/integer/clc_upsample.h" +#include "clc/integer/definitions.h" +#include "clc/internal/clc.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_clamp.h" #define __CLC_DEFINE_SIMPLE_MAD_SAT(TYPE, UP_TYPE, LIT_PREFIX) \ _CLC_OVERLOAD _CLC_DEF TYPE __clc_mad_sat(TYPE x, TYPE y, TYPE z) { \ diff --git a/libclc/clc/lib/generic/integer/clc_mul24.cl b/libclc/clc/lib/generic/integer/clc_mul24.cl index 9b362af51ef7..3cda150c96f4 100644 --- a/libclc/clc/lib/generic/integer/clc_mul24.cl +++ b/libclc/clc/lib/generic/integer/clc_mul24.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_mul24.inc" +#include "clc/integer/gentype24.inc" diff --git a/libclc/clc/lib/generic/integer/clc_mul_hi.cl b/libclc/clc/lib/generic/integer/clc_mul_hi.cl index 117d8471fb8a..c627a6cb5034 100644 --- a/libclc/clc/lib/generic/integer/clc_mul_hi.cl +++ b/libclc/clc/lib/generic/integer/clc_mul_hi.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/clc_hadd.h" +#include "clc/integer/definitions.h" +#include "clc/internal/clc.h" // For all types EXCEPT long, which is implemented separately #define __CLC_MUL_HI_IMPL(BGENTYPE, GENTYPE, GENSIZE) \ diff --git a/libclc/clc/lib/generic/integer/clc_popcount.cl b/libclc/clc/lib/generic/integer/clc_popcount.cl index 2781ead638c9..9ac373799b25 100644 --- a/libclc/clc/lib/generic/integer/clc_popcount.cl +++ b/libclc/clc/lib/generic/integer/clc_popcount.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_popcount #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_popcount -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_rhadd.cl b/libclc/clc/lib/generic/integer/clc_rhadd.cl index e7dd5c7f4b53..5a0738677f80 100644 --- a/libclc/clc/lib/generic/integer/clc_rhadd.cl +++ b/libclc/clc/lib/generic/integer/clc_rhadd.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_rhadd.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_rotate.cl b/libclc/clc/lib/generic/integer/clc_rotate.cl index 2abf0178ce3b..12eb8c5bf0c1 100644 --- a/libclc/clc/lib/generic/integer/clc_rotate.cl +++ b/libclc/clc/lib/generic/integer/clc_rotate.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/utils.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_rotate.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_sub_sat.cl b/libclc/clc/lib/generic/integer/clc_sub_sat.cl index 8a7ffd06f8b0..022d4c9c0eab 100644 --- a/libclc/clc/lib/generic/integer/clc_sub_sat.cl +++ b/libclc/clc/lib/generic/integer/clc_sub_sat.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_sub_sat #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sub_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/integer/clc_upsample.cl b/libclc/clc/lib/generic/integer/clc_upsample.cl index 649bc7830f44..5aa23fa059b0 100644 --- a/libclc/clc/lib/generic/integer/clc_upsample.cl +++ b/libclc/clc/lib/generic/integer/clc_upsample.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" #define __CLC_UPSAMPLE_IMPL(BGENTYPE, GENTYPE, UGENTYPE, GENSIZE) \ _CLC_OVERLOAD _CLC_DEF BGENTYPE __clc_upsample(GENTYPE hi, UGENTYPE lo) { \ diff --git a/libclc/clc/lib/generic/math/clc_acos.cl b/libclc/clc/lib/generic/math/clc_acos.cl index 822c3f9f13e8..526ee3b17649 100644 --- a/libclc/clc/lib/generic/math/clc_acos.cl +++ b/libclc/clc/lib/generic/math/clc_acos.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_acos.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_acosh.cl b/libclc/clc/lib/generic/math/clc_acosh.cl index a46606be5933..cc73b76dd32f 100644 --- a/libclc/clc/lib/generic/math/clc_acosh.cl +++ b/libclc/clc/lib/generic/math/clc_acosh.cl @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_ep_log.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_log1p.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_acosh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_acospi.cl b/libclc/clc/lib/generic/math/clc_acospi.cl index 22134d3209e6..b8100bbfd04b 100644 --- a/libclc/clc/lib/generic/math/clc_acospi.cl +++ b/libclc/clc/lib/generic/math/clc_acospi.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_acospi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_asin.cl b/libclc/clc/lib/generic/math/clc_asin.cl index 195ede3907f3..4abe4b6bcf10 100644 --- a/libclc/clc/lib/generic/math/clc_asin.cl +++ b/libclc/clc/lib/generic/math/clc_asin.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_asin.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_asinh.cl b/libclc/clc/lib/generic/math/clc_asinh.cl index 763efb4e76ac..5500f4748b14 100644 --- a/libclc/clc/lib/generic/math/clc_asinh.cl +++ b/libclc/clc/lib/generic/math/clc_asinh.cl @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_ep_log.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_log.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_asinh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_asinpi.cl b/libclc/clc/lib/generic/math/clc_asinpi.cl index bc680df5f9b2..cad756266bb0 100644 --- a/libclc/clc/lib/generic/math/clc_asinpi.cl +++ b/libclc/clc/lib/generic/math/clc_asinpi.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sqrt.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_asinpi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_atan.cl b/libclc/clc/lib/generic/math/clc_atan.cl index d960f75baca2..3219299dac2a 100644 --- a/libclc/clc/lib/generic/math/clc_atan.cl +++ b/libclc/clc/lib/generic/math/clc_atan.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atan.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_atan2.cl b/libclc/clc/lib/generic/math/clc_atan2.cl index b10bf32333a3..1ba6751f5a0f 100644 --- a/libclc/clc/lib/generic/math/clc_atan2.cl +++ b/libclc/clc/lib/generic/math/clc_atan2.cl @@ -6,21 +6,21 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_max.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atan2.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_atan2pi.cl b/libclc/clc/lib/generic/math/clc_atan2pi.cl index 7f75c11d15d7..cee4d8451d85 100644 --- a/libclc/clc/lib/generic/math/clc_atan2pi.cl +++ b/libclc/clc/lib/generic/math/clc_atan2pi.cl @@ -6,21 +6,21 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_max.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atan2pi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_atanh.cl b/libclc/clc/lib/generic/math/clc_atanh.cl index 485e72479bce..456a3ac2624c 100644 --- a/libclc/clc/lib/generic/math/clc_atanh.cl +++ b/libclc/clc/lib/generic/math/clc_atanh.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_log1p.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atanh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_atanpi.cl b/libclc/clc/lib/generic/math/clc_atanpi.cl index fee72aa7efb4..6ed7bdf1c780 100644 --- a/libclc/clc/lib/generic/math/clc_atanpi.cl +++ b/libclc/clc/lib/generic/math/clc_atanpi.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_atanpi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_cbrt.cl b/libclc/clc/lib/generic/math/clc_cbrt.cl index 935b7b7eae78..a3429483e0a6 100644 --- a/libclc/clc/lib/generic/math/clc_cbrt.cl +++ b/libclc/clc/lib/generic/math/clc_cbrt.cl @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_cbrt.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_cbrt.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_ceil.cl b/libclc/clc/lib/generic/math/clc_ceil.cl index e48ad1a482ef..97a0942d3eca 100644 --- a/libclc/clc/lib/generic/math/clc_ceil.cl +++ b/libclc/clc/lib/generic/math/clc_ceil.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_ceil #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_ceil -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_copysign.cl b/libclc/clc/lib/generic/math/clc_copysign.cl index 89829e2375ea..864d13b5bc5d 100644 --- a/libclc/clc/lib/generic/math/clc_copysign.cl +++ b/libclc/clc/lib/generic/math/clc_copysign.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_copysign #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_copysign -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_cos.cl b/libclc/clc/lib/generic/math/clc_cos.cl index 5529ec411a19..c6e9ed7d7f0a 100644 --- a/libclc/clc/lib/generic/math/clc_cos.cl +++ b/libclc/clc/lib/generic/math/clc_cos.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_cos.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_cosh.cl b/libclc/clc/lib/generic/math/clc_cosh.cl index 4da78de2714e..1a376685eeae 100644 --- a/libclc/clc/lib/generic/math/clc_cosh.cl +++ b/libclc/clc/lib/generic/math/clc_cosh.cl @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_cosh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_cospi.cl b/libclc/clc/lib/generic/math/clc_cospi.cl index 6a10171c723d..7ccaae340492 100644 --- a/libclc/clc/lib/generic/math/clc_cospi.cl +++ b/libclc/clc/lib/generic/math/clc_cospi.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_cospi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_div_cr.cl b/libclc/clc/lib/generic/math/clc_div_cr.cl index 00af7708e28a..32aa4595ff72 100644 --- a/libclc/clc/lib/generic/math/clc_div_cr.cl +++ b/libclc/clc/lib/generic/math/clc_div_cr.cl @@ -7,5 +7,5 @@ //===----------------------------------------------------------------------===// #include "clc/math/clc_div_cr.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_div_cr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_div_fast.cl b/libclc/clc/lib/generic/math/clc_div_fast.cl index b5c477cfcb7c..b9bc2234482d 100644 --- a/libclc/clc/lib/generic/math/clc_div_fast.cl +++ b/libclc/clc/lib/generic/math/clc_div_fast.cl @@ -9,5 +9,5 @@ #include "clc/math/clc_div_fast.h" #define __CLC_FUNCTION __clc_div_fast -#define __CLC_BODY -#include +#define __CLC_BODY "clc_div_fast.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_ep.cl b/libclc/clc/lib/generic/math/clc_ep.cl index 56d902fd9b2a..0e152e8bcd7e 100644 --- a/libclc/clc/lib/generic/math/clc_ep.cl +++ b/libclc/clc/lib/generic/math/clc_ep.cl @@ -19,5 +19,5 @@ #include "clc/relational/clc_isinf.h" #include "clc/relational/clc_signbit.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_ep.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_ep_log.cl b/libclc/clc/lib/generic/math/clc_ep_log.cl index c6782f77a16d..2d228a0dbf19 100644 --- a/libclc/clc/lib/generic/math/clc_ep_log.cl +++ b/libclc/clc/lib/generic/math/clc_ep_log.cl @@ -8,16 +8,16 @@ #ifdef cl_khr_fp64 -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_ep_log.h" +#include "clc/math/clc_fma.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" #pragma OPENCL EXTENSION cl_khr_fp64 : enable -#define __CLC_BODY -#include +#define __CLC_BODY "clc_ep_log.inc" +#include "clc/math/gentype.inc" #endif diff --git a/libclc/clc/lib/generic/math/clc_erf.cl b/libclc/clc/lib/generic/math/clc_erf.cl index 61a7c9d684aa..a2c1adbd3761 100644 --- a/libclc/clc/lib/generic/math/clc_erf.cl +++ b/libclc/clc/lib/generic/math/clc_erf.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" /* * ==================================================== @@ -507,5 +507,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_erf(half x) { #endif #define __CLC_FUNCTION __clc_erf -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize_loop.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_erfc.cl b/libclc/clc/lib/generic/math/clc_erfc.cl index 64cabb53bbe9..72733ee93647 100644 --- a/libclc/clc/lib/generic/math/clc_erfc.cl +++ b/libclc/clc/lib/generic/math/clc_erfc.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" /* * ==================================================== @@ -506,7 +506,7 @@ _CLC_OVERLOAD _CLC_DEF double __clc_erfc(double x) { #ifdef cl_khr_fp16 -#include +#include "clc/clc_convert.h" #pragma OPENCL EXTENSION cl_khr_fp16 : enable @@ -518,5 +518,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_erfc(half x) { #endif #define __CLC_FUNCTION __clc_erfc -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize_loop.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_exp.cl b/libclc/clc/lib/generic/math/clc_exp.cl index 6ff452721881..1e7174c7541c 100644 --- a/libclc/clc/lib/generic/math/clc_exp.cl +++ b/libclc/clc/lib/generic/math/clc_exp.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_exp_helper.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_exp.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_exp10.cl b/libclc/clc/lib/generic/math/clc_exp10.cl index 0c394ee19475..932ee0de64f2 100644 --- a/libclc/clc/lib/generic/math/clc_exp10.cl +++ b/libclc/clc/lib/generic/math/clc_exp10.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_subnormal_config.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_exp10.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_exp2.cl b/libclc/clc/lib/generic/math/clc_exp2.cl index 9635f84e5a9a..0516963ab620 100644 --- a/libclc/clc/lib/generic/math/clc_exp2.cl +++ b/libclc/clc/lib/generic/math/clc_exp2.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_exp_helper.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_rint.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_exp2.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_exp2_fast.cl b/libclc/clc/lib/generic/math/clc_exp2_fast.cl index e09bd65d7e02..980a4671a3b5 100644 --- a/libclc/clc/lib/generic/math/clc_exp2_fast.cl +++ b/libclc/clc/lib/generic/math/clc_exp2_fast.cl @@ -11,5 +11,5 @@ #define __CLC_FUNCTION __clc_exp2_fast #define __CLC_IMPL_FUNCTION(x) __clc_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" #include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_exp_helper.cl b/libclc/clc/lib/generic/math/clc_exp_helper.cl index 1670b73b6c98..106e2e0a6dd0 100644 --- a/libclc/clc/lib/generic/math/clc_exp_helper.cl +++ b/libclc/clc/lib/generic/math/clc_exp_helper.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isnan.h" #define __CLC_DOUBLE_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_exp_helper.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_expm1.cl b/libclc/clc/lib/generic/math/clc_expm1.cl index 8695b46eb90e..45ce92d70838 100644 --- a/libclc/clc/lib/generic/math/clc_expm1.cl +++ b/libclc/clc/lib/generic/math/clc_expm1.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_exp_helper.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_expm1.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fabs.cl b/libclc/clc/lib/generic/math/clc_fabs.cl index e0c7685bfdb6..f0fa5190d458 100644 --- a/libclc/clc/lib/generic/math/clc_fabs.cl +++ b/libclc/clc/lib/generic/math/clc_fabs.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_fabs #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_abs -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fdim.cl b/libclc/clc/lib/generic/math/clc_fdim.cl index a2b3adac29c1..465a12e26935 100644 --- a/libclc/clc/lib/generic/math/clc_fdim.cl +++ b/libclc/clc/lib/generic/math/clc_fdim.cl @@ -8,5 +8,5 @@ #include "clc/relational/clc_isunordered.h" -#define __CLC_BODY +#define __CLC_BODY "clc_fdim.inc" #include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_floor.cl b/libclc/clc/lib/generic/math/clc_floor.cl index f31bed2e9ee6..7f9619ca1e5f 100644 --- a/libclc/clc/lib/generic/math/clc_floor.cl +++ b/libclc/clc/lib/generic/math/clc_floor.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_floor #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_floor -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fma.cl b/libclc/clc/lib/generic/math/clc_fma.cl index 9527460cb2c6..2ac63927623d 100644 --- a/libclc/clc/lib/generic/math/clc_fma.cl +++ b/libclc/clc/lib/generic/math/clc_fma.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" +#include "clc/math/math.h" #define __CLC_FUNCTION __clc_fma #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_fma -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fmax.cl b/libclc/clc/lib/generic/math/clc_fmax.cl index 0fdbaa5eef5f..4677f5211f06 100644 --- a/libclc/clc/lib/generic/math/clc_fmax.cl +++ b/libclc/clc/lib/generic/math/clc_fmax.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_fmax #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_maximumnum -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fmin.cl b/libclc/clc/lib/generic/math/clc_fmin.cl index 572d54b128a6..63034dfd6138 100644 --- a/libclc/clc/lib/generic/math/clc_fmin.cl +++ b/libclc/clc/lib/generic/math/clc_fmin.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_fmin #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_minimumnum -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fmod.cl b/libclc/clc/lib/generic/math/clc_fmod.cl index 629c61074861..8add0cefd621 100644 --- a/libclc/clc/lib/generic/math/clc_fmod.cl +++ b/libclc/clc/lib/generic/math/clc_fmod.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_fmod #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_fmod -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_fract.cl b/libclc/clc/lib/generic/math/clc_fract.cl index 681077cb9c89..21a0dd289371 100644 --- a/libclc/clc/lib/generic/math/clc_fract.cl +++ b/libclc/clc/lib/generic/math/clc_fract.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_floor.h" +#include "clc/math/clc_fmin.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_fract.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_frexp.cl b/libclc/clc/lib/generic/math/clc_frexp.cl index 7ff292ebb75c..08af08e9e781 100644 --- a/libclc/clc/lib/generic/math/clc_frexp.cl +++ b/libclc/clc/lib/generic/math/clc_frexp.cl @@ -6,33 +6,33 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/clcfunc.h" +#include "clc/internal/clc.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" +#include "clc/utils.h" -#define __CLC_BODY +#define __CLC_BODY "clc_frexp.inc" #define __CLC_ADDRESS_SPACE private -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE -#define __CLC_BODY +#define __CLC_BODY "clc_frexp.inc" #define __CLC_ADDRESS_SPACE global -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE -#define __CLC_BODY +#define __CLC_BODY "clc_frexp.inc" #define __CLC_ADDRESS_SPACE local -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED -#define __CLC_BODY +#define __CLC_BODY "clc_frexp.inc" #define __CLC_ADDRESS_SPACE generic -#include +#include "clc/math/gentype.inc" #undef __CLC_ADDRESS_SPACE #endif diff --git a/libclc/clc/lib/generic/math/clc_frexp.inc b/libclc/clc/lib/generic/math/clc_frexp.inc index 763266bc0493..725de0697ba3 100644 --- a/libclc/clc/lib/generic/math/clc_frexp.inc +++ b/libclc/clc/lib/generic/math/clc_frexp.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #if __CLC_FPSIZE == 32 _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE diff --git a/libclc/clc/lib/generic/math/clc_half_cos.cl b/libclc/clc/lib/generic/math/clc_half_cos.cl index 4420ad31afae..6b942ea20201 100644 --- a/libclc/clc/lib/generic/math/clc_half_cos.cl +++ b/libclc/clc/lib/generic/math/clc_half_cos.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_cos.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_cos #define __CLC_IMPL_FUNCTION(x) __clc_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_divide.cl b/libclc/clc/lib/generic/math/clc_half_divide.cl index 16af197d29a7..7c6d902eb600 100644 --- a/libclc/clc/lib/generic/math/clc_half_divide.cl +++ b/libclc/clc/lib/generic/math/clc_half_divide.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_half_divide.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_exp.cl b/libclc/clc/lib/generic/math/clc_half_exp.cl index 4b4717672d36..0d640eabf66e 100644 --- a/libclc/clc/lib/generic/math/clc_half_exp.cl +++ b/libclc/clc/lib/generic/math/clc_half_exp.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp #define __CLC_IMPL_FUNCTION(x) __clc_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_exp10.cl b/libclc/clc/lib/generic/math/clc_half_exp10.cl index 5bacca1ee0b7..fc94c4dd56a4 100644 --- a/libclc/clc/lib/generic/math/clc_half_exp10.cl +++ b/libclc/clc/lib/generic/math/clc_half_exp10.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp10 #define __CLC_IMPL_FUNCTION(x) __clc_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_exp2.cl b/libclc/clc/lib/generic/math/clc_half_exp2.cl index 9a8f2f980c5a..b71caadadacf 100644 --- a/libclc/clc/lib/generic/math/clc_half_exp2.cl +++ b/libclc/clc/lib/generic/math/clc_half_exp2.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_exp2 #define __CLC_IMPL_FUNCTION(x) __clc_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_log.cl b/libclc/clc/lib/generic/math/clc_half_log.cl index 160b193e8040..446b5d6f0a03 100644 --- a/libclc/clc/lib/generic/math/clc_half_log.cl +++ b/libclc/clc/lib/generic/math/clc_half_log.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log #define __CLC_IMPL_FUNCTION(x) __clc_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_log10.cl b/libclc/clc/lib/generic/math/clc_half_log10.cl index 83d57db1bdf2..7787b5ce2462 100644 --- a/libclc/clc/lib/generic/math/clc_half_log10.cl +++ b/libclc/clc/lib/generic/math/clc_half_log10.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log10 #define __CLC_IMPL_FUNCTION(x) __clc_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_log2.cl b/libclc/clc/lib/generic/math/clc_half_log2.cl index 7de0053fd750..8ce86d3d208a 100644 --- a/libclc/clc/lib/generic/math/clc_half_log2.cl +++ b/libclc/clc/lib/generic/math/clc_half_log2.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_log2 #define __CLC_IMPL_FUNCTION(x) __clc_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_powr.cl b/libclc/clc/lib/generic/math/clc_half_powr.cl index 7065377ede66..4f87978daf7d 100644 --- a/libclc/clc/lib/generic/math/clc_half_powr.cl +++ b/libclc/clc/lib/generic/math/clc_half_powr.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_powr.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_powr #define __CLC_IMPL_FUNCTION(x) __clc_powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_recip.cl b/libclc/clc/lib/generic/math/clc_half_recip.cl index a988ad5e05a8..3d740c88a38d 100644 --- a/libclc/clc/lib/generic/math/clc_half_recip.cl +++ b/libclc/clc/lib/generic/math/clc_half_recip.cl @@ -7,6 +7,6 @@ //===----------------------------------------------------------------------===// #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_half_recip.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_rsqrt.cl b/libclc/clc/lib/generic/math/clc_half_rsqrt.cl index 4e0cdd252f65..eed38f1f679c 100644 --- a/libclc/clc/lib/generic/math/clc_half_rsqrt.cl +++ b/libclc/clc/lib/generic/math/clc_half_rsqrt.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_rsqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_rsqrt #define __CLC_IMPL_FUNCTION(x) __clc_rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_sin.cl b/libclc/clc/lib/generic/math/clc_half_sin.cl index acc5d43156ab..96fc3900efce 100644 --- a/libclc/clc/lib/generic/math/clc_half_sin.cl +++ b/libclc/clc/lib/generic/math/clc_half_sin.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sin.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_sin #define __CLC_IMPL_FUNCTION(x) __clc_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_sqrt.cl b/libclc/clc/lib/generic/math/clc_half_sqrt.cl index 01e779960df6..db6f1f4eba29 100644 --- a/libclc/clc/lib/generic/math/clc_half_sqrt.cl +++ b/libclc/clc/lib/generic/math/clc_half_sqrt.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_sqrt #define __CLC_IMPL_FUNCTION(x) __clc_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_half_tan.cl b/libclc/clc/lib/generic/math/clc_half_tan.cl index 1427fe02555f..f0a90db32375 100644 --- a/libclc/clc/lib/generic/math/clc_half_tan.cl +++ b/libclc/clc/lib/generic/math/clc_half_tan.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_tan.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_half_tan #define __CLC_IMPL_FUNCTION(x) __clc_tan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_hypot.cl b/libclc/clc/lib/generic/math/clc_hypot.cl index bac8339ee282..b609d680fe7f 100644 --- a/libclc/clc/lib/generic/math/clc_hypot.cl +++ b/libclc/clc/lib/generic/math/clc_hypot.cl @@ -19,5 +19,5 @@ #include "clc/relational/clc_isinf.h" #include "clc/relational/clc_isunordered.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_hypot.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_ilogb.cl b/libclc/clc/lib/generic/math/clc_ilogb.cl index e96e547d2b6a..99b25fae6fe9 100644 --- a/libclc/clc/lib/generic/math/clc_ilogb.cl +++ b/libclc/clc/lib/generic/math/clc_ilogb.cl @@ -16,5 +16,5 @@ #include "clc/relational/clc_isnan.h" #include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_ilogb.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_ldexp.cl b/libclc/clc/lib/generic/math/clc_ldexp.cl index f9252a75ab4b..a2a0e82b7f4e 100644 --- a/libclc/clc/lib/generic/math/clc_ldexp.cl +++ b/libclc/clc/lib/generic/math/clc_ldexp.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/integer/clc_add_sat.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_subnormal_config.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_clamp.h" _CLC_DEF _CLC_OVERLOAD float __clc_ldexp(float x, int n) { @@ -130,5 +130,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_ldexp(half x, int n) { #define __CLC_FUNCTION __clc_ldexp #define __CLC_ARG2_TYPE int -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_lgamma.cl b/libclc/clc/lib/generic/math/clc_lgamma.cl index ca8f589c3b43..6ebd3166dfdc 100644 --- a/libclc/clc/lib/generic/math/clc_lgamma.cl +++ b/libclc/clc/lib/generic/math/clc_lgamma.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_lgamma_r.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_lgamma.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_lgamma_r.cl b/libclc/clc/lib/generic/math/clc_lgamma_r.cl index 2322ad54508f..929aadeb5357 100644 --- a/libclc/clc/lib/generic/math/clc_lgamma_r.cl +++ b/libclc/clc/lib/generic/math/clc_lgamma_r.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_log.h" +#include "clc/math/clc_mad.h" +#include "clc/math/clc_sinpi.h" +#include "clc/math/math.h" // ==================================================== // Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -597,25 +597,25 @@ _CLC_OVERLOAD _CLC_DEF half __clc_lgamma_r(half x, private int *iptr) { #define __CLC_FUNCTION __clc_lgamma_r #define __CLC_ARG2_TYPE int #define __CLC_ADDRSPACE private -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_with_ptr_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_ADDRSPACE #undef __CLC_ARG2_TYPE #undef __CLC_FUNCTION #define __CLC_ADDRSPACE global -#define __CLC_BODY -#include +#define __CLC_BODY "clc_lgamma_r.inc" +#include "clc/math/gentype.inc" #undef __CLC_ADDRSPACE #define __CLC_ADDRSPACE local -#define __CLC_BODY -#include +#define __CLC_BODY "clc_lgamma_r.inc" +#include "clc/math/gentype.inc" #undef __CLC_ADDRSPACE #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED #define __CLC_ADDRSPACE generic -#define __CLC_BODY -#include +#define __CLC_BODY "clc_lgamma_r.inc" +#include "clc/math/gentype.inc" #undef __CLC_ADDRSPACE #endif diff --git a/libclc/clc/lib/generic/math/clc_log.cl b/libclc/clc/lib/generic/math/clc_log.cl index 74ee1ed71375..ab7cdc07cd4c 100644 --- a/libclc/clc/lib/generic/math/clc_log.cl +++ b/libclc/clc/lib/generic/math/clc_log.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_log2.h" /* *log(x) = log2(x) * (1/log2(e)) @@ -39,5 +39,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_log(half x) { #endif // cl_khr_fp16 #define __CLC_FUNCTION __clc_log -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_log10.cl b/libclc/clc/lib/generic/math/clc_log10.cl index 741d21b5d831..71665cdaf8ef 100644 --- a/libclc/clc/lib/generic/math/clc_log10.cl +++ b/libclc/clc/lib/generic/math/clc_log10.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/tables.h" #ifdef cl_khr_fp64 #pragma OPENCL EXTENSION cl_khr_fp64 : enable @@ -22,5 +22,5 @@ #undef COMPILING_LOG10 #define __CLC_FUNCTION __clc_log10 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_log1p.cl b/libclc/clc/lib/generic/math/clc_log1p.cl index 71ccba79a728..6c32c1ffc361 100644 --- a/libclc/clc/lib/generic/math/clc_log1p.cl +++ b/libclc/clc/lib/generic/math/clc_log1p.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_log1p.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_log2.cl b/libclc/clc/lib/generic/math/clc_log2.cl index 432ea5737bc2..76819eaab620 100644 --- a/libclc/clc/lib/generic/math/clc_log2.cl +++ b/libclc/clc/lib/generic/math/clc_log2.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/tables.h" #ifdef cl_khr_fp64 #pragma OPENCL EXTENSION cl_khr_fp64 : enable @@ -22,5 +22,5 @@ #undef COMPILING_LOG2 #define __CLC_FUNCTION __clc_log2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_log2_fast.cl b/libclc/clc/lib/generic/math/clc_log2_fast.cl index 2aad63967e88..6913b59010b9 100644 --- a/libclc/clc/lib/generic/math/clc_log2_fast.cl +++ b/libclc/clc/lib/generic/math/clc_log2_fast.cl @@ -11,5 +11,5 @@ #define __CLC_FUNCTION __clc_log2_fast #define __CLC_IMPL_FUNCTION(x) __clc_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" #include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_log_base.h b/libclc/clc/lib/generic/math/clc_log_base.h index 51c92fafdad2..d016f68a6b65 100644 --- a/libclc/clc/lib/generic/math/clc_log_base.h +++ b/libclc/clc/lib/generic/math/clc_log_base.h @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/math/clc_ep.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_frexp.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" /* Algorithm: diff --git a/libclc/clc/lib/generic/math/clc_logb.cl b/libclc/clc/lib/generic/math/clc_logb.cl index d966cca48387..329975c060aa 100644 --- a/libclc/clc/lib/generic/math/clc_logb.cl +++ b/libclc/clc/lib/generic/math/clc_logb.cl @@ -16,5 +16,5 @@ #include "clc/relational/clc_isfinite.h" #include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_logb.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_mad.cl b/libclc/clc/lib/generic/math/clc_mad.cl index f8b04f90c858..5ca5d6562a01 100644 --- a/libclc/clc/lib/generic/math/clc_mad.cl +++ b/libclc/clc/lib/generic/math/clc_mad.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_mad.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_maxmag.cl b/libclc/clc/lib/generic/math/clc_maxmag.cl index fd457db0c509..496b54c3c717 100644 --- a/libclc/clc/lib/generic/math/clc_maxmag.cl +++ b/libclc/clc/lib/generic/math/clc_maxmag.cl @@ -9,5 +9,5 @@ #include "clc/math/clc_fabs.h" #include "clc/math/clc_fmax.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_maxmag.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_minmag.cl b/libclc/clc/lib/generic/math/clc_minmag.cl index b0d7a9272929..b00360f333a2 100644 --- a/libclc/clc/lib/generic/math/clc_minmag.cl +++ b/libclc/clc/lib/generic/math/clc_minmag.cl @@ -9,5 +9,5 @@ #include "clc/math/clc_fabs.h" #include "clc/math/clc_fmin.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_minmag.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_modf.cl b/libclc/clc/lib/generic/math/clc_modf.cl index dd8ac493ddf9..8657ac87b422 100644 --- a/libclc/clc/lib/generic/math/clc_modf.cl +++ b/libclc/clc/lib/generic/math/clc_modf.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_trunc.h" +#include "clc/math/math.h" +#include "clc/relational/clc_isinf.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_modf.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_nan.cl b/libclc/clc/lib/generic/math/clc_nan.cl index 0d480175b9c5..e252b84cfa7a 100644 --- a/libclc/clc/lib/generic/math/clc_nan.cl +++ b/libclc/clc/lib/generic/math/clc_nan.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/utils.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_nan.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_cos.cl b/libclc/clc/lib/generic/math/clc_native_cos.cl index 4e9a6c91b426..3922a8ef784e 100644 --- a/libclc/clc/lib/generic/math/clc_native_cos.cl +++ b/libclc/clc/lib/generic/math/clc_native_cos.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_cos #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_divide.cl b/libclc/clc/lib/generic/math/clc_native_divide.cl index abec9add4fd6..36b3d6218103 100644 --- a/libclc/clc/lib/generic/math/clc_native_divide.cl +++ b/libclc/clc/lib/generic/math/clc_native_divide.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_native_divide.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_exp.cl b/libclc/clc/lib/generic/math/clc_native_exp.cl index 63b4e5691397..89cef355f691 100644 --- a/libclc/clc/lib/generic/math/clc_native_exp.cl +++ b/libclc/clc/lib/generic/math/clc_native_exp.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_exp #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_exp10.cl b/libclc/clc/lib/generic/math/clc_native_exp10.cl index 2819cd59c4be..d42b6ec8b835 100644 --- a/libclc/clc/lib/generic/math/clc_native_exp10.cl +++ b/libclc/clc/lib/generic/math/clc_native_exp10.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_native_exp2.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_native_exp10.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_exp2.cl b/libclc/clc/lib/generic/math/clc_native_exp2.cl index a995b0347cac..2574ad98f12b 100644 --- a/libclc/clc/lib/generic/math/clc_native_exp2.cl +++ b/libclc/clc/lib/generic/math/clc_native_exp2.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_exp2 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_log.cl b/libclc/clc/lib/generic/math/clc_native_log.cl index 617908277fb6..b62a768bb62b 100644 --- a/libclc/clc/lib/generic/math/clc_native_log.cl +++ b/libclc/clc/lib/generic/math/clc_native_log.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_log10.cl b/libclc/clc/lib/generic/math/clc_native_log10.cl index 0558f8cb7049..bc7865a2e14c 100644 --- a/libclc/clc/lib/generic/math/clc_native_log10.cl +++ b/libclc/clc/lib/generic/math/clc_native_log10.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log10 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_log2.cl b/libclc/clc/lib/generic/math/clc_native_log2.cl index c897ac07acb4..6f67bf85e341 100644 --- a/libclc/clc/lib/generic/math/clc_native_log2.cl +++ b/libclc/clc/lib/generic/math/clc_native_log2.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_log2 #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_powr.cl b/libclc/clc/lib/generic/math/clc_native_powr.cl index dac9b7edf78b..5c6937ff3428 100644 --- a/libclc/clc/lib/generic/math/clc_native_powr.cl +++ b/libclc/clc/lib/generic/math/clc_native_powr.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_native_exp2.h" +#include "clc/math/clc_native_log2.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_native_powr.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_recip.cl b/libclc/clc/lib/generic/math/clc_native_recip.cl index 75d832c8467e..9826af2e3d4f 100644 --- a/libclc/clc/lib/generic/math/clc_native_recip.cl +++ b/libclc/clc/lib/generic/math/clc_native_recip.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_native_recip.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_rsqrt.cl b/libclc/clc/lib/generic/math/clc_native_rsqrt.cl index 9b88e72126f8..619f8c45f8bd 100644 --- a/libclc/clc/lib/generic/math/clc_native_rsqrt.cl +++ b/libclc/clc/lib/generic/math/clc_native_rsqrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_native_sqrt.h" -#define __CLC_BODY +#define __CLC_BODY "clc_native_rsqrt.inc" #define __CLC_FLOAT_ONLY -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_sin.cl b/libclc/clc/lib/generic/math/clc_native_sin.cl index 941342f387a1..e395030ca6e1 100644 --- a/libclc/clc/lib/generic/math/clc_native_sin.cl +++ b/libclc/clc/lib/generic/math/clc_native_sin.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_sin #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_sqrt.cl b/libclc/clc/lib/generic/math/clc_native_sqrt.cl index cc18a4b7ba1d..85110e5389db 100644 --- a/libclc/clc/lib/generic/math/clc_native_sqrt.cl +++ b/libclc/clc/lib/generic/math/clc_native_sqrt.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_native_sqrt #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_native_tan.cl b/libclc/clc/lib/generic/math/clc_native_tan.cl index 6b69067be388..4915d1579f14 100644 --- a/libclc/clc/lib/generic/math/clc_native_tan.cl +++ b/libclc/clc/lib/generic/math/clc_native_tan.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_native_cos.h" +#include "clc/math/clc_native_sin.h" #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_native_tan.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_nextafter.cl b/libclc/clc/lib/generic/math/clc_nextafter.cl index e68b95f0b6ac..0470361d4f6d 100644 --- a/libclc/clc/lib/generic/math/clc_nextafter.cl +++ b/libclc/clc/lib/generic/math/clc_nextafter.cl @@ -12,5 +12,5 @@ #include "clc/math/clc_nextup.h" #include "clc/relational/clc_isunordered.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_nextafter.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_nextdown.cl b/libclc/clc/lib/generic/math/clc_nextdown.cl index ed8728e25e59..87943037e7b1 100644 --- a/libclc/clc/lib/generic/math/clc_nextdown.cl +++ b/libclc/clc/lib/generic/math/clc_nextdown.cl @@ -11,5 +11,5 @@ #include "clc/math/clc_nextdown.h" #include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_nextdown.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_nextup.cl b/libclc/clc/lib/generic/math/clc_nextup.cl index bc86665923e2..309852f313f9 100644 --- a/libclc/clc/lib/generic/math/clc_nextup.cl +++ b/libclc/clc/lib/generic/math/clc_nextup.cl @@ -10,5 +10,5 @@ #include "clc/math/clc_nextup.h" #include "clc/relational/clc_isnan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_nextup.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_powr.cl b/libclc/clc/lib/generic/math/clc_powr.cl index fc153dfebf9a..47618ecdf4e6 100644 --- a/libclc/clc/lib/generic/math/clc_powr.cl +++ b/libclc/clc/lib/generic/math/clc_powr.cl @@ -26,7 +26,7 @@ #include "clc/relational/clc_isunordered.h" #define __CLC_COMPILING_POWR -#define __CLC_BODY +#define __CLC_BODY "clc_pow_base.inc" #include "clc/math/gentype.inc" #define __CLC_FUNCTION __clc_powr diff --git a/libclc/clc/lib/generic/math/clc_recip_fast.cl b/libclc/clc/lib/generic/math/clc_recip_fast.cl index 779acf807888..32a52cf97b8e 100644 --- a/libclc/clc/lib/generic/math/clc_recip_fast.cl +++ b/libclc/clc/lib/generic/math/clc_recip_fast.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_recip_fast -#define __CLC_BODY +#define __CLC_BODY "clc_recip_fast.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_remainder.cl b/libclc/clc/lib/generic/math/clc_remainder.cl index 622f05f85100..f1dba87ee5b4 100644 --- a/libclc/clc/lib/generic/math/clc_remainder.cl +++ b/libclc/clc/lib/generic/math/clc_remainder.cl @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/clc_clz.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_floor.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_remainder.h" +#include "clc/math/clc_trunc.h" +#include "clc/math/math.h" +#include "clc/shared/clc_max.h" _CLC_DEF _CLC_OVERLOAD float __clc_remainder(float x, float y) { int ux = __clc_as_int(x); @@ -75,8 +75,8 @@ _CLC_DEF _CLC_OVERLOAD float __clc_remainder(float x, float y) { #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __clc_remainder -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #ifdef cl_khr_fp64 @@ -213,8 +213,8 @@ _CLC_DEF _CLC_OVERLOAD double __clc_remainder(double x, double y) { #define __CLC_DOUBLE_ONLY #define __CLC_FUNCTION __clc_remainder -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_scalarize.inc" +#include "clc/math/gentype.inc" #undef __CLC_FUNCTION #endif @@ -226,7 +226,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_remainder(double x, double y) { // Forward the half version of this builtin onto the float one #define __CLC_HALF_ONLY #define __CLC_FUNCTION __clc_remainder -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/binary_def_via_fp32.inc" +#include "clc/math/gentype.inc" #endif diff --git a/libclc/clc/lib/generic/math/clc_remquo.cl b/libclc/clc/lib/generic/math/clc_remquo.cl index fd83ead06d89..6f6a7fc6bdcf 100644 --- a/libclc/clc/lib/generic/math/clc_remquo.cl +++ b/libclc/clc/lib/generic/math/clc_remquo.cl @@ -6,31 +6,31 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/integer/clc_clz.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_floor.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_ldexp.h" +#include "clc/math/clc_subnormal_config.h" +#include "clc/math/clc_trunc.h" +#include "clc/math/math.h" +#include "clc/shared/clc_max.h" #define __CLC_ADDRESS_SPACE private -#include +#include "clc_remquo.inc" #undef __CLC_ADDRESS_SPACE #define __CLC_ADDRESS_SPACE global -#include +#include "clc_remquo.inc" #undef __CLC_ADDRESS_SPACE #define __CLC_ADDRESS_SPACE local -#include +#include "clc_remquo.inc" #undef __CLC_ADDRESS_SPACE #if _CLC_DISTINCT_GENERIC_AS_SUPPORTED #define __CLC_ADDRESS_SPACE generic -#include +#include "clc_remquo.inc" #undef __CLC_ADDRESS_SPACE #endif diff --git a/libclc/clc/lib/generic/math/clc_rint.cl b/libclc/clc/lib/generic/math/clc_rint.cl index e3aaae0ffec6..749a26e6923f 100644 --- a/libclc/clc/lib/generic/math/clc_rint.cl +++ b/libclc/clc/lib/generic/math/clc_rint.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_rint #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_rint -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_rootn.cl b/libclc/clc/lib/generic/math/clc_rootn.cl index 8dac54f239cd..4f410c51b88c 100644 --- a/libclc/clc/lib/generic/math/clc_rootn.cl +++ b/libclc/clc/lib/generic/math/clc_rootn.cl @@ -24,8 +24,8 @@ #include "clc/relational/clc_isunordered.h" #define __CLC_COMPILING_ROOTN -#define __CLC_BODY -#include +#define __CLC_BODY "clc_pow_base.inc" +#include "clc/math/gentype.inc" #define __CLC_FUNCTION __clc_rootn #define __CLC_ARG2_SCALAR_TYPE int diff --git a/libclc/clc/lib/generic/math/clc_round.cl b/libclc/clc/lib/generic/math/clc_round.cl index 5ed8d08ba4f4..49e3e256126a 100644 --- a/libclc/clc/lib/generic/math/clc_round.cl +++ b/libclc/clc/lib/generic/math/clc_round.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_round #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_round -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_rsqrt.cl b/libclc/clc/lib/generic/math/clc_rsqrt.cl index 92a3d06f46ea..ef17b4926dd5 100644 --- a/libclc/clc/lib/generic/math/clc_rsqrt.cl +++ b/libclc/clc/lib/generic/math/clc_rsqrt.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_rsqrt.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sin.cl b/libclc/clc/lib/generic/math/clc_sin.cl index 99338c95eb60..ec8727f71784 100644 --- a/libclc/clc/lib/generic/math/clc_sin.cl +++ b/libclc/clc/lib/generic/math/clc_sin.cl @@ -6,18 +6,18 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/clc_trunc.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" +#include "clc/shared/clc_max.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sin.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sincos.cl b/libclc/clc/lib/generic/math/clc_sincos.cl index 2209a41593a2..6efe59cadea7 100644 --- a/libclc/clc/lib/generic/math/clc_sincos.cl +++ b/libclc/clc/lib/generic/math/clc_sincos.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_cos.h" +#include "clc/math/clc_sin.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sincos.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl index 675f48059514..70d9cb980ccd 100644 --- a/libclc/clc/lib/generic/math/clc_sincos_helpers.cl +++ b/libclc/clc/lib/generic/math/clc_sincos_helpers.cl @@ -6,32 +6,32 @@ // //===----------------------------------------------------------------------===// +#include "clc/clc_convert.h" +#include "clc/integer/clc_clz.h" +#include "clc/integer/clc_mul_hi.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fma.h" #include "clc/math/clc_frexp.h" #include "clc/math/clc_ldexp.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/math/clc_mad.h" +#include "clc/math/clc_native_divide.h" +#include "clc/math/clc_trunc.h" +#include "clc/math/math.h" #define bitalign(hi, lo, shift) __builtin_elementwise_fshr(hi, lo, shift) #define __CLC_FLOAT_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_sincos_helpers.inc" -#include +#include "clc/math/gentype.inc" #ifdef cl_khr_fp64 #pragma OPENCL EXTENSION cl_khr_fp64 : enable -#include -#include -#include +#include "clc/math/clc_fract.h" +#include "clc/math/tables.h" +#include "clc/shared/clc_max.h" #define bytealign(src0, src1, src2) \ (__CLC_CONVERT_UINTN( \ @@ -39,8 +39,8 @@ (((src2) & 3) * 8))) #define __CLC_DOUBLE_ONLY -#define __CLC_BODY +#define __CLC_BODY "clc_sincos_helpers_fp64.inc" -#include +#include "clc/math/gentype.inc" #endif diff --git a/libclc/clc/lib/generic/math/clc_sinh.cl b/libclc/clc/lib/generic/math/clc_sinh.cl index bd0b488b1604..7252679235cc 100644 --- a/libclc/clc/lib/generic/math/clc_sinh.cl +++ b/libclc/clc/lib/generic/math/clc_sinh.cl @@ -6,18 +6,18 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sinh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sinpi.cl b/libclc/clc/lib/generic/math/clc_sinpi.cl index bb5de09f03c0..f9bed7ec7830 100644 --- a/libclc/clc/lib/generic/math/clc_sinpi.cl +++ b/libclc/clc/lib/generic/math/clc_sinpi.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sinpi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sqrt.cl b/libclc/clc/lib/generic/math/clc_sqrt.cl index 3fa82fdd714b..1dd5dd298a35 100644 --- a/libclc/clc/lib/generic/math/clc_sqrt.cl +++ b/libclc/clc/lib/generic/math/clc_sqrt.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sqrt.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sqrt_cr.cl b/libclc/clc/lib/generic/math/clc_sqrt_cr.cl index fd98fb3f6a80..2f913458447c 100644 --- a/libclc/clc/lib/generic/math/clc_sqrt_cr.cl +++ b/libclc/clc/lib/generic/math/clc_sqrt_cr.cl @@ -7,5 +7,5 @@ //===----------------------------------------------------------------------===// #include "clc/math/clc_sqrt_cr.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_sqrt_cr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_sqrt_fast.cl b/libclc/clc/lib/generic/math/clc_sqrt_fast.cl index 89a478ac8090..f46273e30db9 100644 --- a/libclc/clc/lib/generic/math/clc_sqrt_fast.cl +++ b/libclc/clc/lib/generic/math/clc_sqrt_fast.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_sqrt_fast #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_tables.cl b/libclc/clc/lib/generic/math/clc_tables.cl index 67a17525014d..43fa7387431d 100644 --- a/libclc/clc/lib/generic/math/clc_tables.cl +++ b/libclc/clc/lib/generic/math/clc_tables.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/tables.h" __CLC_DECLARE_TABLE(float, LOG_INV_TBL_EP_HEAD, 129) = { 0x1.000000p+1f, 0x1.fc0000p+0f, 0x1.f80000p+0f, 0x1.f40000p+0f, diff --git a/libclc/clc/lib/generic/math/clc_tan.cl b/libclc/clc/lib/generic/math/clc_tan.cl index 7e68216ca43a..30b56d756f4f 100644 --- a/libclc/clc/lib/generic/math/clc_tan.cl +++ b/libclc/clc/lib/generic/math/clc_tan.cl @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/relational/clc_select.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_tan.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_tanh.cl b/libclc/clc/lib/generic/math/clc_tanh.cl index aedcb0c38d5e..c0e6f60f6fe4 100644 --- a/libclc/clc/lib/generic/math/clc_tanh.cl +++ b/libclc/clc/lib/generic/math/clc_tanh.cl @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fma.h" +#include "clc/math/clc_mad.h" +#include "clc/math/math.h" +#include "clc/math/tables.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_tanh.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_tanpi.cl b/libclc/clc/lib/generic/math/clc_tanpi.cl index 099457c18631..a75b5446a255 100644 --- a/libclc/clc/lib/generic/math/clc_tanpi.cl +++ b/libclc/clc/lib/generic/math/clc_tanpi.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_convert.h" +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_native_recip.h" +#include "clc/math/clc_sincos_helpers.h" +#include "clc/math/math.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_tanpi.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_tgamma.cl b/libclc/clc/lib/generic/math/clc_tgamma.cl index c379cd16b5a6..0631028b6ce2 100644 --- a/libclc/clc/lib/generic/math/clc_tgamma.cl +++ b/libclc/clc/lib/generic/math/clc_tgamma.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_exp.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_lgamma.h" +#include "clc/math/clc_sinpi.h" +#include "clc/math/math.h" _CLC_OVERLOAD _CLC_DEF float __clc_tgamma(float x) { const float pi = 3.1415926535897932384626433832795f; @@ -66,5 +66,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_tgamma(half x) { #endif #define __CLC_FUNCTION __clc_tgamma -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/math/clc_trunc.cl b/libclc/clc/lib/generic/math/clc_trunc.cl index d9c54a1888d9..30281b686636 100644 --- a/libclc/clc/lib/generic/math/clc_trunc.cl +++ b/libclc/clc/lib/generic/math/clc_trunc.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define __CLC_FUNCTION __clc_trunc #define __CLC_IMPL_FUNCTION(x) __builtin_elementwise_trunc -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/mem_fence/clc_mem_fence.cl b/libclc/clc/lib/generic/mem_fence/clc_mem_fence.cl index 5c5185292184..ded413308e56 100644 --- a/libclc/clc/lib/generic/mem_fence/clc_mem_fence.cl +++ b/libclc/clc/lib/generic/mem_fence/clc_mem_fence.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/mem_fence/clc_mem_fence.h" _CLC_OVERLOAD _CLC_DEF void __clc_mem_fence(int memory_scope, int memory_order, diff --git a/libclc/clc/lib/generic/misc/clc_shuffle.cl b/libclc/clc/lib/generic/misc/clc_shuffle.cl index bd7a6a18a603..f1dbfff38d67 100644 --- a/libclc/clc/lib/generic/misc/clc_shuffle.cl +++ b/libclc/clc/lib/generic/misc/clc_shuffle.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define _CLC_ELEMENT_CASES2(VAR) \ case 0: \ diff --git a/libclc/clc/lib/generic/misc/clc_shuffle2.cl b/libclc/clc/lib/generic/misc/clc_shuffle2.cl index 786c2b6b6afd..af255946ebdf 100644 --- a/libclc/clc/lib/generic/misc/clc_shuffle2.cl +++ b/libclc/clc/lib/generic/misc/clc_shuffle2.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define _CLC_ELEMENT_CASES2(VAR) \ case 0: \ diff --git a/libclc/clc/lib/generic/relational/clc_all.cl b/libclc/clc/lib/generic/relational/clc_all.cl index 29f6d6836677..eee7e19b41b0 100644 --- a/libclc/clc/lib/generic/relational/clc_all.cl +++ b/libclc/clc/lib/generic/relational/clc_all.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define _CLC_ALL(v) (((v) >> ((sizeof(v) * 8) - 1)) & 0x1) diff --git a/libclc/clc/lib/generic/relational/clc_any.cl b/libclc/clc/lib/generic/relational/clc_any.cl index dc04ac5ae58a..0162e413d973 100644 --- a/libclc/clc/lib/generic/relational/clc_any.cl +++ b/libclc/clc/lib/generic/relational/clc_any.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" #define _CLC_ANY(v) (((v) >> ((sizeof(v) * 8) - 1)) & 0x1) diff --git a/libclc/clc/lib/generic/relational/clc_bitselect.cl b/libclc/clc/lib/generic/relational/clc_bitselect.cl index b58fb8d3233f..1b64066f215f 100644 --- a/libclc/clc/lib/generic/relational/clc_bitselect.cl +++ b/libclc/clc/lib/generic/relational/clc_bitselect.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_bitselect.inc" +#include "clc/integer/gentype.inc" #define __CLC_FLOAT_BITSELECT(f_type, i_type, width) \ _CLC_OVERLOAD _CLC_DEF f_type##width __clc_bitselect( \ diff --git a/libclc/clc/lib/generic/relational/clc_isequal.cl b/libclc/clc/lib/generic/relational/clc_isequal.cl index 8ee9d153d30c..981735f091e4 100644 --- a/libclc/clc/lib/generic/relational/clc_isequal.cl +++ b/libclc/clc/lib/generic/relational/clc_isequal.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) == (Y) diff --git a/libclc/clc/lib/generic/relational/clc_isfinite.cl b/libclc/clc/lib/generic/relational/clc_isfinite.cl index 9963e2e7dc53..dbd181e29aa1 100644 --- a/libclc/clc/lib/generic/relational/clc_isfinite.cl +++ b/libclc/clc/lib/generic/relational/clc_isfinite.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" _CLC_DEFINE_ISFPCLASS(int, int, __clc_isfinite, fcFinite, float) diff --git a/libclc/clc/lib/generic/relational/clc_isgreater.cl b/libclc/clc/lib/generic/relational/clc_isgreater.cl index 2f7a3a56faf6..9ae03bc5643a 100644 --- a/libclc/clc/lib/generic/relational/clc_isgreater.cl +++ b/libclc/clc/lib/generic/relational/clc_isgreater.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) > (Y) diff --git a/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl b/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl index 17cb75590892..d221c994c156 100644 --- a/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl +++ b/libclc/clc/lib/generic/relational/clc_isgreaterequal.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) >= (Y) diff --git a/libclc/clc/lib/generic/relational/clc_isinf.cl b/libclc/clc/lib/generic/relational/clc_isinf.cl index de0d0f658ebe..62bb8ed06345 100644 --- a/libclc/clc/lib/generic/relational/clc_isinf.cl +++ b/libclc/clc/lib/generic/relational/clc_isinf.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" _CLC_DEFINE_ISFPCLASS(int, int, __clc_isinf, fcInf, float) diff --git a/libclc/clc/lib/generic/relational/clc_isless.cl b/libclc/clc/lib/generic/relational/clc_isless.cl index 71ee5b0a0756..186dc1ab2faa 100644 --- a/libclc/clc/lib/generic/relational/clc_isless.cl +++ b/libclc/clc/lib/generic/relational/clc_isless.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) < (Y) diff --git a/libclc/clc/lib/generic/relational/clc_islessequal.cl b/libclc/clc/lib/generic/relational/clc_islessequal.cl index eec8c1a89fcc..766fb6bb5e3f 100644 --- a/libclc/clc/lib/generic/relational/clc_islessequal.cl +++ b/libclc/clc/lib/generic/relational/clc_islessequal.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) <= (Y) diff --git a/libclc/clc/lib/generic/relational/clc_islessgreater.cl b/libclc/clc/lib/generic/relational/clc_islessgreater.cl index da7cf17d2aab..bde1dfe2107a 100644 --- a/libclc/clc/lib/generic/relational/clc_islessgreater.cl +++ b/libclc/clc/lib/generic/relational/clc_islessgreater.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) ((X) < (Y)) || ((X) > (Y)) diff --git a/libclc/clc/lib/generic/relational/clc_isnan.cl b/libclc/clc/lib/generic/relational/clc_isnan.cl index c01d6122c967..ba97f88ce76f 100644 --- a/libclc/clc/lib/generic/relational/clc_isnan.cl +++ b/libclc/clc/lib/generic/relational/clc_isnan.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" _CLC_DEFINE_ISFPCLASS(int, int, __clc_isnan, fcNan, float) diff --git a/libclc/clc/lib/generic/relational/clc_isnormal.cl b/libclc/clc/lib/generic/relational/clc_isnormal.cl index 9fabd19e74ce..3c1d363ad389 100644 --- a/libclc/clc/lib/generic/relational/clc_isnormal.cl +++ b/libclc/clc/lib/generic/relational/clc_isnormal.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" _CLC_DEFINE_ISFPCLASS(int, int, __clc_isnormal, fcNormal, float) diff --git a/libclc/clc/lib/generic/relational/clc_isnotequal.cl b/libclc/clc/lib/generic/relational/clc_isnotequal.cl index 3b5af6f0095c..c6c1a486a094 100644 --- a/libclc/clc/lib/generic/relational/clc_isnotequal.cl +++ b/libclc/clc/lib/generic/relational/clc_isnotequal.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) (X) != (Y) diff --git a/libclc/clc/lib/generic/relational/clc_isordered.cl b/libclc/clc/lib/generic/relational/clc_isordered.cl index 112bec568dbe..e6d11b26721a 100644 --- a/libclc/clc/lib/generic/relational/clc_isordered.cl +++ b/libclc/clc/lib/generic/relational/clc_isordered.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/clc_isequal.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) \ __clc_isequal((X), (X)) && __clc_isequal((Y), (Y)) diff --git a/libclc/clc/lib/generic/relational/clc_issubnormal.cl b/libclc/clc/lib/generic/relational/clc_issubnormal.cl index cdbae69ee0c9..d311d6683ef3 100644 --- a/libclc/clc/lib/generic/relational/clc_issubnormal.cl +++ b/libclc/clc/lib/generic/relational/clc_issubnormal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/clc_issubnormal.h" +#include "clc/relational/relational.h" _CLC_DEFINE_ISFPCLASS(int, int, __clc_issubnormal, fcSubnormal, float) diff --git a/libclc/clc/lib/generic/relational/clc_isunordered.cl b/libclc/clc/lib/generic/relational/clc_isunordered.cl index 1a7c0c1387dd..9b9669b21734 100644 --- a/libclc/clc/lib/generic/relational/clc_isunordered.cl +++ b/libclc/clc/lib/generic/relational/clc_isunordered.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/clc_isequal.h" +#include "clc/relational/relational.h" #define _CLC_RELATIONAL_OP(X, Y) \ !__clc_isequal((X), (X)) || !__clc_isequal((Y), (Y)) diff --git a/libclc/clc/lib/generic/relational/clc_select.cl b/libclc/clc/lib/generic/relational/clc_select.cl index ddf24ed0b868..62c633ddee7d 100644 --- a/libclc/clc/lib/generic/relational/clc_select.cl +++ b/libclc/clc/lib/generic/relational/clc_select.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/utils.h" #define __CLC_SELECT_FN __clc_select #define __CLC_SELECT_DEF(x, y, z) return z ? y : x -#define __CLC_BODY -#include -#define __CLC_BODY -#include +#define __CLC_BODY "clc/relational/clc_select_impl.inc" +#include "clc/math/gentype.inc" +#define __CLC_BODY "clc/relational/clc_select_impl.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/clc/lib/generic/relational/clc_signbit.cl b/libclc/clc/lib/generic/relational/clc_signbit.cl index cb7000ddb075..05d2e8a0039a 100644 --- a/libclc/clc/lib/generic/relational/clc_signbit.cl +++ b/libclc/clc/lib/generic/relational/clc_signbit.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/relational/relational.h" #define _CLC_DEFINE_RELATIONAL_UNARY_VEC2(RET_TYPE, __CLC_FUNCTION, ARG_TYPE) \ _CLC_DEF _CLC_OVERLOAD RET_TYPE __CLC_FUNCTION(ARG_TYPE x) { \ diff --git a/libclc/clc/lib/generic/shared/clc_clamp.cl b/libclc/clc/lib/generic/shared/clc_clamp.cl index 1e81405f7419..6df9bfe77457 100644 --- a/libclc/clc/lib/generic/shared/clc_clamp.cl +++ b/libclc/clc/lib/generic/shared/clc_clamp.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/internal/clc.h" +#include "clc/shared/clc_max.h" +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_clamp.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_clamp.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/shared/clc_max.cl b/libclc/clc/lib/generic/shared/clc_max.cl index a6e831d1eac0..63210e95fa7a 100644 --- a/libclc/clc/lib/generic/shared/clc_max.cl +++ b/libclc/clc/lib/generic/shared/clc_max.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_fmax.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_max.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_max.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/shared/clc_min.cl b/libclc/clc/lib/generic/shared/clc_min.cl index f345e55c33be..ee829586c3c1 100644 --- a/libclc/clc/lib/generic/shared/clc_min.cl +++ b/libclc/clc/lib/generic/shared/clc_min.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/math/clc_fmin.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_min.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc_min.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/generic/shared/clc_vload.cl b/libclc/clc/lib/generic/shared/clc_vload.cl index 5942f10d2de5..28ee5b016f3a 100644 --- a/libclc/clc/lib/generic/shared/clc_vload.cl +++ b/libclc/clc/lib/generic/shared/clc_vload.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/internal/clc.h" +#include "clc/shared/clc_vload.h" #define __CLC_VLOAD_VECTORIZE(PRIM_TYPE, ADDR_SPACE) \ _CLC_OVERLOAD _CLC_DEF PRIM_TYPE##2 __clc_vload2( \ @@ -115,7 +115,7 @@ __CLC_VLOAD_ADDR_SPACES(half) __CLC_FUNC_IMPL(SUFFIX, VEC_SIZE, OFFSET_SIZE, TYPE, AS) #define __CLC_BODY "clc_vload_half.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNC #undef __CLC_FUNC_IMPL #undef __CLC_VEC_LOAD16 diff --git a/libclc/clc/lib/generic/shared/clc_vstore.cl b/libclc/clc/lib/generic/shared/clc_vstore.cl index ac9692739512..e2801bd579bd 100644 --- a/libclc/clc/lib/generic/shared/clc_vstore.cl +++ b/libclc/clc/lib/generic/shared/clc_vstore.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/float/definitions.h" +#include "clc/internal/clc.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_nextafter.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_min.h" #pragma OPENCL EXTENSION cl_khr_byte_addressable_store : enable @@ -256,7 +256,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_rte(double x) { __CLC_XFUNC(SUFFIX, VEC_SIZE, OFFSET, TYPE, AS, BUILTIN) #define __CLC_BODY "clc_vstore_half.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNC #undef __CLC_XFUNC #undef __CLC_XFUNC_IMPL diff --git a/libclc/clc/lib/generic/workitem/clc_get_global_id.cl b/libclc/clc/lib/generic/workitem/clc_get_global_id.cl index e3da8fd48fa5..65eedc967f79 100644 --- a/libclc/clc/lib/generic/workitem/clc_get_global_id.cl +++ b/libclc/clc/lib/generic/workitem/clc_get_global_id.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include +#include "clc/workitem/clc_get_enqueued_local_size.h" +#include "clc/workitem/clc_get_global_offset.h" +#include "clc/workitem/clc_get_group_id.h" +#include "clc/workitem/clc_get_local_id.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_global_id(uint dim) { return __clc_get_group_id(dim) * __clc_get_enqueued_local_size(dim) + diff --git a/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl b/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl index c61e838ebc69..7d6d922d52bc 100644 --- a/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl +++ b/libclc/clc/lib/generic/workitem/clc_get_num_sub_groups.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include +#include "clc/workitem/clc_get_local_size.h" +#include "clc/workitem/clc_get_max_sub_group_size.h" +#include "clc/workitem/clc_get_num_sub_groups.h" _CLC_OVERLOAD _CLC_DEF uint __clc_get_num_sub_groups() { size_t linear_size = __clc_get_local_size(0) * __clc_get_local_size(1) * diff --git a/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl b/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl index 6f18c153df21..681151b5e92c 100644 --- a/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl +++ b/libclc/clc/lib/generic/workitem/clc_get_sub_group_id.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include +#include "clc/workitem/clc_get_local_id.h" +#include "clc/workitem/clc_get_local_size.h" +#include "clc/workitem/clc_get_max_sub_group_size.h" +#include "clc/workitem/clc_get_sub_group_id.h" _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_id() { // sreg.warpid is volatile and doesn't represent virtual warp index diff --git a/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl b/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl index 8ab4afe1ae05..7944486aac0f 100644 --- a/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl +++ b/libclc/clc/lib/generic/workitem/clc_get_sub_group_size.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include "clc/workitem/clc_get_local_size.h" +#include "clc/workitem/clc_get_max_sub_group_size.h" +#include "clc/workitem/clc_get_num_sub_groups.h" +#include "clc/workitem/clc_get_sub_group_id.h" +#include "clc/workitem/clc_get_sub_group_size.h" _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_size() { if (__clc_get_sub_group_id() != __clc_get_num_sub_groups() - 1) { diff --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl index 4ccdfaf4e3fc..6172e1e49d51 100644 --- a/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl +++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_log.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log.h" float __nv_logf(float); double __nv_log(double); @@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_log(half x) { #endif #define __CLC_FUNCTION __clc_log -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl index 786d57046728..97f18ad1224d 100644 --- a/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl +++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_rsqrt.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_rsqrt.h" float __nv_rsqrtf(float); double __nv_rsqrt(double); @@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_rsqrt(half x) { #endif #define __CLC_FUNCTION __clc_rsqrt -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl index 78f7038b2644..4f65887054d0 100644 --- a/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl +++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_sinpi.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sinpi.h" float __nv_sinpif(float); double __nv_sinpi(double); @@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_sinpi(half x) { #endif #define __CLC_FUNCTION __clc_sinpi -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl b/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl index ac86a57fca3d..f84045eabfec 100644 --- a/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl +++ b/libclc/clc/lib/ptx-nvidiacl/math/clc_sqrt.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sqrt.h" float __nv_sqrtf(float); double __nv_sqrt(double); @@ -30,5 +30,5 @@ _CLC_OVERLOAD _CLC_DEF half __clc_sqrt(half x) { #endif #define __CLC_FUNCTION __clc_sqrt -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl b/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl index 93f14d79fe6b..3b0055e995aa 100644 --- a/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl +++ b/libclc/clc/lib/ptx-nvidiacl/relational/clc_isinf.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isinf.h" int __nv_isinff(float); int __nv_isinfd(double); @@ -28,6 +28,6 @@ _CLC_OVERLOAD _CLC_DEF int __clc_isinf(half x) { return __clc_isinf((float)x); } #endif #define __CLC_FUNCTION __clc_isinf -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def_scalarize.inc" #define __CLC_RET_TYPE __CLC_BIT_INT -#include +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl b/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl index 35b381052367..bd9b77945869 100644 --- a/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl +++ b/libclc/clc/lib/ptx-nvidiacl/synchronization/clc_work_group_barrier.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/synchronization/clc_work_group_barrier.h" _CLC_OVERLOAD _CLC_DEF void __clc_work_group_barrier(int memory_scope, diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl index 0782ef0b1581..508bac8fbeb9 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_global_id.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include +#include "clc/workitem/clc_get_global_id.h" +#include "clc/workitem/clc_get_group_id.h" +#include "clc/workitem/clc_get_local_id.h" +#include "clc/workitem/clc_get_local_size.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_global_id(uint dim) { return __clc_get_group_id(dim) * __clc_get_local_size(dim) + diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl index 200b1bfd7099..1896a0627f15 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_group_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_group_id.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_group_id(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl index 8c5b313b8135..0e5e1dc2f32b 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_local_id.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_local_id(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl index 2d547d3af249..5f14231c2ceb 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_local_size.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_local_size.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_local_size(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl index 6f0634d6f90e..9a380c2fc4b8 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_max_sub_group_size.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_max_sub_group_size.h" _CLC_OVERLOAD _CLC_DEF uint __clc_get_max_sub_group_size() { return __nvvm_read_ptx_sreg_warpsize(); diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl index 87151ea4be62..d1002afb8dd2 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_num_groups.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_num_groups.h" _CLC_OVERLOAD _CLC_DEF size_t __clc_get_num_groups(uint dim) { switch (dim) { diff --git a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl index 1448f8a8b97d..7e61e09bff1e 100644 --- a/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl +++ b/libclc/clc/lib/ptx-nvidiacl/workitem/clc_get_sub_group_local_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_sub_group_local_id.h" _CLC_OVERLOAD _CLC_DEF uint __clc_get_sub_group_local_id() { return __nvvm_read_ptx_sreg_laneid(); diff --git a/libclc/clc/lib/spirv/math/clc_fmax.cl b/libclc/clc/lib/spirv/math/clc_fmax.cl index 101f35c7108c..57a2b5369db8 100644 --- a/libclc/clc/lib/spirv/math/clc_fmax.cl +++ b/libclc/clc/lib/spirv/math/clc_fmax.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" _CLC_DEF _CLC_OVERLOAD float __clc_fmax(float x, float y) { return __builtin_fmaxf(x, y); @@ -27,5 +27,5 @@ _CLC_DEF _CLC_OVERLOAD half __clc_fmax(half x, half y) { #endif #define __CLC_FUNCTION __clc_fmax -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/clc/lib/spirv/math/clc_fmin.cl b/libclc/clc/lib/spirv/math/clc_fmin.cl index 9bef3a92d5ba..867b40365790 100644 --- a/libclc/clc/lib/spirv/math/clc_fmin.cl +++ b/libclc/clc/lib/spirv/math/clc_fmin.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/clc.h" _CLC_DEF _CLC_OVERLOAD float __clc_fmin(float x, float y) { return __builtin_fminf(x, y); @@ -27,5 +27,5 @@ _CLC_DEF _CLC_OVERLOAD half __clc_fmin(half x, half y) { #endif #define __CLC_FUNCTION __clc_fmin -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_scalarize.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/include/clc/opencl/convert.h b/libclc/opencl/include/clc/opencl/convert.h index 1f71f673619b..c8da4efb9c84 100644 --- a/libclc/opencl/include/clc/opencl/convert.h +++ b/libclc/opencl/include/clc/opencl/convert.h @@ -9,7 +9,7 @@ #ifndef __CLC_OPENCL_CONVERT_H__ #define __CLC_OPENCL_CONVERT_H__ -#include +#include "clc/opencl/opencl-base.h" #define _CLC_CONVERT_DECL(FROM_TYPE, TO_TYPE, SUFFIX) \ _CLC_OVERLOAD _CLC_DECL TO_TYPE convert_##TO_TYPE##SUFFIX(FROM_TYPE x); diff --git a/libclc/opencl/include/clc/opencl/opencl-base.h b/libclc/opencl/include/clc/opencl/opencl-base.h index 78fb9588d289..65360300685c 100644 --- a/libclc/opencl/include/clc/opencl/opencl-base.h +++ b/libclc/opencl/include/clc/opencl/opencl-base.h @@ -18,7 +18,7 @@ #endif /* Function Attributes */ -#include +#include "clc/clcfunc.h" /* 6.1 Supported Data Types */ diff --git a/libclc/opencl/include/clc/opencl/synchronization/utils.h b/libclc/opencl/include/clc/opencl/synchronization/utils.h index ec6401e11549..718d77cacfa5 100644 --- a/libclc/opencl/include/clc/opencl/synchronization/utils.h +++ b/libclc/opencl/include/clc/opencl/synchronization/utils.h @@ -9,8 +9,8 @@ #ifndef __CLC_OPENCL_SYNCHRONIZATION_UTILS_H__ #define __CLC_OPENCL_SYNCHRONIZATION_UTILS_H__ -#include -#include +#include "clc/mem_fence/clc_mem_semantic.h" +#include "clc/opencl/opencl-base.h" static _CLC_INLINE int __opencl_get_memory_scope(cl_mem_fence_flags flag) { if (flag & CLK_GLOBAL_MEM_FENCE) diff --git a/libclc/opencl/include/clc/opencl/utils.h b/libclc/opencl/include/clc/opencl/utils.h index fefcecf42c20..a7f25f35c2fd 100644 --- a/libclc/opencl/include/clc/opencl/utils.h +++ b/libclc/opencl/include/clc/opencl/utils.h @@ -9,7 +9,7 @@ #ifndef __CLC_OPENCL_UTILS_H__ #define __CLC_OPENCL_UTILS_H__ -#include +#include "clc/opencl/opencl-base.h" static _CLC_INLINE int __opencl_get_clang_memory_scope(memory_scope scope) { switch (scope) { diff --git a/libclc/opencl/lib/amdgpu/async/wait_group_events.cl b/libclc/opencl/lib/amdgpu/async/wait_group_events.cl index f1c9925847de..e65727ef0a89 100644 --- a/libclc/opencl/lib/amdgpu/async/wait_group_events.cl +++ b/libclc/opencl/lib/amdgpu/async/wait_group_events.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/opencl/opencl-base.h" _CLC_DEF _CLC_OVERLOAD void wait_group_events(int n, __private event_t *evs) { (void)n; diff --git a/libclc/opencl/lib/clspv/conversion/convert_float2float.cl b/libclc/opencl/lib/clspv/conversion/convert_float2float.cl index be74b71f66b7..bb0baa8beb0a 100644 --- a/libclc/opencl/lib/clspv/conversion/convert_float2float.cl +++ b/libclc/opencl/lib/clspv/conversion/convert_float2float.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE) @@ -19,19 +19,19 @@ #ifdef cl_khr_fp16 #pragma OPENCL EXTENSION cl_khr_fp16 : enable #define __CLC_SCALAR_TYPE_SRC half -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #endif // cl_khr_fp16 #define __CLC_SCALAR_TYPE_SRC float -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #ifdef cl_khr_fp64 #define __CLC_SCALAR_TYPE_SRC double -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #endif // cl_khr_fp64 diff --git a/libclc/opencl/lib/clspv/conversion/convert_float2int.cl b/libclc/opencl/lib/clspv/conversion/convert_float2int.cl index eca64bd3d181..209b9cc4d497 100644 --- a/libclc/opencl/lib/clspv/conversion/convert_float2int.cl +++ b/libclc/opencl/lib/clspv/conversion/convert_float2int.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST) @@ -30,21 +30,21 @@ #define __CLC_HAVE_RTE #define __CLC_SCALAR_TYPE_DST char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST diff --git a/libclc/opencl/lib/clspv/conversion/convert_int2float.cl b/libclc/opencl/lib/clspv/conversion/convert_int2float.cl index e514d5a48b47..a59a556e0ef4 100644 --- a/libclc/opencl/lib/clspv/conversion/convert_int2float.cl +++ b/libclc/opencl/lib/clspv/conversion/convert_int2float.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC) @@ -23,21 +23,21 @@ #define __CLC_I2F #define __CLC_SCALAR_TYPE_SRC char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC diff --git a/libclc/opencl/lib/clspv/conversion/convert_integer.cl b/libclc/opencl/lib/clspv/conversion/convert_integer.cl index a2e217e924f7..695608ad1891 100644 --- a/libclc/opencl/lib/clspv/conversion/convert_integer.cl +++ b/libclc/opencl/lib/clspv/conversion/convert_integer.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC) @@ -23,21 +23,21 @@ #define __CLC_IMPL_FUNCTION_SAT __CLC_XCONCAT(__CLC_IMPL_FUNCTION, _sat) #define __CLC_SCALAR_TYPE_SRC char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC diff --git a/libclc/opencl/lib/clspv/math/fma.cl b/libclc/opencl/lib/clspv/math/fma.cl index 172ec32b8a3b..ab955a9a38ac 100644 --- a/libclc/opencl/lib/clspv/math/fma.cl +++ b/libclc/opencl/lib/clspv/math/fma.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/internal/math/clc_sw_fma.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION fma #define __CLC_IMPL_FUNCTION(x) __clc_sw_fma -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/clspv/shared/vstore_half.cl b/libclc/opencl/lib/clspv/shared/vstore_half.cl index cfcbf55caeae..749718e13a35 100644 --- a/libclc/opencl/lib/clspv/shared/vstore_half.cl +++ b/libclc/opencl/lib/clspv/shared/vstore_half.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "clc/clc_as_type.h" +#include "clc/float/definitions.h" +#include "clc/math/clc_copysign.h" +#include "clc/math/clc_fabs.h" +#include "clc/math/clc_nextafter.h" +#include "clc/opencl/opencl-base.h" +#include "clc/relational/clc_isinf.h" +#include "clc/relational/clc_isnan.h" +#include "clc/shared/clc_min.h" #pragma OPENCL EXTENSION cl_khr_byte_addressable_store : enable @@ -145,7 +145,7 @@ _CLC_DEF _CLC_OVERLOAD float __clc_rte(float x) { __CLC_XFUNC(SUFFIX, VEC_SIZE, TYPE, AS) #define __CLC_BODY "vstore_half.inc" -#include +#include "clc/math/gentype.inc" #undef __CLC_FUNC #undef __CLC_XFUNC #undef __CLC_XFUNC_IMPL diff --git a/libclc/opencl/lib/generic/async/async_work_group_copy.cl b/libclc/opencl/lib/generic/async/async_work_group_copy.cl index 787b9f864951..1486c7dbb301 100644 --- a/libclc/opencl/lib/generic/async/async_work_group_copy.cl +++ b/libclc/opencl/lib/generic/async/async_work_group_copy.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/opencl/opencl-base.h" -#define __CLC_BODY -#include +#define __CLC_BODY "async_work_group_copy.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "async_work_group_copy.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl b/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl index cfb69f26cf5e..24f50875d448 100644 --- a/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl +++ b/libclc/opencl/lib/generic/async/async_work_group_strided_copy.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/opencl/opencl-base.h" -#define __CLC_BODY -#include +#define __CLC_BODY "async_work_group_strided_copy.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "async_work_group_strided_copy.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/async/prefetch.cl b/libclc/opencl/lib/generic/async/prefetch.cl index ec7a2e5469e5..609ac917fb09 100644 --- a/libclc/opencl/lib/generic/async/prefetch.cl +++ b/libclc/opencl/lib/generic/async/prefetch.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/async/clc_prefetch.h" -#define __CLC_BODY -#include +#define __CLC_BODY "prefetch.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "prefetch.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/async/wait_group_events.cl b/libclc/opencl/lib/generic/async/wait_group_events.cl index 76a9ee38bb89..dc63577d5bee 100644 --- a/libclc/opencl/lib/generic/async/wait_group_events.cl +++ b/libclc/opencl/lib/generic/async/wait_group_events.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/opencl/opencl-base.h" _CLC_DEF _CLC_OVERLOAD void wait_group_events(int num_events, event_t *event_list) { diff --git a/libclc/opencl/lib/generic/atomic/atom_add.cl b/libclc/opencl/lib/generic/atomic/atom_add.cl index 92df57576d1d..a1a85b3bdec0 100644 --- a/libclc/opencl/lib/generic/atomic/atom_add.cl +++ b/libclc/opencl/lib/generic/atomic/atom_add.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_add.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_and.cl b/libclc/opencl/lib/generic/atomic/atom_and.cl index c09f10145bb3..fa82f3b45a30 100644 --- a/libclc/opencl/lib/generic/atomic/atom_and.cl +++ b/libclc/opencl/lib/generic/atomic/atom_and.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_and.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl b/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl index 9ad3be5a6fe6..2df86239a8b9 100644 --- a/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl +++ b/libclc/opencl/lib/generic/atomic/atom_cmpxchg.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_compare_exchange.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_dec.cl b/libclc/opencl/lib/generic/atomic/atom_dec.cl index 1f683b19b21c..4e902ddfd460 100644 --- a/libclc/opencl/lib/generic/atomic/atom_dec.cl +++ b/libclc/opencl/lib/generic/atomic/atom_dec.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_dec.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_inc.cl b/libclc/opencl/lib/generic/atomic/atom_inc.cl index a81c913dae42..66f467fefaf3 100644 --- a/libclc/opencl/lib/generic/atomic/atom_inc.cl +++ b/libclc/opencl/lib/generic/atomic/atom_inc.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_inc.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_max.cl b/libclc/opencl/lib/generic/atomic/atom_max.cl index df39b1566de6..ee1ea66772e0 100644 --- a/libclc/opencl/lib/generic/atomic/atom_max.cl +++ b/libclc/opencl/lib/generic/atomic/atom_max.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_max.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_min.cl b/libclc/opencl/lib/generic/atomic/atom_min.cl index bbeb727a712f..b0bdcc2511cd 100644 --- a/libclc/opencl/lib/generic/atomic/atom_min.cl +++ b/libclc/opencl/lib/generic/atomic/atom_min.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_min.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_or.cl b/libclc/opencl/lib/generic/atomic/atom_or.cl index 54fc99e67cbf..6bc0ca77b800 100644 --- a/libclc/opencl/lib/generic/atomic/atom_or.cl +++ b/libclc/opencl/lib/generic/atomic/atom_or.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_or.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_sub.cl b/libclc/opencl/lib/generic/atomic/atom_sub.cl index 10ece67cdf92..8a6594d89e51 100644 --- a/libclc/opencl/lib/generic/atomic/atom_sub.cl +++ b/libclc/opencl/lib/generic/atomic/atom_sub.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_sub.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_xchg.cl b/libclc/opencl/lib/generic/atomic/atom_xchg.cl index 1888130b34ef..941bdb20a193 100644 --- a/libclc/opencl/lib/generic/atomic/atom_xchg.cl +++ b/libclc/opencl/lib/generic/atomic/atom_xchg.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_exchange.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atom_xor.cl b/libclc/opencl/lib/generic/atomic/atom_xor.cl index abb10b43ef33..232dae2ea198 100644 --- a/libclc/opencl/lib/generic/atomic/atom_xor.cl +++ b/libclc/opencl/lib/generic/atomic/atom_xor.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_xor.h" // Non-volatile overloads are for backward compatibility with OpenCL 1.0. diff --git a/libclc/opencl/lib/generic/atomic/atomic_add.cl b/libclc/opencl/lib/generic/atomic/atomic_add.cl index 5eb459d0c9d6..478ed08e02e1 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_add.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_add.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_add.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_add(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_and.cl b/libclc/opencl/lib/generic/atomic/atomic_and.cl index 3b7ecacee15e..7fc201787e4e 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_and.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_and.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_and.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_and(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl b/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl index 40fb2f84e49d..715cd64e066a 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_cmpxchg.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_compare_exchange.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_cmpxchg(volatile AS TYPE *p, TYPE cmp, \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl index 9311a0d4a379..655dc00f7064 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_strong.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_compare_exchange.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_compare_exchange_strong #define __CLC_IMPL_FUNCTION __clc_atomic_compare_exchange #define __CLC_COMPARE_EXCHANGE -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl index 1f0e7259b0c9..29fa2634c4b1 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_compare_exchange_weak.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_compare_exchange.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_compare_exchange_weak #define __CLC_IMPL_FUNCTION __clc_atomic_compare_exchange #define __CLC_COMPARE_EXCHANGE -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_dec.cl b/libclc/opencl/lib/generic/atomic/atomic_dec.cl index 1ae3aa991367..2eb772d01bf6 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_dec.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_dec.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_dec.h" #define __CLC_FUNCTION atomic_dec #define __CLC_IMPL_FUNCTION __clc_atomic_dec -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_inc_dec.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_exchange.cl b/libclc/opencl/lib/generic/atomic/atomic_exchange.cl index b023b1ce18e6..d3c8710595ac 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_exchange.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_exchange.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_exchange.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_exchange #define __CLC_IMPL_FUNCTION __clc_atomic_exchange -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl index fb0ee06f95dd..ff2115f4c4b4 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_add.cl @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_add.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_add #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_add -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" #if defined(__opencl_c_atomic_order_seq_cst) && \ defined(__opencl_c_atomic_scope_device) diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl index 286f97ee1e43..6e28a1c11de8 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_and.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_and.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_and #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_and -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl index e9fc0a83ceb4..182c24ed7c56 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_max.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_max.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_max #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_max -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl index df7dac6c5b22..262c96a10d40 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_min.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_min.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_min #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_min -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl index bf4af8412c33..5f2bfd319707 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_or.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_or.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_or #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_or -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl index a8ad0c193d2e..9740ff7c036d 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_sub.cl @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_sub.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_sub #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_sub -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" #if defined(__opencl_c_atomic_order_seq_cst) && \ defined(__opencl_c_atomic_scope_device) diff --git a/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl b/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl index 81302e54d5ca..83ef34c66689 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_fetch_xor.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_fetch_xor.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_fetch_xor #define __CLC_IMPL_FUNCTION __clc_atomic_fetch_xor -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl b/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl index 28b0101e7797..b4f4bfd94f57 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_flag_clear.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_flag_clear.h" +#include "clc/opencl/utils.h" #if defined(__opencl_c_atomic_order_seq_cst) && \ defined(__opencl_c_atomic_scope_device) diff --git a/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl b/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl index c5a346cf423c..86f60627b3a7 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_flag_test_and_set.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_flag_test_and_set.h" +#include "clc/opencl/utils.h" #if defined(__opencl_c_atomic_order_seq_cst) && \ defined(__opencl_c_atomic_scope_device) diff --git a/libclc/opencl/lib/generic/atomic/atomic_inc.cl b/libclc/opencl/lib/generic/atomic/atomic_inc.cl index a408087bc0e3..250473463c68 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_inc.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_inc.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_inc.h" #define __CLC_FUNCTION atomic_inc #define __CLC_IMPL_FUNCTION __clc_atomic_inc -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_inc_dec.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_init.cl b/libclc/opencl/lib/generic/atomic/atomic_init.cl index 5255ab1f46c1..1ebf8bb29d40 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_init.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_init.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/opencl/utils.h" #define __CLC_ATOMIC_GENTYPE __CLC_XCONCAT(atomic_, __CLC_GENTYPE) -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_init.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_init.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_load.cl b/libclc/opencl/lib/generic/atomic/atomic_load.cl index 9a5d5c92d599..b8a230b37f90 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_load.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_load.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_load.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_load #define __CLC_IMPL_FUNCTION __clc_atomic_load #define __CLC_NO_VALUE_ARG -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_max.cl b/libclc/opencl/lib/generic/atomic/atomic_max.cl index c9f92b7dfc08..005d9f138488 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_max.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_max.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_max.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_max(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_min.cl b/libclc/opencl/lib/generic/atomic/atomic_min.cl index a1954a558ef1..d4a49676b801 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_min.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_min.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_min.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_min(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_or.cl b/libclc/opencl/lib/generic/atomic/atomic_or.cl index 2ed4f058d5b6..7db9cede1b51 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_or.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_or.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_or.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_or(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_store.cl b/libclc/opencl/lib/generic/atomic/atomic_store.cl index 5c348248b93e..ff2791115a80 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_store.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_store.cl @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/atomic/clc_atomic_store.h" +#include "clc/opencl/utils.h" #define __CLC_FUNCTION atomic_store #define __CLC_IMPL_FUNCTION __clc_atomic_store #define __CLC_RETURN_VOID -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "atomic_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/atomic/atomic_sub.cl b/libclc/opencl/lib/generic/atomic/atomic_sub.cl index b722d5ceed2d..c3a066aad623 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_sub.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_sub.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_sub.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_sub(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_xchg.cl b/libclc/opencl/lib/generic/atomic/atomic_xchg.cl index 08dbbad0628f..f682e2e90fff 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_xchg.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_xchg.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_exchange.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_xchg(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/atomic/atomic_xor.cl b/libclc/opencl/lib/generic/atomic/atomic_xor.cl index 7279f4437d7c..120f75e681af 100644 --- a/libclc/opencl/lib/generic/atomic/atomic_xor.cl +++ b/libclc/opencl/lib/generic/atomic/atomic_xor.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/atomic/clc_atomic_fetch_xor.h" #define __CLC_IMPL(TYPE, AS) \ _CLC_OVERLOAD _CLC_DEF TYPE atomic_xor(volatile AS TYPE *p, TYPE val) { \ diff --git a/libclc/opencl/lib/generic/collective/work_group_broadcast.cl b/libclc/opencl/lib/generic/collective/work_group_broadcast.cl index fa4e8fbc26bb..60ac0a9d0513 100644 --- a/libclc/opencl/lib/generic/collective/work_group_broadcast.cl +++ b/libclc/opencl/lib/generic/collective/work_group_broadcast.cl @@ -8,8 +8,8 @@ #include "clc/collective/clc_work_group_broadcast.h" -#define __CLC_BODY -#include +#define __CLC_BODY "work_group_broadcast.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "work_group_broadcast.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/collective/work_group_reduce.cl b/libclc/opencl/lib/generic/collective/work_group_reduce.cl index 219106432cfc..c9d8344b6b7d 100644 --- a/libclc/opencl/lib/generic/collective/work_group_reduce.cl +++ b/libclc/opencl/lib/generic/collective/work_group_reduce.cl @@ -8,8 +8,8 @@ #include "clc/collective/clc_work_group_reduce.h" -#define __CLC_BODY -#include +#define __CLC_BODY "work_group_reduce.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "work_group_reduce.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/degrees.cl b/libclc/opencl/lib/generic/common/degrees.cl index d0f692cc320f..6c46000ef873 100644 --- a/libclc/opencl/lib/generic/common/degrees.cl +++ b/libclc/opencl/lib/generic/common/degrees.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/common/clc_degrees.h" #define __CLC_FUNCTION degrees -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/mix.cl b/libclc/opencl/lib/generic/common/mix.cl index 2963ee62c349..6b338300738d 100644 --- a/libclc/opencl/lib/generic/common/mix.cl +++ b/libclc/opencl/lib/generic/common/mix.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_mad.h" -#define __CLC_BODY -#include +#define __CLC_BODY "mix.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/radians.cl b/libclc/opencl/lib/generic/common/radians.cl index 80168bc569a6..931016d02fd4 100644 --- a/libclc/opencl/lib/generic/common/radians.cl +++ b/libclc/opencl/lib/generic/common/radians.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/common/clc_radians.h" #define __CLC_FUNCTION radians -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/sign.cl b/libclc/opencl/lib/generic/common/sign.cl index 88c974cd7c5d..712ddd184b44 100644 --- a/libclc/opencl/lib/generic/common/sign.cl +++ b/libclc/opencl/lib/generic/common/sign.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/common/clc_sign.h" #define __CLC_FUNCTION sign -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/smoothstep.cl b/libclc/opencl/lib/generic/common/smoothstep.cl index 9589d0b8afaa..40bba9701624 100644 --- a/libclc/opencl/lib/generic/common/smoothstep.cl +++ b/libclc/opencl/lib/generic/common/smoothstep.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/common/clc_smoothstep.h" -#define __CLC_BODY -#include +#define __CLC_BODY "smoothstep.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/common/step.cl b/libclc/opencl/lib/generic/common/step.cl index ab12570f54c0..8e0986bdd19d 100644 --- a/libclc/opencl/lib/generic/common/step.cl +++ b/libclc/opencl/lib/generic/common/step.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/common/clc_step.h" -#define __CLC_BODY -#include +#define __CLC_BODY "step.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/conversion/convert_float2float.cl b/libclc/opencl/lib/generic/conversion/convert_float2float.cl index be74b71f66b7..bb0baa8beb0a 100644 --- a/libclc/opencl/lib/generic/conversion/convert_float2float.cl +++ b/libclc/opencl/lib/generic/conversion/convert_float2float.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_GENTYPE_SRC __CLC_XCONCAT(__CLC_SCALAR_TYPE_SRC, __CLC_VECSIZE) @@ -19,19 +19,19 @@ #ifdef cl_khr_fp16 #pragma OPENCL EXTENSION cl_khr_fp16 : enable #define __CLC_SCALAR_TYPE_SRC half -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #endif // cl_khr_fp16 #define __CLC_SCALAR_TYPE_SRC float -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #ifdef cl_khr_fp64 #define __CLC_SCALAR_TYPE_SRC double -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #endif // cl_khr_fp64 diff --git a/libclc/opencl/lib/generic/conversion/convert_float2int.cl b/libclc/opencl/lib/generic/conversion/convert_float2int.cl index 7fe518f3105c..4b3d731edd30 100644 --- a/libclc/opencl/lib/generic/conversion/convert_float2int.cl +++ b/libclc/opencl/lib/generic/conversion/convert_float2int.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_DST __CLC_SCALAR_TYPE_DST #define __CLC_U_SCALAR_TYPE_DST __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_DST) @@ -29,21 +29,21 @@ #define __CLC_F2I #define __CLC_SCALAR_TYPE_DST char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST #define __CLC_SCALAR_TYPE_DST long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_DST diff --git a/libclc/opencl/lib/generic/conversion/convert_int2float.cl b/libclc/opencl/lib/generic/conversion/convert_int2float.cl index e514d5a48b47..a59a556e0ef4 100644 --- a/libclc/opencl/lib/generic/conversion/convert_int2float.cl +++ b/libclc/opencl/lib/generic/conversion/convert_int2float.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC) @@ -23,21 +23,21 @@ #define __CLC_I2F #define __CLC_SCALAR_TYPE_SRC char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_float.inc" +#include "clc/math/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC diff --git a/libclc/opencl/lib/generic/conversion/convert_integer.cl b/libclc/opencl/lib/generic/conversion/convert_integer.cl index a2e217e924f7..695608ad1891 100644 --- a/libclc/opencl/lib/generic/conversion/convert_integer.cl +++ b/libclc/opencl/lib/generic/conversion/convert_integer.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/clc_convert.h" +#include "clc/opencl/convert.h" #define __CLC_S_SCALAR_TYPE_SRC __CLC_SCALAR_TYPE_SRC #define __CLC_U_SCALAR_TYPE_SRC __CLC_XCONCAT(u, __CLC_SCALAR_TYPE_SRC) @@ -23,21 +23,21 @@ #define __CLC_IMPL_FUNCTION_SAT __CLC_XCONCAT(__CLC_IMPL_FUNCTION, _sat) #define __CLC_SCALAR_TYPE_SRC char -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC short -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC int -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC #define __CLC_SCALAR_TYPE_SRC long -#define __CLC_BODY -#include +#define __CLC_BODY "convert_integer.inc" +#include "clc/integer/gentype.inc" #undef __CLC_SCALAR_TYPE_SRC diff --git a/libclc/opencl/lib/generic/geometric/cross.cl b/libclc/opencl/lib/generic/geometric/cross.cl index 29dd6370a4d5..9d55e0c3c94d 100644 --- a/libclc/opencl/lib/generic/geometric/cross.cl +++ b/libclc/opencl/lib/generic/geometric/cross.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_cross.h" _CLC_OVERLOAD _CLC_DEF float3 cross(float3 p0, float3 p1) { return __clc_cross(p0, p1); diff --git a/libclc/opencl/lib/generic/geometric/distance.cl b/libclc/opencl/lib/generic/geometric/distance.cl index 9a39e9e0c337..46c129fc643b 100644 --- a/libclc/opencl/lib/generic/geometric/distance.cl +++ b/libclc/opencl/lib/generic/geometric/distance.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_distance.h" #define __CLC_FUNCTION distance -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/dot.cl b/libclc/opencl/lib/generic/geometric/dot.cl index a622b209f48b..94bc5f5bc3c6 100644 --- a/libclc/opencl/lib/generic/geometric/dot.cl +++ b/libclc/opencl/lib/generic/geometric/dot.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_dot.h" #define __CLC_FUNCTION dot -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/fast_distance.cl b/libclc/opencl/lib/generic/geometric/fast_distance.cl index 2e5c22201c8a..d0ddc15c599c 100644 --- a/libclc/opencl/lib/generic/geometric/fast_distance.cl +++ b/libclc/opencl/lib/generic/geometric/fast_distance.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_fast_distance.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION fast_distance -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/fast_length.cl b/libclc/opencl/lib/generic/geometric/fast_length.cl index 13ac101e391d..2a0830560041 100644 --- a/libclc/opencl/lib/generic/geometric/fast_length.cl +++ b/libclc/opencl/lib/generic/geometric/fast_length.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_fast_length.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION fast_length -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/fast_normalize.cl b/libclc/opencl/lib/generic/geometric/fast_normalize.cl index ee3eed25fac5..cc8f2b7df7f0 100644 --- a/libclc/opencl/lib/generic/geometric/fast_normalize.cl +++ b/libclc/opencl/lib/generic/geometric/fast_normalize.cl @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_fast_normalize.h" #define __CLC_FUNCTION fast_normalize #define __CLC_FLOAT_ONLY #define __CLC_GEOMETRIC_RET_GENTYPE -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/length.cl b/libclc/opencl/lib/generic/geometric/length.cl index ce5dee508ca2..d58e2b768a6b 100644 --- a/libclc/opencl/lib/generic/geometric/length.cl +++ b/libclc/opencl/lib/generic/geometric/length.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_length.h" #define __CLC_FUNCTION length -#define __CLC_BODY -#include +#define __CLC_BODY "clc/geometric/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/geometric/normalize.cl b/libclc/opencl/lib/generic/geometric/normalize.cl index 6dd96a3259e7..d103ff8aa831 100644 --- a/libclc/opencl/lib/generic/geometric/normalize.cl +++ b/libclc/opencl/lib/generic/geometric/normalize.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/geometric/clc_normalize.h" #define __CLC_FUNCTION normalize #define __CLC_GEOMETRIC_RET_GENTYPE -#define __CLC_BODY +#define __CLC_BODY "clc/geometric/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/abs.cl b/libclc/opencl/lib/generic/integer/abs.cl index 3a2aabf716ce..3088b223ce87 100644 --- a/libclc/opencl/lib/generic/integer/abs.cl +++ b/libclc/opencl/lib/generic/integer/abs.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_abs.h" -#define __CLC_BODY -#include +#define __CLC_BODY "abs.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/abs_diff.cl b/libclc/opencl/lib/generic/integer/abs_diff.cl index c738c99eb9e0..d1b3ea00de47 100644 --- a/libclc/opencl/lib/generic/integer/abs_diff.cl +++ b/libclc/opencl/lib/generic/integer/abs_diff.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_abs_diff.h" -#define __CLC_BODY -#include +#define __CLC_BODY "abs_diff.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/add_sat.cl b/libclc/opencl/lib/generic/integer/add_sat.cl index a4325054cf7e..d3d539dcc1cf 100644 --- a/libclc/opencl/lib/generic/integer/add_sat.cl +++ b/libclc/opencl/lib/generic/integer/add_sat.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_add_sat.h" #define __CLC_FUNCTION add_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/bit_reverse.cl b/libclc/opencl/lib/generic/integer/bit_reverse.cl index 917be12b8e83..2c921503f87c 100644 --- a/libclc/opencl/lib/generic/integer/bit_reverse.cl +++ b/libclc/opencl/lib/generic/integer/bit_reverse.cl @@ -8,11 +8,11 @@ #ifdef cl_khr_extended_bit_ops -#include +#include "clc/integer/clc_bit_reverse.h" #define __CLC_FUNCTION bit_reverse -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" #endif // cl_khr_extended_bit_ops diff --git a/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl b/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl index c54dd461f171..884a110d5490 100644 --- a/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl +++ b/libclc/opencl/lib/generic/integer/bitfield_extract_signed.cl @@ -8,12 +8,12 @@ #ifdef cl_khr_extended_bit_ops -#include +#include "clc/integer/clc_bitfield_extract_signed.h" #define __CLC_FUNCTION bitfield_extract_signed #define __CLC_RETTYPE __CLC_S_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "bitfield_extract_def.inc" +#include "clc/integer/gentype.inc" #endif // cl_khr_extended_bit_ops diff --git a/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl b/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl index b78d92c69cd0..2cdc90fa2e53 100644 --- a/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl +++ b/libclc/opencl/lib/generic/integer/bitfield_extract_unsigned.cl @@ -8,12 +8,12 @@ #ifdef cl_khr_extended_bit_ops -#include +#include "clc/integer/clc_bitfield_extract_unsigned.h" #define __CLC_FUNCTION bitfield_extract_unsigned #define __CLC_RETTYPE __CLC_U_GENTYPE -#define __CLC_BODY -#include +#define __CLC_BODY "bitfield_extract_def.inc" +#include "clc/integer/gentype.inc" #endif // cl_khr_extended_bit_ops diff --git a/libclc/opencl/lib/generic/integer/bitfield_insert.cl b/libclc/opencl/lib/generic/integer/bitfield_insert.cl index bc75df957392..1f36e1141b0a 100644 --- a/libclc/opencl/lib/generic/integer/bitfield_insert.cl +++ b/libclc/opencl/lib/generic/integer/bitfield_insert.cl @@ -8,10 +8,10 @@ #ifdef cl_khr_extended_bit_ops -#include +#include "clc/integer/clc_bitfield_insert.h" #define __CLC_FUNCTION bitfield_insert -#define __CLC_BODY -#include +#define __CLC_BODY "bitfield_insert.inc" +#include "clc/integer/gentype.inc" #endif // cl_khr_extended_bit_ops diff --git a/libclc/opencl/lib/generic/integer/clz.cl b/libclc/opencl/lib/generic/integer/clz.cl index 8e700ca397a9..809771164b85 100644 --- a/libclc/opencl/lib/generic/integer/clz.cl +++ b/libclc/opencl/lib/generic/integer/clz.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_clz.h" #define __CLC_FUNCTION clz -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/ctz.cl b/libclc/opencl/lib/generic/integer/ctz.cl index a961e5b8c1d6..20a0bb98eb09 100644 --- a/libclc/opencl/lib/generic/integer/ctz.cl +++ b/libclc/opencl/lib/generic/integer/ctz.cl @@ -8,11 +8,11 @@ #if __OPENCL_C_VERSION__ >= CL_VERSION_2_0 -#include +#include "clc/integer/clc_ctz.h" #define __CLC_FUNCTION ctz -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" #endif // __OPENCL_C_VERSION__ >= CL_VERSION_2_0 diff --git a/libclc/opencl/lib/generic/integer/hadd.cl b/libclc/opencl/lib/generic/integer/hadd.cl index 5281e63a7362..19e754769a4e 100644 --- a/libclc/opencl/lib/generic/integer/hadd.cl +++ b/libclc/opencl/lib/generic/integer/hadd.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_hadd.h" #define __CLC_FUNCTION hadd -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/mad24.cl b/libclc/opencl/lib/generic/integer/mad24.cl index e964a3983cfb..6879ae710ef3 100644 --- a/libclc/opencl/lib/generic/integer/mad24.cl +++ b/libclc/opencl/lib/generic/integer/mad24.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_mad24.h" #define __CLC_FUNCTION mad24 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/integer/gentype24.inc" diff --git a/libclc/opencl/lib/generic/integer/mad_hi.cl b/libclc/opencl/lib/generic/integer/mad_hi.cl index 24bfb6e1ee0d..4d2a4272a3ae 100644 --- a/libclc/opencl/lib/generic/integer/mad_hi.cl +++ b/libclc/opencl/lib/generic/integer/mad_hi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_mad_hi.h" #define __CLC_FUNCTION mad_hi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/mad_sat.cl b/libclc/opencl/lib/generic/integer/mad_sat.cl index c3875e340ff1..b641a95625c4 100644 --- a/libclc/opencl/lib/generic/integer/mad_sat.cl +++ b/libclc/opencl/lib/generic/integer/mad_sat.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_mad_sat.h" #define __CLC_FUNCTION mad_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/mul24.cl b/libclc/opencl/lib/generic/integer/mul24.cl index 5c681ac4e714..8b3d1d626cdc 100644 --- a/libclc/opencl/lib/generic/integer/mul24.cl +++ b/libclc/opencl/lib/generic/integer/mul24.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_mul24.h" #define __CLC_FUNCTION mul24 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype24.inc" diff --git a/libclc/opencl/lib/generic/integer/mul_hi.cl b/libclc/opencl/lib/generic/integer/mul_hi.cl index 1a9c3a923a3e..5ae69a4b8755 100644 --- a/libclc/opencl/lib/generic/integer/mul_hi.cl +++ b/libclc/opencl/lib/generic/integer/mul_hi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_mul_hi.h" #define __CLC_FUNCTION mul_hi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/popcount.cl b/libclc/opencl/lib/generic/integer/popcount.cl index 0dc521fb409e..623ab6d99eb3 100644 --- a/libclc/opencl/lib/generic/integer/popcount.cl +++ b/libclc/opencl/lib/generic/integer/popcount.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_popcount.h" #define __CLC_FUNCTION popcount -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/rhadd.cl b/libclc/opencl/lib/generic/integer/rhadd.cl index f660a21b4a01..d07f5309d48a 100644 --- a/libclc/opencl/lib/generic/integer/rhadd.cl +++ b/libclc/opencl/lib/generic/integer/rhadd.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_rhadd.h" #define __CLC_FUNCTION rhadd -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/rotate.cl b/libclc/opencl/lib/generic/integer/rotate.cl index 82015803370b..15793d0bdc7c 100644 --- a/libclc/opencl/lib/generic/integer/rotate.cl +++ b/libclc/opencl/lib/generic/integer/rotate.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_rotate.h" #define __CLC_FUNCTION rotate -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/sub_sat.cl b/libclc/opencl/lib/generic/integer/sub_sat.cl index 76d80c417242..c84992601e90 100644 --- a/libclc/opencl/lib/generic/integer/sub_sat.cl +++ b/libclc/opencl/lib/generic/integer/sub_sat.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_sub_sat.h" #define __CLC_FUNCTION sub_sat -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/integer/upsample.cl b/libclc/opencl/lib/generic/integer/upsample.cl index 2a63a13186d1..52bdcdbf19e7 100644 --- a/libclc/opencl/lib/generic/integer/upsample.cl +++ b/libclc/opencl/lib/generic/integer/upsample.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/integer/clc_upsample.h" #define __CLC_UPSAMPLE_IMPL(BGENTYPE, GENTYPE, UGENTYPE) \ _CLC_OVERLOAD _CLC_DEF BGENTYPE upsample(GENTYPE hi, UGENTYPE lo) { \ diff --git a/libclc/opencl/lib/generic/math/acos.cl b/libclc/opencl/lib/generic/math/acos.cl index ca9fd9d4f1b0..c866509c48bf 100644 --- a/libclc/opencl/lib/generic/math/acos.cl +++ b/libclc/opencl/lib/generic/math/acos.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_acos.h" #define __CLC_FUNCTION acos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/acosh.cl b/libclc/opencl/lib/generic/math/acosh.cl index 3e2c0b3d4a87..52c4bcf7f3c8 100644 --- a/libclc/opencl/lib/generic/math/acosh.cl +++ b/libclc/opencl/lib/generic/math/acosh.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_acosh.h" #define __CLC_FUNCTION acosh -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/acospi.cl b/libclc/opencl/lib/generic/math/acospi.cl index 82e84c690e27..608c72b4bb6e 100644 --- a/libclc/opencl/lib/generic/math/acospi.cl +++ b/libclc/opencl/lib/generic/math/acospi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_acospi.h" #define __CLC_FUNCTION acospi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/asin.cl b/libclc/opencl/lib/generic/math/asin.cl index 5c3ccd653201..aab2d1c73fa9 100644 --- a/libclc/opencl/lib/generic/math/asin.cl +++ b/libclc/opencl/lib/generic/math/asin.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_asin.h" #define __CLC_FUNCTION asin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/asinh.cl b/libclc/opencl/lib/generic/math/asinh.cl index 86d825f77f32..7b4895016031 100644 --- a/libclc/opencl/lib/generic/math/asinh.cl +++ b/libclc/opencl/lib/generic/math/asinh.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_asinh.h" #define __CLC_FUNCTION asinh -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/asinpi.cl b/libclc/opencl/lib/generic/math/asinpi.cl index b093777600c4..647f0db76db9 100644 --- a/libclc/opencl/lib/generic/math/asinpi.cl +++ b/libclc/opencl/lib/generic/math/asinpi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_asinpi.h" #define __CLC_FUNCTION asinpi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/atan.cl b/libclc/opencl/lib/generic/math/atan.cl index a5dbfd052feb..7a3155ed4048 100644 --- a/libclc/opencl/lib/generic/math/atan.cl +++ b/libclc/opencl/lib/generic/math/atan.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_atan.h" #define __CLC_FUNCTION atan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/atan2.cl b/libclc/opencl/lib/generic/math/atan2.cl index 64a06991a91d..2bbac431fcc9 100644 --- a/libclc/opencl/lib/generic/math/atan2.cl +++ b/libclc/opencl/lib/generic/math/atan2.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_atan2.h" #define __CLC_FUNCTION atan2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/atan2pi.cl b/libclc/opencl/lib/generic/math/atan2pi.cl index 854ca09990b4..2d37e012021d 100644 --- a/libclc/opencl/lib/generic/math/atan2pi.cl +++ b/libclc/opencl/lib/generic/math/atan2pi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_atan2pi.h" #define __CLC_FUNCTION atan2pi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/atanh.cl b/libclc/opencl/lib/generic/math/atanh.cl index 3a38cfe69ade..891c613d6d21 100644 --- a/libclc/opencl/lib/generic/math/atanh.cl +++ b/libclc/opencl/lib/generic/math/atanh.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_atanh.h" #define __CLC_FUNCTION atanh -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/atanpi.cl b/libclc/opencl/lib/generic/math/atanpi.cl index c3da0aba9e62..24017cd8afd9 100644 --- a/libclc/opencl/lib/generic/math/atanpi.cl +++ b/libclc/opencl/lib/generic/math/atanpi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_atanpi.h" #define __CLC_FUNCTION atanpi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/cbrt.cl b/libclc/opencl/lib/generic/math/cbrt.cl index 86b8415c688c..2496e3f99e47 100644 --- a/libclc/opencl/lib/generic/math/cbrt.cl +++ b/libclc/opencl/lib/generic/math/cbrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_cbrt.h" #define __CLC_FUNCTION cbrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/ceil.cl b/libclc/opencl/lib/generic/math/ceil.cl index 5d0d8ad4238f..86b9383fc179 100644 --- a/libclc/opencl/lib/generic/math/ceil.cl +++ b/libclc/opencl/lib/generic/math/ceil.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_ceil.h" #define __CLC_FUNCTION ceil -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/copysign.cl b/libclc/opencl/lib/generic/math/copysign.cl index fbb86b89a8bc..7b0d05647349 100644 --- a/libclc/opencl/lib/generic/math/copysign.cl +++ b/libclc/opencl/lib/generic/math/copysign.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_copysign.h" #define __CLC_FUNCTION copysign -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/cos.cl b/libclc/opencl/lib/generic/math/cos.cl index 4b895b980c30..da1877878aa8 100644 --- a/libclc/opencl/lib/generic/math/cos.cl +++ b/libclc/opencl/lib/generic/math/cos.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_cos.h" #define __CLC_FUNCTION cos -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/cosh.cl b/libclc/opencl/lib/generic/math/cosh.cl index 4b44cb426dac..39ca56fccfe2 100644 --- a/libclc/opencl/lib/generic/math/cosh.cl +++ b/libclc/opencl/lib/generic/math/cosh.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_cosh.h" #define __CLC_FUNCTION cosh -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/cospi.cl b/libclc/opencl/lib/generic/math/cospi.cl index d910c88c5c9c..2f15078a7bd0 100644 --- a/libclc/opencl/lib/generic/math/cospi.cl +++ b/libclc/opencl/lib/generic/math/cospi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_cospi.h" #define __CLC_FUNCTION cospi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/erf.cl b/libclc/opencl/lib/generic/math/erf.cl index 58b2d8d6937b..59d8c73c4d55 100644 --- a/libclc/opencl/lib/generic/math/erf.cl +++ b/libclc/opencl/lib/generic/math/erf.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_erf.h" #define __CLC_FUNCTION erf -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/erfc.cl b/libclc/opencl/lib/generic/math/erfc.cl index 5aa7d0fcc32e..ad332d504cfd 100644 --- a/libclc/opencl/lib/generic/math/erfc.cl +++ b/libclc/opencl/lib/generic/math/erfc.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_erfc.h" #define __CLC_FUNCTION erfc -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/exp.cl b/libclc/opencl/lib/generic/math/exp.cl index 2afeb8937079..12c4f2ccbdb6 100644 --- a/libclc/opencl/lib/generic/math/exp.cl +++ b/libclc/opencl/lib/generic/math/exp.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp.h" #define __CLC_FUNCTION exp -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/exp10.cl b/libclc/opencl/lib/generic/math/exp10.cl index befc5f16bb26..2119a42bc1a6 100644 --- a/libclc/opencl/lib/generic/math/exp10.cl +++ b/libclc/opencl/lib/generic/math/exp10.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp10.h" #define __CLC_FUNCTION exp10 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/exp2.cl b/libclc/opencl/lib/generic/math/exp2.cl index f82b713a9892..c7f6a0c57802 100644 --- a/libclc/opencl/lib/generic/math/exp2.cl +++ b/libclc/opencl/lib/generic/math/exp2.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_exp2.h" #define __CLC_FUNCTION exp2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/expm1.cl b/libclc/opencl/lib/generic/math/expm1.cl index 66661192b991..a1e0a12005a3 100644 --- a/libclc/opencl/lib/generic/math/expm1.cl +++ b/libclc/opencl/lib/generic/math/expm1.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_expm1.h" #define __CLC_FUNCTION expm1 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fabs.cl b/libclc/opencl/lib/generic/math/fabs.cl index eed1a585b64c..878eef0a2683 100644 --- a/libclc/opencl/lib/generic/math/fabs.cl +++ b/libclc/opencl/lib/generic/math/fabs.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fabs.h" #define __CLC_FUNCTION fabs -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fdim.cl b/libclc/opencl/lib/generic/math/fdim.cl index 16fcce64f517..f8348f4ccf0d 100644 --- a/libclc/opencl/lib/generic/math/fdim.cl +++ b/libclc/opencl/lib/generic/math/fdim.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fdim.h" #define __CLC_FUNCTION fdim -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/floor.cl b/libclc/opencl/lib/generic/math/floor.cl index 9e2bd0abe3b3..1be22eac7f1f 100644 --- a/libclc/opencl/lib/generic/math/floor.cl +++ b/libclc/opencl/lib/generic/math/floor.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_floor.h" #define __CLC_FUNCTION floor -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fma.cl b/libclc/opencl/lib/generic/math/fma.cl index adac2c3960dd..efb3c1ae4193 100644 --- a/libclc/opencl/lib/generic/math/fma.cl +++ b/libclc/opencl/lib/generic/math/fma.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/math/clc_fma.h" +#include "clc/math/math.h" #define __CLC_FUNCTION fma -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fmax.cl b/libclc/opencl/lib/generic/math/fmax.cl index 987c605dc248..31d4f2948800 100644 --- a/libclc/opencl/lib/generic/math/fmax.cl +++ b/libclc/opencl/lib/generic/math/fmax.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fmax.h" #define __CLC_FUNCTION fmax -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_with_scalar_second_arg.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fmin.cl b/libclc/opencl/lib/generic/math/fmin.cl index b31a7c6621a6..662e7055eb30 100644 --- a/libclc/opencl/lib/generic/math/fmin.cl +++ b/libclc/opencl/lib/generic/math/fmin.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fmin.h" #define __CLC_FUNCTION fmin -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def_with_scalar_second_arg.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fmod.cl b/libclc/opencl/lib/generic/math/fmod.cl index 7ff28defbdc0..e5a8a81d64dd 100644 --- a/libclc/opencl/lib/generic/math/fmod.cl +++ b/libclc/opencl/lib/generic/math/fmod.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fmod.h" #define __CLC_FUNCTION fmod -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/fract.cl b/libclc/opencl/lib/generic/math/fract.cl index 3c749443ba1a..cce99aad0920 100644 --- a/libclc/opencl/lib/generic/math/fract.cl +++ b/libclc/opencl/lib/generic/math/fract.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_fract.h" #define __CLC_FUNCTION fract -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_ptr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/frexp.cl b/libclc/opencl/lib/generic/math/frexp.cl index e8c1bff46581..27783d369838 100644 --- a/libclc/opencl/lib/generic/math/frexp.cl +++ b/libclc/opencl/lib/generic/math/frexp.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_frexp.h" #define __CLC_FUNCTION frexp -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_int_ptr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_cos.cl b/libclc/opencl/lib/generic/math/half_cos.cl index 2d92636c08a4..484a0cd66772 100644 --- a/libclc/opencl/lib/generic/math/half_cos.cl +++ b/libclc/opencl/lib/generic/math/half_cos.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_cos.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_divide.cl b/libclc/opencl/lib/generic/math/half_divide.cl index 3d3cb76528b6..107c89e2802c 100644 --- a/libclc/opencl/lib/generic/math/half_divide.cl +++ b/libclc/opencl/lib/generic/math/half_divide.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_divide.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_divide -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_exp.cl b/libclc/opencl/lib/generic/math/half_exp.cl index 367bcc94b049..671404a12169 100644 --- a/libclc/opencl/lib/generic/math/half_exp.cl +++ b/libclc/opencl/lib/generic/math/half_exp.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_exp.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_exp10.cl b/libclc/opencl/lib/generic/math/half_exp10.cl index 58e2b5ec39d4..586fd72738f4 100644 --- a/libclc/opencl/lib/generic/math/half_exp10.cl +++ b/libclc/opencl/lib/generic/math/half_exp10.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_exp10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_exp2.cl b/libclc/opencl/lib/generic/math/half_exp2.cl index 6b98fdd25b7c..9a118c7521fa 100644 --- a/libclc/opencl/lib/generic/math/half_exp2.cl +++ b/libclc/opencl/lib/generic/math/half_exp2.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_exp2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_log.cl b/libclc/opencl/lib/generic/math/half_log.cl index a839f7e553b3..bb4e09e51aed 100644 --- a/libclc/opencl/lib/generic/math/half_log.cl +++ b/libclc/opencl/lib/generic/math/half_log.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_log.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_log10.cl b/libclc/opencl/lib/generic/math/half_log10.cl index 8e193f8f215f..edc5c1f39990 100644 --- a/libclc/opencl/lib/generic/math/half_log10.cl +++ b/libclc/opencl/lib/generic/math/half_log10.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_log10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_log2.cl b/libclc/opencl/lib/generic/math/half_log2.cl index 2f072752750d..b5f6c22ba6fb 100644 --- a/libclc/opencl/lib/generic/math/half_log2.cl +++ b/libclc/opencl/lib/generic/math/half_log2.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_log2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_powr.cl b/libclc/opencl/lib/generic/math/half_powr.cl index 68e32a814222..5792a1f03080 100644 --- a/libclc/opencl/lib/generic/math/half_powr.cl +++ b/libclc/opencl/lib/generic/math/half_powr.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_powr.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_recip.cl b/libclc/opencl/lib/generic/math/half_recip.cl index 26379d751208..dee3b0b198f9 100644 --- a/libclc/opencl/lib/generic/math/half_recip.cl +++ b/libclc/opencl/lib/generic/math/half_recip.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_recip.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_recip -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_rsqrt.cl b/libclc/opencl/lib/generic/math/half_rsqrt.cl index 7f77d737ff20..6e9f999f3c44 100644 --- a/libclc/opencl/lib/generic/math/half_rsqrt.cl +++ b/libclc/opencl/lib/generic/math/half_rsqrt.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_rsqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_sin.cl b/libclc/opencl/lib/generic/math/half_sin.cl index e6f928a88e1d..54a1f033c9d8 100644 --- a/libclc/opencl/lib/generic/math/half_sin.cl +++ b/libclc/opencl/lib/generic/math/half_sin.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_sin.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_sqrt.cl b/libclc/opencl/lib/generic/math/half_sqrt.cl index 562663644b13..09700b236584 100644 --- a/libclc/opencl/lib/generic/math/half_sqrt.cl +++ b/libclc/opencl/lib/generic/math/half_sqrt.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_sqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/half_tan.cl b/libclc/opencl/lib/generic/math/half_tan.cl index 1ff24376b207..895821ee0b33 100644 --- a/libclc/opencl/lib/generic/math/half_tan.cl +++ b/libclc/opencl/lib/generic/math/half_tan.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_half_tan.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION half_tan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/hypot.cl b/libclc/opencl/lib/generic/math/hypot.cl index b81aed941ab4..c1d1518c95f7 100644 --- a/libclc/opencl/lib/generic/math/hypot.cl +++ b/libclc/opencl/lib/generic/math/hypot.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_hypot.h" #define __CLC_FUNCTION hypot -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/ilogb.cl b/libclc/opencl/lib/generic/math/ilogb.cl index f3060d3964bd..e28c25f53d87 100644 --- a/libclc/opencl/lib/generic/math/ilogb.cl +++ b/libclc/opencl/lib/generic/math/ilogb.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_ilogb.h" #define __CLC_FUNCTION ilogb -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_int_return.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/ldexp.cl b/libclc/opencl/lib/generic/math/ldexp.cl index f8ef83f3de21..7b0586bec3ee 100644 --- a/libclc/opencl/lib/generic/math/ldexp.cl +++ b/libclc/opencl/lib/generic/math/ldexp.cl @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_ldexp.h" #define __CLC_FUNCTION ldexp #define __CLC_IMPL_FUNCTION(x) __clc_ldexp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" -#include +#include "clc/math/gentype.inc" // This defines all the ldexp(GENTYPE, int) variants -#define __CLC_BODY -#include +#define __CLC_BODY "ldexp.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/lgamma.cl b/libclc/opencl/lib/generic/math/lgamma.cl index a07de8ad4b37..fe89cd52b150 100644 --- a/libclc/opencl/lib/generic/math/lgamma.cl +++ b/libclc/opencl/lib/generic/math/lgamma.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_lgamma.h" #define __CLC_FUNCTION lgamma -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/lgamma_r.cl b/libclc/opencl/lib/generic/math/lgamma_r.cl index 8cde1844a56f..805664c19f41 100644 --- a/libclc/opencl/lib/generic/math/lgamma_r.cl +++ b/libclc/opencl/lib/generic/math/lgamma_r.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_lgamma_r.h" #define __CLC_FUNCTION lgamma_r -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_int_ptr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/log.cl b/libclc/opencl/lib/generic/math/log.cl index 4e2890ad882a..933e95f3b9d6 100644 --- a/libclc/opencl/lib/generic/math/log.cl +++ b/libclc/opencl/lib/generic/math/log.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log.h" #define __CLC_FUNCTION log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/log10.cl b/libclc/opencl/lib/generic/math/log10.cl index d8c913570260..d78284d5dc26 100644 --- a/libclc/opencl/lib/generic/math/log10.cl +++ b/libclc/opencl/lib/generic/math/log10.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log10.h" #define __CLC_FUNCTION log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/log1p.cl b/libclc/opencl/lib/generic/math/log1p.cl index 8dbb5b26b3d3..c5082d368b2d 100644 --- a/libclc/opencl/lib/generic/math/log1p.cl +++ b/libclc/opencl/lib/generic/math/log1p.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log1p.h" #define __CLC_FUNCTION log1p -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/log2.cl b/libclc/opencl/lib/generic/math/log2.cl index 3fbe35482762..a56cd10aeef2 100644 --- a/libclc/opencl/lib/generic/math/log2.cl +++ b/libclc/opencl/lib/generic/math/log2.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_log2.h" #define __CLC_FUNCTION log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/logb.cl b/libclc/opencl/lib/generic/math/logb.cl index 63a60ae014f0..f2dba882b3da 100644 --- a/libclc/opencl/lib/generic/math/logb.cl +++ b/libclc/opencl/lib/generic/math/logb.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_logb.h" #define __CLC_FUNCTION logb -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/mad.cl b/libclc/opencl/lib/generic/math/mad.cl index 5cc52b39eb68..0e112aa8d34c 100644 --- a/libclc/opencl/lib/generic/math/mad.cl +++ b/libclc/opencl/lib/generic/math/mad.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_mad.h" #define __CLC_FUNCTION mad -#define __CLC_BODY +#define __CLC_BODY "clc/shared/ternary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/maxmag.cl b/libclc/opencl/lib/generic/math/maxmag.cl index 4a2e865a3553..63508b4259fb 100644 --- a/libclc/opencl/lib/generic/math/maxmag.cl +++ b/libclc/opencl/lib/generic/math/maxmag.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_maxmag.h" #define __CLC_FUNCTION maxmag -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/minmag.cl b/libclc/opencl/lib/generic/math/minmag.cl index 86f2b08e5b09..88e5a7b1a679 100644 --- a/libclc/opencl/lib/generic/math/minmag.cl +++ b/libclc/opencl/lib/generic/math/minmag.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_minmag.h" #define __CLC_FUNCTION minmag -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/modf.cl b/libclc/opencl/lib/generic/math/modf.cl index fe524ba305e9..22875fee0b75 100644 --- a/libclc/opencl/lib/generic/math/modf.cl +++ b/libclc/opencl/lib/generic/math/modf.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_modf.h" #define __CLC_FUNCTION modf -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_ptr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/nan.cl b/libclc/opencl/lib/generic/math/nan.cl index df0629fbf55a..6123ce74cfcf 100644 --- a/libclc/opencl/lib/generic/math/nan.cl +++ b/libclc/opencl/lib/generic/math/nan.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_nan.h" -#define __CLC_BODY -#include +#define __CLC_BODY "nan.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_cos.cl b/libclc/opencl/lib/generic/math/native_cos.cl index d2b9cf859696..8a77805efd55 100644 --- a/libclc/opencl/lib/generic/math/native_cos.cl +++ b/libclc/opencl/lib/generic/math/native_cos.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_cos.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_cos -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_divide.cl b/libclc/opencl/lib/generic/math/native_divide.cl index a1b8d5d2510c..f601ceaf678e 100644 --- a/libclc/opencl/lib/generic/math/native_divide.cl +++ b/libclc/opencl/lib/generic/math/native_divide.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_divide.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_divide -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_exp.cl b/libclc/opencl/lib/generic/math/native_exp.cl index 19da3c269b28..e3561756d519 100644 --- a/libclc/opencl/lib/generic/math/native_exp.cl +++ b/libclc/opencl/lib/generic/math/native_exp.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_exp.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_exp -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_exp10.cl b/libclc/opencl/lib/generic/math/native_exp10.cl index 58f8005463cf..d2be9616ffe0 100644 --- a/libclc/opencl/lib/generic/math/native_exp10.cl +++ b/libclc/opencl/lib/generic/math/native_exp10.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_exp10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_exp10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_exp2.cl b/libclc/opencl/lib/generic/math/native_exp2.cl index 8bed47dd18ee..1cb9ae02778d 100644 --- a/libclc/opencl/lib/generic/math/native_exp2.cl +++ b/libclc/opencl/lib/generic/math/native_exp2.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_exp2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_exp2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_log.cl b/libclc/opencl/lib/generic/math/native_log.cl index 0323f6668ba0..c40ca2bf7799 100644 --- a/libclc/opencl/lib/generic/math/native_log.cl +++ b/libclc/opencl/lib/generic/math/native_log.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_log -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_log10.cl b/libclc/opencl/lib/generic/math/native_log10.cl index 915fa8a2d4ed..86ee71f83a88 100644 --- a/libclc/opencl/lib/generic/math/native_log10.cl +++ b/libclc/opencl/lib/generic/math/native_log10.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log10.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_log10 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_log2.cl b/libclc/opencl/lib/generic/math/native_log2.cl index b5d8ff586761..c4256065b5d8 100644 --- a/libclc/opencl/lib/generic/math/native_log2.cl +++ b/libclc/opencl/lib/generic/math/native_log2.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_log2.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_log2 -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_powr.cl b/libclc/opencl/lib/generic/math/native_powr.cl index d1b2c5b93175..c508c1b261dd 100644 --- a/libclc/opencl/lib/generic/math/native_powr.cl +++ b/libclc/opencl/lib/generic/math/native_powr.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_powr.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_recip.cl b/libclc/opencl/lib/generic/math/native_recip.cl index 05df5e10cdbd..78a7e17ab87b 100644 --- a/libclc/opencl/lib/generic/math/native_recip.cl +++ b/libclc/opencl/lib/generic/math/native_recip.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_recip.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_recip -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_rsqrt.cl b/libclc/opencl/lib/generic/math/native_rsqrt.cl index 3c8c72098db0..87c313003c20 100644 --- a/libclc/opencl/lib/generic/math/native_rsqrt.cl +++ b/libclc/opencl/lib/generic/math/native_rsqrt.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_rsqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_sin.cl b/libclc/opencl/lib/generic/math/native_sin.cl index 4501e2f0fd8b..45280d8ad606 100644 --- a/libclc/opencl/lib/generic/math/native_sin.cl +++ b/libclc/opencl/lib/generic/math/native_sin.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_sin.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_sin -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_sqrt.cl b/libclc/opencl/lib/generic/math/native_sqrt.cl index a7eb715f0ef5..d8d55e1781ec 100644 --- a/libclc/opencl/lib/generic/math/native_sqrt.cl +++ b/libclc/opencl/lib/generic/math/native_sqrt.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_sqrt.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/native_tan.cl b/libclc/opencl/lib/generic/math/native_tan.cl index 0ee7e827338a..a45b44d64d7a 100644 --- a/libclc/opencl/lib/generic/math/native_tan.cl +++ b/libclc/opencl/lib/generic/math/native_tan.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_native_tan.h" #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION native_tan -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/nextafter.cl b/libclc/opencl/lib/generic/math/nextafter.cl index 6862432a81c7..35631c8105b3 100644 --- a/libclc/opencl/lib/generic/math/nextafter.cl +++ b/libclc/opencl/lib/generic/math/nextafter.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_nextafter.h" #define __CLC_FUNCTION nextafter #define __CLC_IMPL_FUNCTION(x) __clc_nextafter -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/pown.cl b/libclc/opencl/lib/generic/math/pown.cl index 7f51666530b1..7f47efba0b8a 100644 --- a/libclc/opencl/lib/generic/math/pown.cl +++ b/libclc/opencl/lib/generic/math/pown.cl @@ -9,7 +9,7 @@ #include "clc/math/clc_pown.h" #define __CLC_FUNCTION pown -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" #include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_IMPL_FUNCTION @@ -17,5 +17,5 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __pown_fast #define __CLC_IMPL_FUNCTION(x) __clc_pown_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" #include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/powr.cl b/libclc/opencl/lib/generic/math/powr.cl index e74297589a2b..a82e5e309a94 100644 --- a/libclc/opencl/lib/generic/math/powr.cl +++ b/libclc/opencl/lib/generic/math/powr.cl @@ -9,7 +9,7 @@ #include "clc/math/clc_powr.h" #define __CLC_FUNCTION powr -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" #include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_IMPL_FUNCTION @@ -17,5 +17,5 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __powr_fast #define __CLC_IMPL_FUNCTION(x) __clc_powr_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def.inc" #include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/remainder.cl b/libclc/opencl/lib/generic/math/remainder.cl index cc5a4988b7c9..bbfd1a8e7d46 100644 --- a/libclc/opencl/lib/generic/math/remainder.cl +++ b/libclc/opencl/lib/generic/math/remainder.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_remainder.h" #define __CLC_FUNCTION remainder -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/binary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/remquo.cl b/libclc/opencl/lib/generic/math/remquo.cl index 2bd359ca547f..578a5feb3a4b 100644 --- a/libclc/opencl/lib/generic/math/remquo.cl +++ b/libclc/opencl/lib/generic/math/remquo.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_remquo.h" -#define __CLC_BODY -#include +#define __CLC_BODY "remquo.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/rint.cl b/libclc/opencl/lib/generic/math/rint.cl index 1791123f637b..95679ae463b9 100644 --- a/libclc/opencl/lib/generic/math/rint.cl +++ b/libclc/opencl/lib/generic/math/rint.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_rint.h" #define __CLC_FUNCTION rint -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/rootn.cl b/libclc/opencl/lib/generic/math/rootn.cl index 1c329e49deda..c2d7c9f1c210 100644 --- a/libclc/opencl/lib/generic/math/rootn.cl +++ b/libclc/opencl/lib/generic/math/rootn.cl @@ -9,7 +9,7 @@ #include "clc/math/clc_rootn.h" #define __CLC_FUNCTION rootn -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" #include "clc/math/gentype.inc" #undef __CLC_FUNCTION #undef __CLC_IMPL_FUNCTION @@ -17,5 +17,5 @@ #define __CLC_FLOAT_ONLY #define __CLC_FUNCTION __rootn_fast #define __CLC_IMPL_FUNCTION(x) __clc_rootn_fast -#define __CLC_BODY +#define __CLC_BODY "clc/shared/binary_def_with_int_second_arg.inc" #include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/round.cl b/libclc/opencl/lib/generic/math/round.cl index 8af24a8ba0b1..ebdeead88c4f 100644 --- a/libclc/opencl/lib/generic/math/round.cl +++ b/libclc/opencl/lib/generic/math/round.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_round.h" #define __CLC_FUNCTION round -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/rsqrt.cl b/libclc/opencl/lib/generic/math/rsqrt.cl index 269462f85d95..a292db519c1c 100644 --- a/libclc/opencl/lib/generic/math/rsqrt.cl +++ b/libclc/opencl/lib/generic/math/rsqrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_rsqrt.h" #define __CLC_FUNCTION rsqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/sin.cl b/libclc/opencl/lib/generic/math/sin.cl index 7ffdc3329749..4ca81dc67c6f 100644 --- a/libclc/opencl/lib/generic/math/sin.cl +++ b/libclc/opencl/lib/generic/math/sin.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sin.h" #define __CLC_FUNCTION sin -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/sincos.cl b/libclc/opencl/lib/generic/math/sincos.cl index aa1fc0cf4d80..2774b3688838 100644 --- a/libclc/opencl/lib/generic/math/sincos.cl +++ b/libclc/opencl/lib/generic/math/sincos.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sincos.h" #define __CLC_FUNCTION sincos -#define __CLC_BODY -#include +#define __CLC_BODY "clc/math/unary_def_with_ptr.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/sinh.cl b/libclc/opencl/lib/generic/math/sinh.cl index e1f4d115d4d0..40e2c63a528e 100644 --- a/libclc/opencl/lib/generic/math/sinh.cl +++ b/libclc/opencl/lib/generic/math/sinh.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sinh.h" #define __CLC_FUNCTION sinh -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/sinpi.cl b/libclc/opencl/lib/generic/math/sinpi.cl index 2c0024b908ea..54a4f40308c6 100644 --- a/libclc/opencl/lib/generic/math/sinpi.cl +++ b/libclc/opencl/lib/generic/math/sinpi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sinpi.h" #define __CLC_FUNCTION sinpi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/sqrt.cl b/libclc/opencl/lib/generic/math/sqrt.cl index 4c5a76d14a5d..969cb645d30e 100644 --- a/libclc/opencl/lib/generic/math/sqrt.cl +++ b/libclc/opencl/lib/generic/math/sqrt.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_sqrt.h" #define __CLC_FUNCTION sqrt -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/tan.cl b/libclc/opencl/lib/generic/math/tan.cl index 7b9e504d7f25..87418860862d 100644 --- a/libclc/opencl/lib/generic/math/tan.cl +++ b/libclc/opencl/lib/generic/math/tan.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_tan.h" #define __CLC_FUNCTION tan -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/tanh.cl b/libclc/opencl/lib/generic/math/tanh.cl index 539085a3f243..39859b748a3e 100644 --- a/libclc/opencl/lib/generic/math/tanh.cl +++ b/libclc/opencl/lib/generic/math/tanh.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_tanh.h" #define __CLC_FUNCTION tanh -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/tanpi.cl b/libclc/opencl/lib/generic/math/tanpi.cl index 4ebde1d1652e..647c6d4e1821 100644 --- a/libclc/opencl/lib/generic/math/tanpi.cl +++ b/libclc/opencl/lib/generic/math/tanpi.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_tanpi.h" #define __CLC_FUNCTION tanpi -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/tgamma.cl b/libclc/opencl/lib/generic/math/tgamma.cl index 1e11b5f5ed64..2d6cc6e9efad 100644 --- a/libclc/opencl/lib/generic/math/tgamma.cl +++ b/libclc/opencl/lib/generic/math/tgamma.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_tgamma.h" #define __CLC_FUNCTION tgamma -#define __CLC_BODY -#include +#define __CLC_BODY "clc/shared/unary_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/math/trunc.cl b/libclc/opencl/lib/generic/math/trunc.cl index 724b646afa15..505699ddf7e3 100644 --- a/libclc/opencl/lib/generic/math/trunc.cl +++ b/libclc/opencl/lib/generic/math/trunc.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/math/clc_trunc.h" #define __CLC_FUNCTION trunc -#define __CLC_BODY +#define __CLC_BODY "clc/shared/unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/mem_fence/fence.cl b/libclc/opencl/lib/generic/mem_fence/fence.cl index 38fb15c2c1de..eed8f6e0ce66 100644 --- a/libclc/opencl/lib/generic/mem_fence/fence.cl +++ b/libclc/opencl/lib/generic/mem_fence/fence.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/mem_fence/clc_mem_fence.h" +#include "clc/opencl/synchronization/utils.h" _CLC_DEF _CLC_OVERLOAD void mem_fence(cl_mem_fence_flags flags) { int memory_scope = __MEMORY_SCOPE_WRKGRP; diff --git a/libclc/opencl/lib/generic/misc/shuffle.cl b/libclc/opencl/lib/generic/misc/shuffle.cl index 7c47fb8ea9cf..194e6e45b58b 100644 --- a/libclc/opencl/lib/generic/misc/shuffle.cl +++ b/libclc/opencl/lib/generic/misc/shuffle.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/misc/clc_shuffle.h" #define __CLC_FUNCTION shuffle -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/misc/shuffle2.cl b/libclc/opencl/lib/generic/misc/shuffle2.cl index 3fb3dbc2a580..269241a80ae0 100644 --- a/libclc/opencl/lib/generic/misc/shuffle2.cl +++ b/libclc/opencl/lib/generic/misc/shuffle2.cl @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/misc/clc_shuffle2.h" #define __CLC_FUNCTION shuffle2 -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle2_def.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clc/misc/shuffle2_def.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/all.cl b/libclc/opencl/lib/generic/relational/all.cl index c896b811964f..6f9f5ec44a85 100644 --- a/libclc/opencl/lib/generic/relational/all.cl +++ b/libclc/opencl/lib/generic/relational/all.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_all.h" #define __CLC_ALL_ID(TYPE) _CLC_OVERLOAD _CLC_DEF int all(TYPE v) diff --git a/libclc/opencl/lib/generic/relational/any.cl b/libclc/opencl/lib/generic/relational/any.cl index e6fb84dd182f..ca4b9c812881 100644 --- a/libclc/opencl/lib/generic/relational/any.cl +++ b/libclc/opencl/lib/generic/relational/any.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_any.h" #define __CLC_ANY_ID(TYPE) _CLC_OVERLOAD _CLC_DEF int any(TYPE v) diff --git a/libclc/opencl/lib/generic/relational/bitselect.cl b/libclc/opencl/lib/generic/relational/bitselect.cl index b4b4707d28cd..52dbbf62b340 100644 --- a/libclc/opencl/lib/generic/relational/bitselect.cl +++ b/libclc/opencl/lib/generic/relational/bitselect.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_bitselect.h" -#define __CLC_BODY -#include +#define __CLC_BODY "bitselect.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "bitselect.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isequal.cl b/libclc/opencl/lib/generic/relational/isequal.cl index c82657333a8d..5f317d4edd2e 100644 --- a/libclc/opencl/lib/generic/relational/isequal.cl +++ b/libclc/opencl/lib/generic/relational/isequal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isequal.h" #define __CLC_FUNCTION isequal #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isfinite.cl b/libclc/opencl/lib/generic/relational/isfinite.cl index 58957be473fb..6420f854f003 100644 --- a/libclc/opencl/lib/generic/relational/isfinite.cl +++ b/libclc/opencl/lib/generic/relational/isfinite.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isfinite.h" #define __CLC_FUNCTION isfinite #define __CLC_BODY "relational_unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isgreater.cl b/libclc/opencl/lib/generic/relational/isgreater.cl index 5f450c2986d7..3088f98f35df 100644 --- a/libclc/opencl/lib/generic/relational/isgreater.cl +++ b/libclc/opencl/lib/generic/relational/isgreater.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isgreater.h" #define __CLC_FUNCTION isgreater #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isgreaterequal.cl b/libclc/opencl/lib/generic/relational/isgreaterequal.cl index 03c04419e3cb..7fcd6dd3125e 100644 --- a/libclc/opencl/lib/generic/relational/isgreaterequal.cl +++ b/libclc/opencl/lib/generic/relational/isgreaterequal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isgreaterequal.h" #define __CLC_FUNCTION isgreaterequal #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isinf.cl b/libclc/opencl/lib/generic/relational/isinf.cl index db2c31bb4868..78441297536c 100644 --- a/libclc/opencl/lib/generic/relational/isinf.cl +++ b/libclc/opencl/lib/generic/relational/isinf.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isinf.h" #define __CLC_FUNCTION isinf #define __CLC_BODY "relational_unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isless.cl b/libclc/opencl/lib/generic/relational/isless.cl index 39a332b5dc6e..d3d26b11ab2a 100644 --- a/libclc/opencl/lib/generic/relational/isless.cl +++ b/libclc/opencl/lib/generic/relational/isless.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isless.h" #define __CLC_FUNCTION isless #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/islessequal.cl b/libclc/opencl/lib/generic/relational/islessequal.cl index 84c960d49402..09ab8fa97d24 100644 --- a/libclc/opencl/lib/generic/relational/islessequal.cl +++ b/libclc/opencl/lib/generic/relational/islessequal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_islessequal.h" #define __CLC_FUNCTION islessequal #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/islessgreater.cl b/libclc/opencl/lib/generic/relational/islessgreater.cl index ea8accc299d7..770fe75c61e2 100644 --- a/libclc/opencl/lib/generic/relational/islessgreater.cl +++ b/libclc/opencl/lib/generic/relational/islessgreater.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_islessgreater.h" #define __CLC_FUNCTION islessgreater #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isnan.cl b/libclc/opencl/lib/generic/relational/isnan.cl index 41b54f3a1042..c8e56ae3e063 100644 --- a/libclc/opencl/lib/generic/relational/isnan.cl +++ b/libclc/opencl/lib/generic/relational/isnan.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isnan.h" #define __CLC_FUNCTION isnan #define __CLC_BODY "relational_unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isnormal.cl b/libclc/opencl/lib/generic/relational/isnormal.cl index a0a09f6f6aba..bd002b4afef4 100644 --- a/libclc/opencl/lib/generic/relational/isnormal.cl +++ b/libclc/opencl/lib/generic/relational/isnormal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isnormal.h" #define __CLC_FUNCTION isnormal #define __CLC_BODY "relational_unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isnotequal.cl b/libclc/opencl/lib/generic/relational/isnotequal.cl index 8504b5ee7772..bdc50243c646 100644 --- a/libclc/opencl/lib/generic/relational/isnotequal.cl +++ b/libclc/opencl/lib/generic/relational/isnotequal.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isnotequal.h" #define __CLC_FUNCTION isnotequal #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isordered.cl b/libclc/opencl/lib/generic/relational/isordered.cl index cd79333f45aa..ca28421cb66b 100644 --- a/libclc/opencl/lib/generic/relational/isordered.cl +++ b/libclc/opencl/lib/generic/relational/isordered.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isordered.h" #define __CLC_FUNCTION isordered #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/isunordered.cl b/libclc/opencl/lib/generic/relational/isunordered.cl index 90f5506e1f98..e92c097ac376 100644 --- a/libclc/opencl/lib/generic/relational/isunordered.cl +++ b/libclc/opencl/lib/generic/relational/isunordered.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_isunordered.h" #define __CLC_FUNCTION isunordered #define __CLC_BODY "relational_binary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/relational_binary_def.inc b/libclc/opencl/lib/generic/relational/relational_binary_def.inc index b60d9bbe45e1..d91b893207c5 100644 --- a/libclc/opencl/lib/generic/relational/relational_binary_def.inc +++ b/libclc/opencl/lib/generic/relational/relational_binary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/opencl/lib/generic/relational/relational_unary_def.inc b/libclc/opencl/lib/generic/relational/relational_unary_def.inc index 1655ace114aa..a39c26cc2a52 100644 --- a/libclc/opencl/lib/generic/relational/relational_unary_def.inc +++ b/libclc/opencl/lib/generic/relational/relational_unary_def.inc @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/utils.h" #define __CLC_IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x) diff --git a/libclc/opencl/lib/generic/relational/select.cl b/libclc/opencl/lib/generic/relational/select.cl index 4b3ea01d5303..d0150041f348 100644 --- a/libclc/opencl/lib/generic/relational/select.cl +++ b/libclc/opencl/lib/generic/relational/select.cl @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/relational/clc_select.h" +#include "clc/utils.h" #define __CLC_SELECT_FN select #define __CLC_SELECT_DEF(x, y, z) return __clc_select(x, y, z) -#define __CLC_BODY -#include -#define __CLC_BODY -#include +#define __CLC_BODY "clc/relational/clc_select_impl.inc" +#include "clc/math/gentype.inc" +#define __CLC_BODY "clc/relational/clc_select_impl.inc" +#include "clc/integer/gentype.inc" diff --git a/libclc/opencl/lib/generic/relational/signbit.cl b/libclc/opencl/lib/generic/relational/signbit.cl index 89e3e9f33540..121da4d8f4b5 100644 --- a/libclc/opencl/lib/generic/relational/signbit.cl +++ b/libclc/opencl/lib/generic/relational/signbit.cl @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/relational/clc_signbit.h" #define __CLC_FUNCTION signbit #define __CLC_BODY "relational_unary_def.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/shared/clamp.cl b/libclc/opencl/lib/generic/shared/clamp.cl index 8f740dab47e0..8d6fe0e98b26 100644 --- a/libclc/opencl/lib/generic/shared/clamp.cl +++ b/libclc/opencl/lib/generic/shared/clamp.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/shared/clc_clamp.h" -#define __CLC_BODY -#include +#define __CLC_BODY "clamp.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "clamp.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/shared/max.cl b/libclc/opencl/lib/generic/shared/max.cl index a0018c4b11fd..067add6d72e4 100644 --- a/libclc/opencl/lib/generic/shared/max.cl +++ b/libclc/opencl/lib/generic/shared/max.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/shared/clc_max.h" -#define __CLC_BODY -#include +#define __CLC_BODY "max.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "max.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/shared/min.cl b/libclc/opencl/lib/generic/shared/min.cl index f0ddca2a133b..d6cd031f560f 100644 --- a/libclc/opencl/lib/generic/shared/min.cl +++ b/libclc/opencl/lib/generic/shared/min.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/shared/clc_min.h" -#define __CLC_BODY -#include +#define __CLC_BODY "min.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "min.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/shared/vload.cl b/libclc/opencl/lib/generic/shared/vload.cl index d31697378a2e..41c0085ac232 100644 --- a/libclc/opencl/lib/generic/shared/vload.cl +++ b/libclc/opencl/lib/generic/shared/vload.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/shared/clc_vload.h" #define __CLC_BODY "vload.inc" -#include +#include "clc/integer/gentype.inc" #define __CLC_BODY "vload.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/shared/vstore.cl b/libclc/opencl/lib/generic/shared/vstore.cl index 915cd8754964..7f945b26489f 100644 --- a/libclc/opencl/lib/generic/shared/vstore.cl +++ b/libclc/opencl/lib/generic/shared/vstore.cl @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/shared/clc_vstore.h" #define __CLC_BODY "vstore.inc" -#include +#include "clc/integer/gentype.inc" #define __CLC_BODY "vstore.inc" -#include +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl b/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl index 9401653d089b..828701adf2eb 100644 --- a/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl +++ b/libclc/opencl/lib/generic/subgroup/sub_group_broadcast.cl @@ -8,8 +8,8 @@ #include "clc/subgroup/clc_sub_group_broadcast.h" -#define __CLC_BODY -#include +#define __CLC_BODY "sub_group_broadcast.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "sub_group_broadcast.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl b/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl index 1614fafd0c6e..7e1737327ff1 100644 --- a/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl +++ b/libclc/opencl/lib/generic/subgroup/sub_group_reduce.cl @@ -8,8 +8,8 @@ #include "clc/subgroup/clc_sub_group_reduce.h" -#define __CLC_BODY -#include +#define __CLC_BODY "sub_group_reduce.inc" +#include "clc/integer/gentype.inc" -#define __CLC_BODY -#include +#define __CLC_BODY "sub_group_reduce.inc" +#include "clc/math/gentype.inc" diff --git a/libclc/opencl/lib/generic/subnormal_config.cl b/libclc/opencl/lib/generic/subnormal_config.cl index 799acc063d35..be40607c69a3 100644 --- a/libclc/opencl/lib/generic/subnormal_config.cl +++ b/libclc/opencl/lib/generic/subnormal_config.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/math/clc_subnormal_config.h" +#include "clc/opencl/opencl-base.h" _CLC_DEF bool __clc_fp16_subnormals_supported() { return false; } diff --git a/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl b/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl index 416a3e9837cd..5533d5c3aac2 100644 --- a/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl +++ b/libclc/opencl/lib/generic/workitem/get_enqueued_local_size.cl @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include "clc/opencl/opencl-base.h" +#include "clc/workitem/clc_get_enqueued_local_size.h" _CLC_DEF _CLC_OVERLOAD size_t get_enqueued_local_size(uint dim) { return __clc_get_enqueued_local_size(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_global_id.cl b/libclc/opencl/lib/generic/workitem/get_global_id.cl index d134dfc3f8d7..a93027e47334 100644 --- a/libclc/opencl/lib/generic/workitem/get_global_id.cl +++ b/libclc/opencl/lib/generic/workitem/get_global_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_global_id.h" _CLC_DEF _CLC_OVERLOAD size_t get_global_id(uint dim) { return __clc_get_global_id(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_global_offset.cl b/libclc/opencl/lib/generic/workitem/get_global_offset.cl index 7338f140ab08..bddd0c191f44 100644 --- a/libclc/opencl/lib/generic/workitem/get_global_offset.cl +++ b/libclc/opencl/lib/generic/workitem/get_global_offset.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_global_offset.h" _CLC_DEF _CLC_OVERLOAD size_t get_global_offset(uint dim) { return __clc_get_global_offset(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_group_id.cl b/libclc/opencl/lib/generic/workitem/get_group_id.cl index 24b61c7488d3..612a335f8bc8 100644 --- a/libclc/opencl/lib/generic/workitem/get_group_id.cl +++ b/libclc/opencl/lib/generic/workitem/get_group_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_group_id.h" _CLC_DEF _CLC_OVERLOAD size_t get_group_id(uint dim) { return __clc_get_group_id(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_local_id.cl b/libclc/opencl/lib/generic/workitem/get_local_id.cl index dc51a3557211..694523f25879 100644 --- a/libclc/opencl/lib/generic/workitem/get_local_id.cl +++ b/libclc/opencl/lib/generic/workitem/get_local_id.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_local_id.h" _CLC_DEF _CLC_OVERLOAD size_t get_local_id(uint dim) { return __clc_get_local_id(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_local_size.cl b/libclc/opencl/lib/generic/workitem/get_local_size.cl index 61a6d8ef88f9..7b59a85f5afe 100644 --- a/libclc/opencl/lib/generic/workitem/get_local_size.cl +++ b/libclc/opencl/lib/generic/workitem/get_local_size.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_local_size.h" _CLC_OVERLOAD _CLC_DEF size_t get_local_size(uint dim) { return __clc_get_local_size(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_num_groups.cl b/libclc/opencl/lib/generic/workitem/get_num_groups.cl index 6beadd3ca898..d31c3b0747a2 100644 --- a/libclc/opencl/lib/generic/workitem/get_num_groups.cl +++ b/libclc/opencl/lib/generic/workitem/get_num_groups.cl @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_num_groups.h" _CLC_OVERLOAD _CLC_DEF size_t get_num_groups(uint dim) { return __clc_get_num_groups(dim); diff --git a/libclc/opencl/lib/generic/workitem/get_work_dim.cl b/libclc/opencl/lib/generic/workitem/get_work_dim.cl index c59432a0038e..51e4712e4cb8 100644 --- a/libclc/opencl/lib/generic/workitem/get_work_dim.cl +++ b/libclc/opencl/lib/generic/workitem/get_work_dim.cl @@ -6,6 +6,6 @@ // //===----------------------------------------------------------------------===// -#include +#include "clc/workitem/clc_get_work_dim.h" _CLC_DEF _CLC_OVERLOAD uint get_work_dim() { return __clc_get_work_dim(); }