diff --git a/libclc/clc/include/clc/clcmacro.h b/libclc/clc/include/clc/clcmacro.h deleted file mode 100644 index 9fa11489b1457..0000000000000 --- a/libclc/clc/include/clc/clcmacro.h +++ /dev/null @@ -1,69 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef __CLC_CLCMACRO_H__ -#define __CLC_CLCMACRO_H__ - -#include -#include - -#define _CLC_V_V_VP_VECTORIZE(DECLSPEC, RET_TYPE, __CLC_FUNCTION, ARG1_TYPE, \ - ADDR_SPACE, ARG2_TYPE) \ - DECLSPEC __CLC_XCONCAT(RET_TYPE, 2) \ - __CLC_FUNCTION(__CLC_XCONCAT(ARG1_TYPE, 2) x, \ - ADDR_SPACE __CLC_XCONCAT(ARG2_TYPE, 2) * y) { \ - ADDR_SPACE ARG2_TYPE *ptr = (ADDR_SPACE ARG2_TYPE *)y; \ - return (__CLC_XCONCAT(RET_TYPE, 2))(__CLC_FUNCTION(x.s0, ptr), \ - __CLC_FUNCTION(x.s1, ptr + 1)); \ - } \ - \ - DECLSPEC __CLC_XCONCAT(RET_TYPE, 3) \ - __CLC_FUNCTION(__CLC_XCONCAT(ARG1_TYPE, 3) x, \ - ADDR_SPACE __CLC_XCONCAT(ARG2_TYPE, 3) * y) { \ - ADDR_SPACE ARG2_TYPE *ptr = (ADDR_SPACE ARG2_TYPE *)y; \ - return (__CLC_XCONCAT(RET_TYPE, 3))(__CLC_FUNCTION(x.s0, ptr), \ - __CLC_FUNCTION(x.s1, ptr + 1), \ - __CLC_FUNCTION(x.s2, ptr + 2)); \ - } \ - \ - DECLSPEC __CLC_XCONCAT(RET_TYPE, 4) \ - __CLC_FUNCTION(__CLC_XCONCAT(ARG1_TYPE, 4) x, \ - ADDR_SPACE __CLC_XCONCAT(ARG2_TYPE, 4) * y) { \ - ADDR_SPACE ARG2_TYPE *ptr = (ADDR_SPACE ARG2_TYPE *)y; \ - return (__CLC_XCONCAT(RET_TYPE, 4))( \ - __CLC_FUNCTION(x.s0, ptr), __CLC_FUNCTION(x.s1, ptr + 1), \ - __CLC_FUNCTION(x.s2, ptr + 2), __CLC_FUNCTION(x.s3, ptr + 3)); \ - } \ - \ - DECLSPEC __CLC_XCONCAT(RET_TYPE, 8) \ - __CLC_FUNCTION(__CLC_XCONCAT(ARG1_TYPE, 8) x, \ - ADDR_SPACE __CLC_XCONCAT(ARG2_TYPE, 8) * y) { \ - ADDR_SPACE ARG2_TYPE *ptr = (ADDR_SPACE ARG2_TYPE *)y; \ - return (__CLC_XCONCAT(RET_TYPE, 8))( \ - __CLC_FUNCTION(x.s0, ptr), __CLC_FUNCTION(x.s1, ptr + 1), \ - __CLC_FUNCTION(x.s2, ptr + 2), __CLC_FUNCTION(x.s3, ptr + 3), \ - __CLC_FUNCTION(x.s4, ptr + 4), __CLC_FUNCTION(x.s5, ptr + 5), \ - __CLC_FUNCTION(x.s6, ptr + 6), __CLC_FUNCTION(x.s7, ptr + 7)); \ - } \ - \ - DECLSPEC __CLC_XCONCAT(RET_TYPE, 16) \ - __CLC_FUNCTION(__CLC_XCONCAT(ARG1_TYPE, 16) x, \ - ADDR_SPACE __CLC_XCONCAT(ARG2_TYPE, 16) * y) { \ - ADDR_SPACE ARG2_TYPE *ptr = (ADDR_SPACE ARG2_TYPE *)y; \ - return (__CLC_XCONCAT(RET_TYPE, 16))( \ - __CLC_FUNCTION(x.s0, ptr), __CLC_FUNCTION(x.s1, ptr + 1), \ - __CLC_FUNCTION(x.s2, ptr + 2), __CLC_FUNCTION(x.s3, ptr + 3), \ - __CLC_FUNCTION(x.s4, ptr + 4), __CLC_FUNCTION(x.s5, ptr + 5), \ - __CLC_FUNCTION(x.s6, ptr + 6), __CLC_FUNCTION(x.s7, ptr + 7), \ - __CLC_FUNCTION(x.s8, ptr + 8), __CLC_FUNCTION(x.s9, ptr + 9), \ - __CLC_FUNCTION(x.sa, ptr + 10), __CLC_FUNCTION(x.sb, ptr + 11), \ - __CLC_FUNCTION(x.sc, ptr + 12), __CLC_FUNCTION(x.sd, ptr + 13), \ - __CLC_FUNCTION(x.se, ptr + 14), __CLC_FUNCTION(x.sf, ptr + 15)); \ - } - -#endif // __CLC_CLCMACRO_H__ diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/acos.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/acos.cl index fa43dc71adf4a..1871d94b41b39 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/acos.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/acos.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_acos diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/acosh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/acosh.cl index 826225ca8f8b1..c6bbc071a50a5 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/acosh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/acosh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_acosh diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/asin.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/asin.cl index f397a8c994011..a1e7a504a4531 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/asin.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/asin.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_asin diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/asinh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/asinh.cl index 9718463c6871e..f86fc27510222 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/asinh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/asinh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_asinh diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/atan.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/atan.cl index 4f260817b64ee..9191361c2b61e 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/atan.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/atan.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_atan diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/atan2.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/atan2.cl index e8df3aa6bf69b..37b4e1a2457b7 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/atan2.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/atan2.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_atan2 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/atanh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/atanh.cl index eac6162ed883f..b1cdbd9fa11c4 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/atanh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/atanh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_atanh diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/cbrt.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/cbrt.cl index 4fb8d616567f3..0891316316b40 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/cbrt.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/cbrt.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_cbrt diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/copysign.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/copysign.cl index 27c5a46f7db77..04120aee159bb 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/copysign.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/copysign.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_copysign diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/cos.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/cos.cl index b9220a5b807df..d40cd3629619b 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/cos.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/cos.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_cos diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/cosh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/cosh.cl index c1c5548ecfe4b..ec32ad4813365 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/cosh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/cosh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_cosh diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/cospi.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/cospi.cl index 6674c195d983f..d13d15e61fb5a 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/cospi.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/cospi.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_cospi diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/erf.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/erf.cl index e7c83ab252b7d..01b8c68d93220 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/erf.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/erf.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_erf diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/erfc.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/erfc.cl index b30fd883b68f3..c624f3ec60594 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/erfc.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/erfc.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_erfc diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/exp10.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/exp10.cl index 2f1168d6bc9fa..5bd8eac1b3949 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/exp10.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/exp10.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_exp10 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/exp2.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/exp2.cl index add1c8f1aace4..7ec9411854734 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/exp2.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/exp2.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_exp2 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/expm1.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/expm1.cl index 4925149f927a7..474315e41daaa 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/expm1.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/expm1.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_expm1 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/fdim.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/fdim.cl index 9ded84279755d..d1c31448ee3b8 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/fdim.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/fdim.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_fdim diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/fmod.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/fmod.cl index 99df2ee483570..2d7c6a243e1c4 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/fmod.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/fmod.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_fmod diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/hypot.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/hypot.cl index 3f6d2c9ff9f83..d5eef5024d015 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/hypot.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/hypot.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_hypot diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/log10.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/log10.cl index 1f38bbdc92538..e65df7d769939 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/log10.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/log10.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_log10 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/log1p.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/log1p.cl index cd5ccfc395fff..21249bdfe358d 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/log1p.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/log1p.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_log1p diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/log2.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/log2.cl index 4619f2db6d7ec..5ba180e631b7e 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/log2.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/log2.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_log2 diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/logb.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/logb.cl index 5435869ad9273..b10f656d4e4ea 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/logb.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/logb.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_logb diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/nextafter.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/nextafter.cl index 887e296ab2fc1..6fe98159db71f 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/nextafter.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/nextafter.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_nextafter diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/pow.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/pow.cl index 95677320ba58c..46e9116df1381 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/pow.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/pow.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_pow diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/round.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/round.cl index 42052267df587..802bf8709363e 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/round.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/round.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_round diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/rsqrt.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/rsqrt.cl index 5ed5c6fc413d7..aa43e80d31bb3 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/rsqrt.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/rsqrt.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_rsqrt diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/sin.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/sin.cl index 499350fd81d76..45e6998497380 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/sin.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/sin.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_sin diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/sinh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/sinh.cl index 6465c6066c3e0..7a0c3a070820c 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/sinh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/sinh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_sinh diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/tan.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/tan.cl index 236f93635cc23..7f932d98ccab8 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/tan.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/tan.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_tan diff --git a/libclc/libspirv/lib/amdgcn-amdhsa/math/tanh.cl b/libclc/libspirv/lib/amdgcn-amdhsa/math/tanh.cl index 21c6b6088cfd0..7fc3a2b07258c 100644 --- a/libclc/libspirv/lib/amdgcn-amdhsa/math/tanh.cl +++ b/libclc/libspirv/lib/amdgcn-amdhsa/math/tanh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_tanh diff --git a/libclc/libspirv/lib/generic/common/radians.cl b/libclc/libspirv/lib/generic/common/radians.cl index 051f9a835ad49..f23afa37ff8cf 100644 --- a/libclc/libspirv/lib/generic/common/radians.cl +++ b/libclc/libspirv/lib/generic/common/radians.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #include diff --git a/libclc/libspirv/lib/generic/common/smoothstep.cl b/libclc/libspirv/lib/generic/common/smoothstep.cl index d19a79fb3a23c..6b14b3884e640 100644 --- a/libclc/libspirv/lib/generic/common/smoothstep.cl +++ b/libclc/libspirv/lib/generic/common/smoothstep.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #include diff --git a/libclc/libspirv/lib/generic/geometric/scale.cl b/libclc/libspirv/lib/generic/geometric/scale.cl index 89cb4d072136c..f41631fa20af9 100644 --- a/libclc/libspirv/lib/generic/geometric/scale.cl +++ b/libclc/libspirv/lib/generic/geometric/scale.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define _CLC_GEN_VECTORTIMESSCALAR_IMPL(DECLSPEC, TYPE, VECLEN) \ diff --git a/libclc/libspirv/lib/generic/math/fmax_common.cl b/libclc/libspirv/lib/generic/math/fmax_common.cl index 3f8bc1e577804..db2f1ca2636bc 100644 --- a/libclc/libspirv/lib/generic/math/fmax_common.cl +++ b/libclc/libspirv/lib/generic/math/fmax_common.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_BODY diff --git a/libclc/libspirv/lib/generic/math/fmin_common.cl b/libclc/libspirv/lib/generic/math/fmin_common.cl index 927322b016f9b..1348001e07eda 100644 --- a/libclc/libspirv/lib/generic/math/fmin_common.cl +++ b/libclc/libspirv/lib/generic/math/fmin_common.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_BODY diff --git a/libclc/libspirv/lib/generic/math/round.cl b/libclc/libspirv/lib/generic/math/round.cl index c22f8aa12be72..6629dd774ae3d 100644 --- a/libclc/libspirv/lib/generic/math/round.cl +++ b/libclc/libspirv/lib/generic/math/round.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #define __CLC_FUNCTION __spirv_ocl_round diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/acos.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/acos.cl index e5992deb82416..4bd8269608566 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/acos.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/acos.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_acos #define __CLC_BUILTIN __nv_acos diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/acosh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/acosh.cl index eac055f2a7c0c..c3b9901e4829d 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/acosh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/acosh.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_acosh #define __CLC_BUILTIN __nv_acosh diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/asin.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/asin.cl index 06a213c446071..b5a2f3ead7e72 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/asin.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/asin.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_asin #define __CLC_BUILTIN __nv_asin diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/asinh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/asinh.cl index 3dfeffaae686f..c5be426e64b4b 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/asinh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/asinh.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_asinh #define __CLC_BUILTIN __nv_asinh diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/atan.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/atan.cl index 41c548e8735c2..34e1e0071ef08 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/atan.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/atan.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_atan #define __CLC_BUILTIN __nv_atan diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/atan2.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/atan2.cl index f8e698c0908fe..4c84c7182a63b 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/atan2.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/atan2.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_atan2 #define __CLC_BUILTIN __nv_atan2 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/atanh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/atanh.cl index b692b038bf257..1f21fb36012b8 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/atanh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/atanh.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_atanh #define __CLC_BUILTIN __nv_atanh diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/cbrt.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/cbrt.cl index ab80749dc4b9d..88c2619b92792 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/cbrt.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/cbrt.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_cbrt #define __CLC_BUILTIN __nv_cbrt diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/copysign.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/copysign.cl index be0de70571f73..c4d8c9f35704c 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/copysign.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/copysign.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_copysign #define __CLC_BUILTIN __nv_copysign diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/cos.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/cos.cl index e05da293ec119..526907b356a77 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/cos.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/cos.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_cos #define __CLC_BUILTIN __nv_cos diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/cosh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/cosh.cl index 0edd7214c5f63..46bb2c407a5a6 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/cosh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/cosh.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_cosh #define __CLC_BUILTIN __nv_cosh diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/cospi.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/cospi.cl index 4a72926f7496f..6ccefeb2390b7 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/cospi.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/cospi.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_cospi #define __CLC_BUILTIN __nv_cospi diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/erf.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/erf.cl index e19f8e18e80d1..96e6781a22c99 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/erf.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/erf.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_erf #define __CLC_BUILTIN __nv_erf diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/erfc.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/erfc.cl index 8f9edb272dc01..2a38b1db561db 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/erfc.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/erfc.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_erfc #define __CLC_BUILTIN __nv_erfc diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/exp.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/exp.cl index ac070fcbcfaff..c3af4792b4bf1 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/exp.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/exp.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_exp #define __CLC_BUILTIN __nv_exp diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/exp10.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/exp10.cl index 2a7b1e18b984b..5d499956a21ab 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/exp10.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/exp10.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_exp10 #define __CLC_BUILTIN __nv_exp10 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/exp2.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/exp2.cl index ad8d2450d4bd7..a3870eaf4989c 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/exp2.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/exp2.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_exp2 #define __CLC_BUILTIN __nv_exp2 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/expm1.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/expm1.cl index 00abe2ffe4e7e..c7c32d670a951 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/expm1.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/expm1.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_expm1 #define __CLC_BUILTIN __nv_expm1 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/fdim.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/fdim.cl index b9f80a54214fe..a58d8ed3d8460 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/fdim.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/fdim.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_fdim #define __CLC_BUILTIN __nv_fdim diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/fmod.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/fmod.cl index b4f2c0a866ff8..93da1248cdd21 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/fmod.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/fmod.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_fmod #define __CLC_BUILTIN __nv_fmod diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/hypot.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/hypot.cl index cdabde7f0ec3e..0ac7a11100148 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/hypot.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/hypot.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_hypot #define __CLC_BUILTIN __nv_hypot diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/lgamma.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/lgamma.cl index 881c5d5e20076..3d23f8ae9be87 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/lgamma.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/lgamma.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_lgamma #define __CLC_BUILTIN __nv_lgamma diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/log10.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/log10.cl index 3af0104399484..d1301518fb50f 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/log10.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/log10.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_log10 #define __CLC_BUILTIN __nv_log10 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/log1p.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/log1p.cl index 3b9fed99cc3c7..01b477659b5a0 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/log1p.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/log1p.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_log1p #define __CLC_BUILTIN __nv_log1p diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/log2.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/log2.cl index 51ebae168b468..4705893c47b16 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/log2.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/log2.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_log2 #define __CLC_BUILTIN __nv_log2 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/logb.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/logb.cl index 21ebb2f1cbbc0..5560e2c59e63e 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/logb.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/logb.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_logb #define __CLC_BUILTIN __nv_logb diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/modf.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/modf.cl index 0be6859af9e4a..9269d5b1b63c8 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/modf.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/modf.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_MODF_IMPL(ADDRSPACE, BUILTIN, FP_TYPE, ARG_TYPE) \ _CLC_OVERLOAD _CLC_DEF ARG_TYPE __spirv_ocl_modf(ARG_TYPE x, \ @@ -27,32 +26,28 @@ __CLC_MODF(__nv_modff, float, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_modf, float, - private, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_modf, float, - local, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_modf, float, - global, float) - #ifdef cl_khr_fp64 __CLC_MODF(__nv_modf, double, double) - -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_modf, double, - private, double) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_modf, double, - local, double) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_modf, double, - global, double) #endif #ifdef cl_khr_fp16 #pragma OPENCL EXTENSION cl_khr_fp16 : enable __CLC_MODF(__nv_modff, float, half) - -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_modf, half, - private, half) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_modf, half, - local, half) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_modf, half, - global, half) #endif + +#define __CLC_FUNCTION __spirv_ocl_modf + +#define __CLC_ADDRSPACE private +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE + +#define __CLC_ADDRSPACE local +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE + +#define __CLC_ADDRSPACE global +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_cos.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_cos.cl index 8aaab18cef9e2..a1a0081adae5b 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_cos.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_cos.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_cos #define __CLC_BUILTIN __nv_fast_cos diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_divide.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_divide.cl index 010260935ca05..c6ca8350914ff 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_divide.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_divide.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_divide #define __CLC_BUILTIN __nv_fast_fdivide diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp.cl index 62e210b164359..fddb7aed667e8 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_exp #define __CLC_BUILTIN __nv_fast_exp diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp10.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp10.cl index ffd741efd9472..990d7a07a70a6 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp10.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_exp10.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_exp10 #define __CLC_BUILTIN __nv_fast_exp10 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log.cl index e6006f202e11a..270a84e48a831 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_log #define __CLC_BUILTIN __nv_fast_log diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log10.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log10.cl index 2a0acb6968938..5723276166f5d 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log10.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log10.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_log10 #define __CLC_BUILTIN __nv_fast_log10 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log2.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log2.cl index dac5703e8fcf6..96b68784740a5 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_log2.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_log2.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_log2 #define __CLC_BUILTIN __nv_fast_log2 diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_powr.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_powr.cl index d2fb0fa7869ef..ce19797d051ef 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_powr.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_powr.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_powr #define __CLC_BUILTIN __nv_fast_pow diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_sin.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_sin.cl index 4315657c701c8..15f2b1f014036 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_sin.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_sin.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_sin #define __CLC_BUILTIN __nv_fast_sin diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/native_tan.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/native_tan.cl index 94418f75aae47..62ea3bc87ecc7 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/native_tan.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/native_tan.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_native_tan #define __CLC_BUILTIN __nv_fast_tan diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/pow.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/pow.cl index 67439283dd280..5732c1a0014c3 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/pow.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/pow.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_pow #define __CLC_BUILTIN __nv_pow diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/round.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/round.cl index f3ae2b9c3f36c..e752e8e34d492 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/round.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/round.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_round #define __CLC_BUILTIN __nv_round diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/sin.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/sin.cl index f66dbd1c86bbe..055f4b7ed87c8 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/sin.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/sin.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_sin #define __CLC_BUILTIN __nv_sin diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/sincos.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/sincos.cl index 05a7df8b751a6..95abcd2fa111e 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/sincos.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/sincos.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_SINCOS_IMPL(ADDRSPACE, BUILTIN, FP_TYPE, ARG_TYPE) \ _CLC_OVERLOAD _CLC_DEF ARG_TYPE __spirv_ocl_sincos( \ @@ -28,32 +27,28 @@ __CLC_SINCOS(__nv_sincosf, float, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_sincos, float, - private, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_sincos, float, - local, float) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, __spirv_ocl_sincos, float, - global, float) - #ifdef cl_khr_fp64 __CLC_SINCOS(__nv_sincos, double, double) - -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_sincos, - double, private, double) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_sincos, - double, local, double) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, __spirv_ocl_sincos, - double, global, double) #endif #ifdef cl_khr_fp16 #pragma OPENCL EXTENSION cl_khr_fp16 : enable __CLC_SINCOS(__nv_sincosf, float, half) - -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_sincos, half, - private, half) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_sincos, half, - local, half) -_CLC_V_V_VP_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, __spirv_ocl_sincos, half, - global, half) #endif + +#define __CLC_FUNCTION __spirv_ocl_sincos + +#define __CLC_ADDRSPACE private +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE + +#define __CLC_ADDRSPACE local +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE + +#define __CLC_ADDRSPACE global +#define __CLC_BODY +#include +#undef __CLC_ADDRSPACE diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/sinh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/sinh.cl index 5ca10056d02f9..1322da0271a2d 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/sinh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/sinh.cl @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #include diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/tan.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/tan.cl index 473a5912c74fa..e5af568f6a077 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/tan.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/tan.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_tan #define __CLC_BUILTIN __nv_tan diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/tanh.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/tanh.cl index 008157911100f..8e30212d5423e 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/tanh.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/tanh.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_tanh #define __CLC_BUILTIN __nv_tanh diff --git a/libclc/libspirv/lib/ptx-nvidiacl/math/tgamma.cl b/libclc/libspirv/lib/ptx-nvidiacl/math/tgamma.cl index 924b053166657..8b404acd098e8 100644 --- a/libclc/libspirv/lib/ptx-nvidiacl/math/tgamma.cl +++ b/libclc/libspirv/lib/ptx-nvidiacl/math/tgamma.cl @@ -9,7 +9,6 @@ #include #include -#include #define __CLC_FUNCTION __spirv_ocl_tgamma #define __CLC_BUILTIN __nv_tgamma