From 9392bd69879678de484a22deccd9c7e0d84232c5 Mon Sep 17 00:00:00 2001 From: Gheorghe-Teodor Bercea Date: Wed, 15 May 2019 20:28:23 +0000 Subject: [PATCH] [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 llvm-svn: 360809 --- clang/lib/Headers/__clang_cuda_cmath.h | 2 +- clang/lib/Headers/__clang_cuda_math_forward_declares.h | 4 ++-- clang/test/Headers/Inputs/include/cstdlib | 2 ++ clang/test/Headers/nvptx_device_cmath_functions.c | 4 ++++ clang/test/Headers/nvptx_device_cmath_functions.cpp | 4 ++++ clang/test/Headers/nvptx_device_cmath_functions_cxx17.cpp | 4 ++++ clang/test/Headers/nvptx_device_math_functions.c | 4 ++++ clang/test/Headers/nvptx_device_math_functions.cpp | 4 ++++ clang/test/Headers/nvptx_device_math_functions_cxx17.cpp | 4 ++++ 9 files changed, 29 insertions(+), 3 deletions(-) diff --git a/clang/lib/Headers/__clang_cuda_cmath.h b/clang/lib/Headers/__clang_cuda_cmath.h index 65caf02..c570451 100644 --- a/clang/lib/Headers/__clang_cuda_cmath.h +++ b/clang/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/clang/lib/Headers/__clang_cuda_math_forward_declares.h b/clang/lib/Headers/__clang_cuda_math_forward_declares.h index 1b6ec10..c94c3b7 100644 --- a/clang/lib/Headers/__clang_cuda_math_forward_declares.h +++ b/clang/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/clang/test/Headers/Inputs/include/cstdlib b/clang/test/Headers/Inputs/include/cstdlib index f34673e..f038a6d 100644 --- a/clang/test/Headers/Inputs/include/cstdlib +++ b/clang/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/clang/test/Headers/nvptx_device_cmath_functions.c b/clang/test/Headers/nvptx_device_cmath_functions.c index 54e60a1..23265d00f 100644 --- a/clang/test/Headers/nvptx_device_cmath_functions.c +++ b/clang/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/clang/test/Headers/nvptx_device_cmath_functions.cpp b/clang/test/Headers/nvptx_device_cmath_functions.cpp index 48795fe..0787b94 100644 --- a/clang/test/Headers/nvptx_device_cmath_functions.cpp +++ b/clang/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/clang/test/Headers/nvptx_device_cmath_functions_cxx17.cpp b/clang/test/Headers/nvptx_device_cmath_functions_cxx17.cpp index 89b997a..0b715fe 100644 --- a/clang/test/Headers/nvptx_device_cmath_functions_cxx17.cpp +++ b/clang/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/clang/test/Headers/nvptx_device_math_functions.c b/clang/test/Headers/nvptx_device_math_functions.c index 22767d0..3cc1be5 100644 --- a/clang/test/Headers/nvptx_device_math_functions.c +++ b/clang/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/clang/test/Headers/nvptx_device_math_functions.cpp b/clang/test/Headers/nvptx_device_math_functions.cpp index a4f637b..e0f1826 100644 --- a/clang/test/Headers/nvptx_device_math_functions.cpp +++ b/clang/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/clang/test/Headers/nvptx_device_math_functions_cxx17.cpp b/clang/test/Headers/nvptx_device_math_functions_cxx17.cpp index f19d07a..e3c0b12 100644 --- a/clang/test/Headers/nvptx_device_math_functions_cxx17.cpp +++ b/clang/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); } } -- 2.7.4