This is an archive of the discontinued LLVM Phabricator instance.

Differential D149499

[libc++][PSTL] Simplify pstl_config.h
ClosedPublic

Authored by philnik on Apr 28 2023, 4:27 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG7dc5635d71ea: [libc++][PSTL] Simplify pstl_config.h
Summary

This is done by removing configurations we don't support.

Diff Detail

Event Timeline

philnik created this revision.Apr 28 2023, 4:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 28 2023, 4:27 PM
philnik requested review of this revision.Apr 28 2023, 4:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 28 2023, 4:27 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik added a parent revision: D143161: [libc++][PSTL] Implement std::{any, all, none}_of.Apr 28 2023, 5:41 PM
philnik added a child revision: D149502: [libc++][PSTL] Remove configurations flags.Apr 28 2023, 5:44 PM
Harbormaster completed remote builds in B228951: Diff 518087.Apr 28 2023, 6:14 PM
philnik updated this revision to Diff 518358.Apr 30 2023, 2:27 PM

Rebased

Harbormaster failed remote builds in B229162: Diff 518358!Apr 30 2023, 2:27 PM
philnik added a child revision: D149556: [libc++][PSTL] Remove _PSTL_HIDE_FROM_ABI_{PUSH,POP} macros.Apr 30 2023, 2:28 PM
ldionne accepted this revision.May 1 2023, 8:11 AM

LGTM pending CI.

libcxx/include/__pstl/internal/pstl_config.h
70–74

I think those two shouldn't end with s. Probably some edit artifact.

This revision is now accepted and ready to land.May 1 2023, 8:11 AM
philnik updated this revision to Diff 518460.May 1 2023, 8:50 AM
philnik marked an inline comment as done.

Address comments

Harbormaster failed remote builds in B229242: Diff 518460!May 1 2023, 8:51 AM
philnik updated this revision to Diff 518474.May 1 2023, 9:43 AM

Keep simd scan macros

