This is an archive of the discontinued LLVM Phabricator instance.

Differential D125633

[pstl] Add macro guards to PSTL
AbandonedPublic

Authored by philnik on May 15 2022, 9:02 AM.

Details

Reviewers
ldionne
Mordante
var-const
Group Reviewers
Restricted Project
Summary

Currently some of the libc++ tests fail because the header isn't guarded against min/max macros.

Diff Detail

Event Timeline

philnik created this revision.May 15 2022, 9:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 15 2022, 9:02 AM
philnik requested review of this revision.May 15 2022, 9:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 15 2022, 9:02 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B164519: Diff 429541.May 15 2022, 11:14 AM
ldionne requested changes to this revision.May 18 2022, 12:49 PM
ldionne added inline comments.
pstl/include/pstl/internal/algorithm_impl.h
19

Instead, we need to make the PSTL freestanding (in the sense that it should work whether it is used with libc++ or with another stdlib, not in the usual freestanding sense). So I'd do something like this inside pstl_config.h:

#if defined(_PSTL_COMPILER_MSVC)
#   define _PSTL_PUSH_MACROS        \
        __pragma(push_macro("min")) \
        __pragma(push_macro("max"))
#   define _PSTL_POP_MACROS         \
        __pragma(pop_macro("min"))  \
        __pragma(pop_macro("max"))
#else
#   define _PSTL_PUSH_MACROS            \
        _Pragma("push_macro(\"min\")")  \
        _Pragma("push_macro(\"max\")")
#   define _PSTL_POP_MACROS             \
        _Pragma("pop_macro(\"min\")")   \
        _Pragma("pop_macro(\"max\")")
#endif
#define _PSTL_UNDEF_MACROS <__pstl_undef_macros>
This revision now requires changes to proceed.May 18 2022, 12:49 PM
philnik retitled this revision from [pstl][libc++] Add macro guards to PSTL and enable them for libc++ to [pstl] Add macro guards to PSTL.May 20 2022, 7:59 AM
philnik abandoned this revision.Jan 23 2023, 11:44 PM

Revision Contents

PathSize
libcxx/
include/
3 lines
pstl/
include/
pstl/
internal/
9 lines

Diff 429541

libcxx/include/__config

Show First 20 Lines • Show All 1,257 Lines • ▼ Show 20 Lines
# else # else
# define _LIBCPP_PUSH_MACROS \ # define _LIBCPP_PUSH_MACROS \
_Pragma("push_macro(\"min\")") \ _Pragma("push_macro(\"min\")") \
_Pragma("push_macro(\"max\")") _Pragma("push_macro(\"max\")")
# define _LIBCPP_POP_MACROS \ # define _LIBCPP_POP_MACROS \
_Pragma("pop_macro(\"min\")") \ _Pragma("pop_macro(\"min\")") \
_Pragma("pop_macro(\"max\")") _Pragma("pop_macro(\"max\")")
# endif # endif
# define _PSTL_PUSH_MACROS _LIBCPP_PUSH_MACROS
# define _PSTL_UNDEF_MACROS <__undef_macros>
# define _PSTL_POP_MACROS _LIBCPP_POP_MACROS
#endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO) #endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO)
#ifndef _LIBCPP_NO_AUTO_LINK #ifndef _LIBCPP_NO_AUTO_LINK
# if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) # if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) # if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
# pragma comment(lib, "c++.lib") # pragma comment(lib, "c++.lib")
# else # else
# pragma comment(lib, "libc++.lib") # pragma comment(lib, "libc++.lib")
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines

pstl/include/pstl/internal/algorithm_impl.h

Show All 10 Lines
#define _PSTL_ALGORITHM_IMPL_H #define _PSTL_ALGORITHM_IMPL_H
#include <iterator> #include <iterator>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include "execution_impl.h" #include "execution_impl.h"
ldionneUnsubmitted
Not Done
ReplyInline Actions

Instead, we need to make the PSTL freestanding (in the sense that it should work whether it is used with libc++ or with another stdlib, not in the usual freestanding sense). So I'd do something like this inside pstl_config.h:

#if defined(_PSTL_COMPILER_MSVC)
#   define _PSTL_PUSH_MACROS        \
        __pragma(push_macro("min")) \
        __pragma(push_macro("max"))
#   define _PSTL_POP_MACROS         \
        __pragma(pop_macro("min"))  \
        __pragma(pop_macro("max"))
#else
#   define _PSTL_PUSH_MACROS            \
        _Pragma("push_macro(\"min\")")  \
        _Pragma("push_macro(\"max\")")
#   define _PSTL_POP_MACROS             \
        _Pragma("pop_macro(\"min\")")   \
        _Pragma("pop_macro(\"max\")")
#endif
#define _PSTL_UNDEF_MACROS <__pstl_undef_macros>
ldionne: Instead, we need to make the PSTL freestanding (in the sense that it should work whether it is…
#include "memory_impl.h" #include "memory_impl.h"
#include "parallel_backend.h" #include "parallel_backend.h"
#include "parallel_backend_utils.h" #include "parallel_backend_utils.h"
#include "parallel_impl.h" #include "parallel_impl.h"
#include "pstl_config.h" #include "pstl_config.h"
#include "unseq_backend_simd.h" #include "unseq_backend_simd.h"
#ifdef _PSTL_PUSH_MACROS
_PSTL_PUSH_MACROS
#include _PSTL_UNDEF_MACROS
#endif
_PSTL_HIDE_FROM_ABI_PUSH _PSTL_HIDE_FROM_ABI_PUSH
namespace __pstl namespace __pstl
{ {
namespace __internal namespace __internal
{ {
//------------------------------------------------------------------------ //------------------------------------------------------------------------
▲ Show 20 Lines • Show All 3,776 Lines • ▼ Show 20 Lines__pattern_lexicographical_compare(__parallel_tag<_IsVector> __tag, _ExecutionPolicy&& __exec,
} }
} }
} // namespace __internal } // namespace __internal
} // namespace __pstl } // namespace __pstl
_PSTL_HIDE_FROM_ABI_POP _PSTL_HIDE_FROM_ABI_POP
#ifdef _PSTL_PUSH_MACROS
_PSTL_POP_MACROS
#endif
#endif /* _PSTL_ALGORITHM_IMPL_H */ #endif /* _PSTL_ALGORITHM_IMPL_H */