This is an archive of the discontinued LLVM Phabricator instance.

Differential D149603

[libc++][PSTL] Move all the OpenMP conditionals into a single block
ClosedPublic

Authored by philnik on May 1 2023, 11:30 AM.

Details

Reviewers
ldionne
jdoerfert
Group Reviewers
Restricted Project
Commits
rGcdd01e49d6f4: [libc++][PSTL] Move all the OpenMP conditionals into a single block
Summary

All the used OpenMP pragmas are available with OpenMP 4.0, so they can all share a single conditional block.

Diff Detail

Event Timeline

philnik created this revision.May 1 2023, 11:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 1 2023, 11:30 AM
Herald added subscribers: sunshaoce, guansong, yaxunl. · View Herald Transcript
philnik requested review of this revision.May 1 2023, 11:30 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptMay 1 2023, 11:30 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, jplehr, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B229276: Diff 518504.May 1 2023, 11:31 AM
philnik added a parent revision: D149502: [libc++][PSTL] Remove configurations flags.May 1 2023, 11:40 AM
philnik updated this revision to Diff 518509.May 1 2023, 11:40 AM

Fix diff

Harbormaster failed remote builds in B229280: Diff 518509!May 1 2023, 11:41 AM
philnik added a child revision: D149605: [libc++][PSTL] Replace _PSTL_ASSERT with _LIBCPP_ASSERT.May 1 2023, 4:23 PM
ldionne accepted this revision.May 2 2023, 11:38 AM

LGTM w/ rebase and green CI

This revision is now accepted and ready to land.May 2 2023, 11:38 AM
philnik updated this revision to Diff 518872.May 2 2023, 3:01 PM

Rebased

philnik updated this revision to Diff 518874.May 2 2023, 3:02 PM

Fix diff

Harbormaster failed remote builds in B229542: Diff 518872!May 3 2023, 1:35 AM
Harbormaster failed remote builds in B229544: Diff 518874!May 3 2023, 2:31 AM
philnik updated this revision to Diff 519087.May 3 2023, 8:35 AM

Try to fix CI

Harbormaster completed remote builds in B229697: Diff 519087.May 3 2023, 11:07 AM
philnik updated this revision to Diff 519278.May 3 2023, 3:17 PM

Rebased

Harbormaster completed remote builds in B229837: Diff 519278.May 3 2023, 8:52 PM
philnik updated this revision to Diff 519497.May 4 2023, 7:59 AM

Next try

Harbormaster completed remote builds in B229985: Diff 519497.May 4 2023, 9:26 AM
This revision was landed with ongoing or failed builds.May 4 2023, 9:31 AM
Closed by commit rGcdd01e49d6f4: [libc++][PSTL] Move all the OpenMP conditionals into a single block (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGcdd01e49d6f4: [libc++][PSTL] Move all the OpenMP conditionals into a single block.

Revision Contents

PathSize
libcxx/
include/
__pstl/
internal/
45 lines

Diff 518509

libcxx/include/__pstl/internal/pstl_config.h

Show All 19 Lines
#define _PSTL_PRAGMA(x) _Pragma(# x) #define _PSTL_PRAGMA(x) _Pragma(# x)
#define _PSTL_HIDE_FROM_ABI_PUSH /* nothing */ #define _PSTL_HIDE_FROM_ABI_PUSH /* nothing */
#define _PSTL_HIDE_FROM_ABI_POP /* nothing */ #define _PSTL_HIDE_FROM_ABI_POP /* nothing */
// Enable SIMD for compilers that support OpenMP 4.0 // Enable SIMD for compilers that support OpenMP 4.0
#if (defined(_OPENMP) && _OPENMP >= 201307) #if (defined(_OPENMP) && _OPENMP >= 201307)
# define _PSTL_UDR_PRESENT
# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd) # define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd)
# define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd) # define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd)
# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM)) # define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM))
#else //no simd
# define _PSTL_PRAGMA_SIMD
# define _PSTL_PRAGMA_DECLARE_SIMD
# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
#endif //Enable SIMD
// TODO: find out when to enable these annotations
#if 0
# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM)) # define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM))
# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM)) # define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM))
# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM)) # define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM))
#else
# define _PSTL_PRAGMA_SIMD_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
#endif
#if defined(_OPENMP) && _OPENMP >= 201307
# define _PSTL_UDR_PRESENT
#endif
// Declaration of reduction functor, where // Declaration of reduction functor, where
// NAME - the name of the functor // NAME - the name of the functor
// OP - type of the callable object with the reduction operation // OP - type of the callable object with the reduction operation
// omp_in - refers to the local partial result // omp_in - refers to the local partial result
// omp_out - refers to the final value of the combiner operator // omp_out - refers to the final value of the combiner operator
// omp_priv - refers to the private copy of the initial value // omp_priv - refers to the private copy of the initial value
// omp_orig - refers to the original variable to be reduced // omp_orig - refers to the original variable to be reduced
#define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \ # define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \
_PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig)) _PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig))
#else // (defined(_OPENMP) && _OPENMP >= 201307)
# define _PSTL_PRAGMA_SIMD
# define _PSTL_PRAGMA_DECLARE_SIMD
# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
# define _PSTL_PRAGMA_SIMD_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
# define _PSTL_PRAGMA_DECLARE_REDUCTION(RPM)
#endif // (defined(_OPENMP) && _OPENMP >= 201307)
#endif /* _PSTL_CONFIG_H */ #endif /* _PSTL_CONFIG_H */