Harbormaster failed remote builds in B229255: Diff 518474!May 1 2023, 9:43 AM
This revision was landed with ongoing or failed builds.May 1 2023, 4:45 PM
Closed by commit rG7dc5635d71ea: [libc++][PSTL] Simplify pstl_config.h (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rG7dc5635d71ea: [libc++][PSTL] Simplify pstl_config.h.
philnik removed a child revision: D149502: [libc++][PSTL] Remove configurations flags.May 2 2023, 2:02 PM

Revision Contents

PathSize
libcxx/
include/
__pstl/
internal/
163 lines

Diff 518603

libcxx/include/__pstl/internal/pstl_config.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _PSTL_CONFIG_H #ifndef _PSTL_CONFIG_H
#define _PSTL_CONFIG_H #define _PSTL_CONFIG_H
#include <__config>
// TODO: Make this a proper configuration option // TODO: Make this a proper configuration option
#define _PSTL_PAR_BACKEND_SERIAL #define _PSTL_PAR_BACKEND_SERIAL
// The version is XYYZ, where X is major, YY is minor, and Z is patch (i.e. X.YY.Z)
#define _PSTL_VERSION 16000
#define _PSTL_VERSION_MAJOR (_PSTL_VERSION / 1000)
#define _PSTL_VERSION_MINOR ((_PSTL_VERSION % 1000) / 10)
#define _PSTL_VERSION_PATCH (_PSTL_VERSION % 10)
#if !defined(_PSTL_PAR_BACKEND_SERIAL) && !defined(_PSTL_PAR_BACKEND_TBB) && !defined(_PSTL_PAR_BACKEND_OPENMP)
# error "A parallel backend must be specified"
#endif
// Check the user-defined macro for warnings
#if defined(PSTL_USAGE_WARNINGS)
# define _PSTL_USAGE_WARNINGS
#endif
#if defined(_LIBCPP_VERSION)
# include <__assert> #include <__assert>
# define _PSTL_ASSERT(pred) _LIBCPP_ASSERT(pred, "") #define _PSTL_ASSERT(pred) _LIBCPP_ASSERT(pred, "")
#elif defined(__GLIBCXX__)
# define _PSTL_ASSERT(pred) __glibcxx_assert(pred)
#else
# include <cassert>
# define _PSTL_ASSERT(pred) (assert((pred)))
#endif
// Portability "#pragma" definition
#ifdef _MSC_VER
# define _PSTL_PRAGMA(x) __pragma(x)
#else
# define _PSTL_PRAGMA(x) _Pragma(# x) #define _PSTL_PRAGMA(x) _Pragma(# x)
#endif
#define _PSTL_STRING_AUX(x) #x
#define _PSTL_STRING(x) _PSTL_STRING_AUX(x)
#define _PSTL_STRING_CONCAT(x, y) x #y
// note that when ICC or Clang is in use, _PSTL_GCC_VERSION might not fully match
// the actual GCC version on the system.
#define _PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#if defined(__clang__)
// according to clang documentation, version can be vendor specific
# define _PSTL_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#endif
// 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)
(defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1600) || \
(!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || \
defined(__clang__)
# 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))
#elif !defined(_MSC_VER) //#pragma simd
# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(simd)
# define _PSTL_PRAGMA_DECLARE_SIMD
# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(simd reduction(PRM))
#else //no simd #else //no simd
# define _PSTL_PRAGMA_SIMD # define _PSTL_PRAGMA_SIMD
# define _PSTL_PRAGMA_DECLARE_SIMD # define _PSTL_PRAGMA_DECLARE_SIMD
# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) # define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
#endif //Enable SIMD #endif //Enable SIMD
#if defined(__INTEL_COMPILER)
# define _PSTL_PRAGMA_FORCEINLINE _PSTL_PRAGMA(forceinline)
#else
# define _PSTL_PRAGMA_FORCEINLINE #define _PSTL_PRAGMA_FORCEINLINE
#endif
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 // 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 #else
# define _PSTL_PRAGMA_SIMD_SCAN(PRM) # define _PSTL_PRAGMA_SIMD_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) # define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) # define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
#endif #endif
// Should be defined to 1 for environments with a vendor implementation of C++17 execution policies
#define _PSTL_CPP17_EXECUTION_POLICIES_PRESENT (_MSC_VER >= 1912 && _MSVC_LANG >= 201703L) || \
(_GLIBCXX_RELEASE >= 9 && __GLIBCXX__ >= 20190503 && __cplusplus >= 201703L)
#if (defined(_MSC_VER) && _MSC_VER >= 1900) || \
__cplusplus >= 201300L || \
__cpp_lib_robust_nonmodifying_seq_ops == 201304
# define _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT #define _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT
#endif
#if (defined(_MSC_VER) && _MSC_VER >= 1900) || \
__cplusplus >= 201402L || \
__cpp_lib_make_reverse_iterator == 201402
# define _PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT #define _PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT
#endif
#if (defined(_MSC_VER) && _MSC_VER >= 1900) || __cplusplus >= 201402L
# define _PSTL_CPP14_INTEGER_SEQUENCE_PRESENT #define _PSTL_CPP14_INTEGER_SEQUENCE_PRESENT
#endif
#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700) || \
(defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918) || \
__cplusplus >= 201402L
# define _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT #define _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
#endif
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1800 #if defined(_OPENMP) && _OPENMP >= 201307
# define _PSTL_EARLYEXIT_PRESENT
# define _PSTL_MONOTONIC_PRESENT
#endif
#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900) || \
(!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || \
(defined(_OPENMP) && _OPENMP >= 201307)
# define _PSTL_UDR_PRESENT # define _PSTL_UDR_PRESENT
#endif #endif
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626
# define _PSTL_UDS_PRESENT
#endif
#if defined(_PSTL_EARLYEXIT_PRESENT)
# define _PSTL_PRAGMA_SIMD_EARLYEXIT _PSTL_PRAGMA(omp simd early_exit)
#else
# define _PSTL_PRAGMA_SIMD_EARLYEXIT #define _PSTL_PRAGMA_SIMD_EARLYEXIT
#endif
#if defined(_PSTL_MONOTONIC_PRESENT)
# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) _PSTL_PRAGMA(omp ordered simd monotonic(PRM))
# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) _PSTL_PRAGMA(omp ordered simd monotonic(PRM1, PRM2))
#else
# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) #define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM)
# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) #define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2)
#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))
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1600
# define _PSTL_PRAGMA_VECTOR_UNALIGNED _PSTL_PRAGMA(vector unaligned)
#else
# define _PSTL_PRAGMA_VECTOR_UNALIGNED #define _PSTL_PRAGMA_VECTOR_UNALIGNED
#endif
// Check the user-defined macro to use non-temporal stores
#if defined(PSTL_USE_NONTEMPORAL_STORES) && (__INTEL_COMPILER >= 1600)
# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED _PSTL_PRAGMA(vector nontemporal)
#else
# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED #define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
#endif
#if defined(_MSC_VER) || defined(__INTEL_COMPILER) // the preprocessors don't type a message location
# define _PSTL_PRAGMA_LOCATION __FILE__ ":" _PSTL_STRING(__LINE__) ": [Parallel STL message]: "
#else
# define _PSTL_PRAGMA_LOCATION " [Parallel STL message]: "
#endif
#define _PSTL_PRAGMA_MESSAGE_IMPL(x) _PSTL_PRAGMA(message(_PSTL_STRING_CONCAT(_PSTL_PRAGMA_LOCATION, x)))
#if defined(_PSTL_USAGE_WARNINGS)
# define _PSTL_PRAGMA_MESSAGE(x) _PSTL_PRAGMA_MESSAGE_IMPL(x)
# define _PSTL_PRAGMA_MESSAGE_POLICIES(x) _PSTL_PRAGMA_MESSAGE_IMPL(x)
#else
# define _PSTL_PRAGMA_MESSAGE(x) #define _PSTL_PRAGMA_MESSAGE(x)
# define _PSTL_PRAGMA_MESSAGE_POLICIES(x) #define _PSTL_PRAGMA_MESSAGE_POLICIES(x)
#endif
// broken macros
#if (defined(__GLIBCXX__) && __GLIBCXX__ < 20150716) || \
(defined(_MSC_VER) && _MSC_VER < 1800)
# define _PSTL_CPP11_STD_ROTATE_BROKEN
#endif
#if defined(__INTEL_COMPILER) && __INTEL_COMPILER == 1800
# define _PSTL_ICC_18_OMP_SIMD_BROKEN
#endif
ldionneUnsubmitted
Done
ReplyInline Actions

I think those two shouldn't end with s. Probably some edit artifact.

ldionne: I think those two shouldn't end with `s`. Probably some edit artifact.
#endif /* _PSTL_CONFIG_H */ #endif /* _PSTL_CONFIG_H */