Author: jlebar Date: Wed Mar 30 18:30:14 2016 New Revision: 264963 URL: http://llvm.org/viewvc/llvm-project?rev=264963&view=rev Log: [CUDA] Add math forward declares to CUDA header wrapper.
Summary: This is necessary for a future patch which will make all constexpr functions implicitly host+device. cmath may declare constexpr functions, but these we do *not* want to be host+device. The forward declares added in this patch prevent this (because the rule will be, constexpr functions become implicitly host+device unless they're preceeded by a decl with __device__). Reviewers: tra Subscribers: cfe-commits, rnk, rsmith Differential Revision: http://reviews.llvm.org/D18539 Added: cfe/trunk/lib/Headers/__clang_cuda_math_forward_declares.h Modified: cfe/trunk/lib/Headers/CMakeLists.txt cfe/trunk/lib/Headers/__clang_cuda_runtime_wrapper.h Modified: cfe/trunk/lib/Headers/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=264963&r1=264962&r2=264963&view=diff ============================================================================== --- cfe/trunk/lib/Headers/CMakeLists.txt (original) +++ cfe/trunk/lib/Headers/CMakeLists.txt Wed Mar 30 18:30:14 2016 @@ -19,6 +19,7 @@ set(files bmi2intrin.h bmiintrin.h __clang_cuda_cmath.h + __clang_cuda_math_forward_declares.h __clang_cuda_runtime_wrapper.h cpuid.h cuda_builtin_vars.h Added: cfe/trunk/lib/Headers/__clang_cuda_math_forward_declares.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/__clang_cuda_math_forward_declares.h?rev=264963&view=auto ============================================================================== --- cfe/trunk/lib/Headers/__clang_cuda_math_forward_declares.h (added) +++ cfe/trunk/lib/Headers/__clang_cuda_math_forward_declares.h Wed Mar 30 18:30:14 2016 @@ -0,0 +1,191 @@ +/*===- __clang_math_forward_declares.h - Prototypes of __device__ math fns --=== + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + *===-----------------------------------------------------------------------=== + */ +#ifndef __CLANG__CUDA_MATH_FORWARD_DECLARES_H__ +#define __CLANG__CUDA_MATH_FORWARD_DECLARES_H__ +#ifndef __CUDA__ +#error "This file is for CUDA compilation only." +#endif + +// This file forward-declares of some math functions we (or the CUDA headers) +// will define later. We need to do this, and do it before cmath is included, +// because the standard library may have constexpr math functions. In the +// absence of a prior __device__ decl, those constexpr functions may become +// implicitly host+device. host+device functions can't be overloaded, so that +// would preclude the use of our own __device__ overloads for these functions. + +#pragma push_macro("__DEVICE__") +#define __DEVICE__ \ + static __inline__ __attribute__((always_inline)) __attribute__((device)) + +__DEVICE__ int abs(int); +__DEVICE__ double acos(double); +__DEVICE__ float acosh(float); +__DEVICE__ double acosh(double); +__DEVICE__ double asin(double); +__DEVICE__ float asinh(float); +__DEVICE__ double asinh(double); +__DEVICE__ double atan(double); +__DEVICE__ double atan2(double, double); +__DEVICE__ float atanh(float); +__DEVICE__ double atanh(double); +__DEVICE__ float cbrt(float); +__DEVICE__ double cbrt(double); +__DEVICE__ double ceil(double); +__DEVICE__ float copysign(float, float); +__DEVICE__ double copysign(double, double); +__DEVICE__ double cos(double); +__DEVICE__ double cosh(double); +__DEVICE__ float erf(float); +__DEVICE__ double erf(double); +__DEVICE__ float erfc(float); +__DEVICE__ double erfc(double); +__DEVICE__ double exp(double); +__DEVICE__ float exp2(float); +__DEVICE__ double exp2(double); +__DEVICE__ float expm1(float); +__DEVICE__ double expm1(double); +__DEVICE__ double fabs(double); +__DEVICE__ float fdim(float, float); +__DEVICE__ double fdim(double, double); +__DEVICE__ double floor(double); +__DEVICE__ float fma(float, float, float); +__DEVICE__ double fma(double, double, double); +__DEVICE__ float fmax(float, float); +__DEVICE__ double fmax(double, double); +__DEVICE__ float fmin(float, float); +__DEVICE__ double fmin(double, double); +__DEVICE__ double fmod(double, double); +__DEVICE__ double frexp(double, int *); +__DEVICE__ float hypot(float, float); +__DEVICE__ double hypot(double, double); +__DEVICE__ int ilogb(float); +__DEVICE__ int ilogb(double); +__DEVICE__ long labs(long); +__DEVICE__ double ldexp(double, int); +__DEVICE__ float lgamma(float); +__DEVICE__ double lgamma(double); +__DEVICE__ long long llabs(long long); +__DEVICE__ long long llrint(float); +__DEVICE__ long long llrint(double); +__DEVICE__ double log(double); +__DEVICE__ double log10(double); +__DEVICE__ float log1p(float); +__DEVICE__ double log1p(double); +__DEVICE__ float log2(float); +__DEVICE__ double log2(double); +__DEVICE__ float logb(float); +__DEVICE__ double logb(double); +__DEVICE__ long lrint(float); +__DEVICE__ long lrint(double); +__DEVICE__ long lround(float); +__DEVICE__ long lround(double); +__DEVICE__ double modf(double, double *); +__DEVICE__ double nan(const char *); +__DEVICE__ float nanf(const char *); +__DEVICE__ float nearbyint(float); +__DEVICE__ double nearbyint(double); +__DEVICE__ float nextafter(float, float); +__DEVICE__ double nextafter(double, double); +__DEVICE__ double pow(double, double); +__DEVICE__ float remainder(float, float); +__DEVICE__ double remainder(double, double); +__DEVICE__ float remquo(float, float, int *); +__DEVICE__ double remquo(double, double, int *); +__DEVICE__ float rint(float); +__DEVICE__ double rint(double); +__DEVICE__ float round(float); +__DEVICE__ double round(double); +__DEVICE__ float scalbln(float, long); +__DEVICE__ double scalbln(double, long); +__DEVICE__ float scalbn(float, int); +__DEVICE__ double scalbn(double, int); +__DEVICE__ double sin(double); +__DEVICE__ double sinh(double); +__DEVICE__ double sqrt(double); +__DEVICE__ double tan(double); +__DEVICE__ double tanh(double); +__DEVICE__ float tgamma(float); +__DEVICE__ double tgamma(double); +__DEVICE__ float trunc(float); +__DEVICE__ double trunc(double); + +namespace std { +__DEVICE__ long long abs(long long); +__DEVICE__ long abs(long); +__DEVICE__ float abs(float); +__DEVICE__ double abs(double); +__DEVICE__ float acos(float); +__DEVICE__ float asin(float); +__DEVICE__ float atan(float); +__DEVICE__ float atan2(float, float); +__DEVICE__ float ceil(float); +__DEVICE__ float cos(float); +__DEVICE__ float cosh(float); +__DEVICE__ float exp(float); +__DEVICE__ float fabs(float); +__DEVICE__ float floor(float); +__DEVICE__ float fmod(float, float); +__DEVICE__ int fpclassify(float); +__DEVICE__ int fpclassify(double); +__DEVICE__ float frexp(float, int *); +__DEVICE__ bool isfinite(float); +__DEVICE__ bool isfinite(double); +__DEVICE__ bool isgreater(float, float); +__DEVICE__ bool isgreater(double, double); +__DEVICE__ bool isgreaterequal(float, float); +__DEVICE__ bool isgreaterequal(double, double); +__DEVICE__ bool isinf(float); +__DEVICE__ bool isinf(double); +__DEVICE__ bool isless(float, float); +__DEVICE__ bool isless(double, double); +__DEVICE__ bool islessequal(float, float); +__DEVICE__ bool islessequal(double, double); +__DEVICE__ bool islessgreater(float, float); +__DEVICE__ bool islessgreater(double, double); +__DEVICE__ bool isnan(float); +__DEVICE__ bool isnan(double); +__DEVICE__ bool isnormal(float); +__DEVICE__ bool isnormal(double); +__DEVICE__ bool isunordered(float, float); +__DEVICE__ bool isunordered(double, double); +__DEVICE__ float ldexp(float, int); +__DEVICE__ float log(float); +__DEVICE__ float log10(float); +__DEVICE__ float modf(float, float *); +__DEVICE__ float nexttoward(float, float); +__DEVICE__ double nexttoward(double, double); +__DEVICE__ float pow(float, float); +__DEVICE__ float pow(float, int); +__DEVICE__ double pow(double, int); +__DEVICE__ bool signbit(float); +__DEVICE__ bool signbit(double); +__DEVICE__ float sin(float); +__DEVICE__ float sinh(float); +__DEVICE__ float sqrt(float); +__DEVICE__ float tan(float); +__DEVICE__ float tanh(float); +} // namespace std + +#pragma pop_macro("__DEVICE__") + +#endif Modified: cfe/trunk/lib/Headers/__clang_cuda_runtime_wrapper.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/__clang_cuda_runtime_wrapper.h?rev=264963&r1=264962&r2=264963&view=diff ============================================================================== --- cfe/trunk/lib/Headers/__clang_cuda_runtime_wrapper.h (original) +++ cfe/trunk/lib/Headers/__clang_cuda_runtime_wrapper.h Wed Mar 30 18:30:14 2016 @@ -42,6 +42,9 @@ #if defined(__CUDA__) && defined(__clang__) +// Include some forward declares that must come before cmath. +#include <__clang_cuda_runtime_wrapper.h> + // Include some standard headers to avoid CUDA headers including them // while some required macros (like __THROW) are in a weird state. #include <cmath> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
