This is an archive of the discontinued LLVM Phabricator instance.

Differential D95299

Fix truncated __OPENMP_NVPTX__ preprocessor condition
ClosedPublic

Authored by r-burns on Jan 23 2021, 3:03 PM.

Details

Reviewers
tra
ABataev
Commits
rGc49142e4f5c8: Fix truncated __OPENMP_NVPTX__ preprocessor condition
Summary

I don't have a test case for this but noticed this warning when including system headers with -I rather than -isystem.

In file included from <built-in>:1:
In file included from /nix/store/jq6bpm0xmhnbffhs5rkxq4n88g5xi2zg-clang-wrapper-11.0.1/resource-root/include/__clang_cuda_runtime_wrapper.h:157:
/nix/store/jq6bpm0xmhnbffhs5rkxq4n88g5xi2zg-clang-wrapper-11.0.1/resource-root/include/__clang_cuda_math.h:39:25: warning: extra tokens at end of #ifdef directive [-Wextra-tokens]
#ifdef __OPENMP_NVPTX__ && defined(__cplusplus) && __cplusplus < 201402L
                        ^

Diff Detail

Event Timeline

r-burns created this revision.Jan 23 2021, 3:03 PM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptJan 23 2021, 3:03 PM
r-burns requested review of this revision.Jan 23 2021, 3:03 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 23 2021, 3:03 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B86432: Diff 318793.Jan 23 2021, 3:47 PM
tra accepted this revision.Jan 25 2021, 10:40 AM
tra added reviewers: tra, ABataev.
tra added a subscriber: tra.

LGTM

This revision is now accepted and ready to land.Jan 25 2021, 10:40 AM
capn added a subscriber: jdoerfert.Jun 23 2023, 9:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 23 2023, 9:12 AM
Herald added subscribers: sunshaoce, mattd, gchakrabarti, asavonic. · View Herald Transcript
capn added a subscriber: capn.Jun 23 2023, 9:13 AM

Can a committer go ahead and land this please? I'm running into this warning for any CUDA code compiled by Clang.

mehdi_amini added a subscriber: mehdi_amini.Jul 24 2023, 1:06 PM

@r-burns : what should I use for the authorship (name/pseudo and email)?

Herald added a subscriber: wangpc. · View Herald TranscriptJul 24 2023, 1:06 PM
r-burns added a comment.Jul 24 2023, 1:08 PM

Hi! You can credit Ryan Burns <rtburns@protonmail.com>.

This revision was landed with ongoing or failed builds.Aug 15 2023, 2:12 PM
Closed by commit rGc49142e4f5c8: Fix truncated __OPENMP_NVPTX__ preprocessor condition (authored by r-burns, committed by mehdi_amini). · Explain Why
This revision was automatically updated to reflect the committed changes.
mehdi_amini added a commit: rGc49142e4f5c8: Fix truncated __OPENMP_NVPTX__ preprocessor condition.

Revision Contents

PathSize
clang/
lib/
Headers/
2 lines

Diff 550472

clang/lib/Headers/__clang_cuda_math.h

Show All 30 Lines
#else #else
#define __DEVICE__ static __device__ __forceinline__ #define __DEVICE__ static __device__ __forceinline__
#endif #endif
// Specialized version of __DEVICE__ for functions with void return type. Needed // Specialized version of __DEVICE__ for functions with void return type. Needed
// because the OpenMP overlay requires constexpr functions here but prior to // because the OpenMP overlay requires constexpr functions here but prior to
// c++14 void return functions could not be constexpr. // c++14 void return functions could not be constexpr.
#pragma push_macro("__DEVICE_VOID__") #pragma push_macro("__DEVICE_VOID__")
#ifdef __OPENMP_NVPTX__ && defined(__cplusplus) && __cplusplus < 201402L #if defined(__OPENMP_NVPTX__) && defined(__cplusplus) && __cplusplus < 201402L
#define __DEVICE_VOID__ static __attribute__((always_inline, nothrow)) #define __DEVICE_VOID__ static __attribute__((always_inline, nothrow))
#else #else
#define __DEVICE_VOID__ __DEVICE__ #define __DEVICE_VOID__ __DEVICE__
#endif #endif
// libdevice provides fast low precision and slow full-recision implementations // libdevice provides fast low precision and slow full-recision implementations
// for some functions. Which one gets selected depends on // for some functions. Which one gets selected depends on
// __CLANG_CUDA_APPROX_TRANSCENDENTALS__ which gets defined by clang if // __CLANG_CUDA_APPROX_TRANSCENDENTALS__ which gets defined by clang if
▲ Show 20 Lines • Show All 301 Lines • Show Last 20 Lines