This is an archive of the discontinued LLVM Phabricator instance.

Differential D126001

[OpenMP][libomp] Fix fallthrough attribute detection for Intel compilers
ClosedPublic

Authored by jlpeyton on May 19 2022, 11:48 AM.

Details

Reviewers
tlwilmar
hbae
AndreyChurbanov
jdoerfert
Commits
rG28c8da29654d: [OpenMP][libomp] Fix fallthrough attribute detection for Intel compilers
Summary

Force the feature off for icc.

icc does not properly detect lack of fallthrough attribute since it
defines __GNU__ > 7 and also icc's __has_cpp_attribute/__has_attribute
feature detectors do not properly detect the lack of fallthrough attribute.

Diff Detail

Event Timeline

jlpeyton created this revision.May 19 2022, 11:48 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 19 2022, 11:48 AM
Herald added subscribers: guansong, yaxunl. · View Herald Transcript
jlpeyton requested review of this revision.May 19 2022, 11:48 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptMay 19 2022, 11:48 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B165379: Diff 430761.May 19 2022, 11:54 AM
tlwilmar accepted this revision.Jul 15 2022, 8:58 AM

LGTM

This revision is now accepted and ready to land.Jul 15 2022, 8:58 AM
Closed by commit rG28c8da29654d: [OpenMP][libomp] Fix fallthrough attribute detection for Intel compilers (authored by jlpeyton). · Explain WhyJul 19 2022, 11:04 AM
This revision was automatically updated to reflect the committed changes.
jlpeyton added a commit: rG28c8da29654d: [OpenMP][libomp] Fix fallthrough attribute detection for Intel compilers.

Revision Contents

PathSize
openmp/
runtime/
src/
3 lines
tools/
archer/
3 lines

Diff 445882

openmp/runtime/src/kmp_os.h

Show First 20 Lines • Show All 339 Lines • ▼ Show 20 Lines
#define KMP_CACHE_PREFETCH(ADDR) /* nothing */ #define KMP_CACHE_PREFETCH(ADDR) /* nothing */
// Define attribute that indicates that the fall through from the previous // Define attribute that indicates that the fall through from the previous
// case label is intentional and should not be diagnosed by a compiler // case label is intentional and should not be diagnosed by a compiler
// Code from libcxx/include/__config // Code from libcxx/include/__config
// Use a function like macro to imply that it must be followed by a semicolon // Use a function like macro to imply that it must be followed by a semicolon
#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough) #if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
#define KMP_FALLTHROUGH() [[fallthrough]] #define KMP_FALLTHROUGH() [[fallthrough]]
// icc cannot properly tell this attribute is absent so force off
#elif KMP_COMPILER_ICC
#define KMP_FALLTHROUGH() ((void)0)
#elif __has_cpp_attribute(clang::fallthrough) #elif __has_cpp_attribute(clang::fallthrough)
#define KMP_FALLTHROUGH() [[clang::fallthrough]] #define KMP_FALLTHROUGH() [[clang::fallthrough]]
#elif __has_attribute(fallthrough) || __GNUC__ >= 7 #elif __has_attribute(fallthrough) || __GNUC__ >= 7
#define KMP_FALLTHROUGH() __attribute__((__fallthrough__)) #define KMP_FALLTHROUGH() __attribute__((__fallthrough__))
#else #else
#define KMP_FALLTHROUGH() ((void)0) #define KMP_FALLTHROUGH() ((void)0)
#endif #endif
▲ Show 20 Lines • Show All 926 Lines • Show Last 20 Lines

openmp/tools/archer/ompt-tsan.cpp

Show All 36 Lines
#include "omp-tools.h" #include "omp-tools.h"
// Define attribute that indicates that the fall through from the previous // Define attribute that indicates that the fall through from the previous
// case label is intentional and should not be diagnosed by a compiler // case label is intentional and should not be diagnosed by a compiler
// Code from libcxx/include/__config // Code from libcxx/include/__config
// Use a function like macro to imply that it must be followed by a semicolon // Use a function like macro to imply that it must be followed by a semicolon
#if __cplusplus > 201402L && __has_cpp_attribute(fallthrough) #if __cplusplus > 201402L && __has_cpp_attribute(fallthrough)
#define KMP_FALLTHROUGH() [[fallthrough]] #define KMP_FALLTHROUGH() [[fallthrough]]
// icc cannot properly tell this attribute is absent so force off
#elif defined(__INTEL_COMPILER)
#define KMP_FALLTHROUGH() ((void)0)
#elif __has_cpp_attribute(clang::fallthrough) #elif __has_cpp_attribute(clang::fallthrough)
#define KMP_FALLTHROUGH() [[clang::fallthrough]] #define KMP_FALLTHROUGH() [[clang::fallthrough]]
#elif __has_attribute(fallthrough) || __GNUC__ >= 7 #elif __has_attribute(fallthrough) || __GNUC__ >= 7
#define KMP_FALLTHROUGH() __attribute__((__fallthrough__)) #define KMP_FALLTHROUGH() __attribute__((__fallthrough__))
#else #else
#define KMP_FALLTHROUGH() ((void)0) #define KMP_FALLTHROUGH() ((void)0)
#endif #endif
▲ Show 20 Lines • Show All 1,143 Lines • Show Last 20 Lines