From: Gheorghe-Teodor Bercea Date: Wed, 15 May 2019 20:28:23 +0000 (+0000) Subject: [OpenMP][Bugfix] Move double and float versions of abs under c++ macro X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e0c1d04180d1b561dc9b6a6508cf3ef1b3fefce;p=clang [OpenMP][Bugfix] Move double and float versions of abs under c++ macro Summary: This is a fix for the reported bug: [[ https://bugs.llvm.org/show_bug.cgi?id=41861 | 41861 ]] abs functions need to be moved under the c++ macro to avoid conflicts with included headers. Reviewers: tra, jdoerfert, hfinkel, ABataev, caomhin Reviewed By: jdoerfert Subscribers: guansong, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D61959 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@360809 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Headers/__clang_cuda_cmath.h b/lib/Headers/__clang_cuda_cmath.h index 65caf02ceb..c570451c77 100644 --- a/lib/Headers/__clang_cuda_cmath.h +++ b/lib/Headers/__clang_cuda_cmath.h @@ -48,9 +48,9 @@ #if !(defined(_OPENMP) && defined(__cplusplus)) __DEVICE__ long long abs(long long __n) { return ::llabs(__n); } __DEVICE__ long abs(long __n) { return ::labs(__n); } -#endif __DEVICE__ float abs(float __x) { return ::fabsf(__x); } __DEVICE__ double abs(double __x) { return ::fabs(__x); } +#endif __DEVICE__ float acos(float __x) { return ::acosf(__x); } __DEVICE__ float asin(float __x) { return ::asinf(__x); } __DEVICE__ float atan(float __x) { return ::atanf(__x); } diff --git a/lib/Headers/__clang_cuda_math_forward_declares.h b/lib/Headers/__clang_cuda_math_forward_declares.h index 1b6ec10531..c94c3b7518 100644 --- a/lib/Headers/__clang_cuda_math_forward_declares.h +++ b/lib/Headers/__clang_cuda_math_forward_declares.h @@ -39,10 +39,10 @@ #if !(defined(_OPENMP) && defined(__cplusplus)) __DEVICE__ long abs(long); __DEVICE__ long long abs(long long); -#endif -__DEVICE__ int abs(int) __NOEXCEPT; __DEVICE__ double abs(double); __DEVICE__ float abs(float); +#endif +__DEVICE__ int abs(int) __NOEXCEPT; __DEVICE__ double acos(double); __DEVICE__ float acos(float); __DEVICE__ double acosh(double); diff --git a/test/Headers/Inputs/include/cstdlib b/test/Headers/Inputs/include/cstdlib index f34673e7ad..f038a6d90c 100644 --- a/test/Headers/Inputs/include/cstdlib +++ b/test/Headers/Inputs/include/cstdlib @@ -3,9 +3,11 @@ #if __cplusplus >= 201703L extern int abs (int __x) throw() __attribute__ ((__const__)) ; extern long int labs (long int __x) throw() __attribute__ ((__const__)) ; +extern float fabs (float __x) throw() __attribute__ ((__const__)) ; #else extern int abs (int __x) __attribute__ ((__const__)) ; extern long int labs (long int __x) __attribute__ ((__const__)) ; +extern float fabs (float __x) __attribute__ ((__const__)) ; #endif namespace std diff --git a/test/Headers/nvptx_device_cmath_functions.c b/test/Headers/nvptx_device_cmath_functions.c index 54e60a1da2..23265d00f1 100644 --- a/test/Headers/nvptx_device_cmath_functions.c +++ b/test/Headers/nvptx_device_cmath_functions.c @@ -17,5 +17,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } } diff --git a/test/Headers/nvptx_device_cmath_functions.cpp b/test/Headers/nvptx_device_cmath_functions.cpp index 48795feb9b..0787b94062 100644 --- a/test/Headers/nvptx_device_cmath_functions.cpp +++ b/test/Headers/nvptx_device_cmath_functions.cpp @@ -18,5 +18,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } } diff --git a/test/Headers/nvptx_device_cmath_functions_cxx17.cpp b/test/Headers/nvptx_device_cmath_functions_cxx17.cpp index 89b997aba3..0b715fea01 100644 --- a/test/Headers/nvptx_device_cmath_functions_cxx17.cpp +++ b/test/Headers/nvptx_device_cmath_functions_cxx17.cpp @@ -18,5 +18,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } } diff --git a/test/Headers/nvptx_device_math_functions.c b/test/Headers/nvptx_device_math_functions.c index 22767d0cde..3cc1be51ce 100644 --- a/test/Headers/nvptx_device_math_functions.c +++ b/test/Headers/nvptx_device_math_functions.c @@ -17,5 +17,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } } diff --git a/test/Headers/nvptx_device_math_functions.cpp b/test/Headers/nvptx_device_math_functions.cpp index a4f637ba6b..e0f18263f0 100644 --- a/test/Headers/nvptx_device_math_functions.cpp +++ b/test/Headers/nvptx_device_math_functions.cpp @@ -18,5 +18,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } } diff --git a/test/Headers/nvptx_device_math_functions_cxx17.cpp b/test/Headers/nvptx_device_math_functions_cxx17.cpp index f19d07a7cf..e3c0b1241b 100644 --- a/test/Headers/nvptx_device_math_functions_cxx17.cpp +++ b/test/Headers/nvptx_device_math_functions_cxx17.cpp @@ -18,5 +18,9 @@ void test_sqrt(double a1) { double l2 = pow(a1, a1); // CHECK-YES: call double @__nv_modf(double double l3 = modf(a1 + 3.5, &a1); + // CHECK-YES: call double @__nv_fabs(double + double l4 = fabs(a1); + // CHECK-YES: call i32 @__nv_abs(i32 + double l5 = abs((int)a1); } }