Skip to content

[SYCL] Try to fix MacOS build after #11956 #12444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 19, 2024
Merged

[SYCL] Try to fix MacOS build after #11956 #12444

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58099b5
[SYCL] Try to fix MacOS build after #11956
aelovikov-intel Jan 18, 2024
377f477
Trigger post-commit CI job
aelovikov-intel Jan 18, 2024
4fa3eb2
Fix for isordered/isunordered as well.
aelovikov-intel Jan 18, 2024
97fada7
Update .github/workflows/sycl_post_commit.yml
aelovikov-intel Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions sycl/source/builtins/relational_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
namespace sycl {
inline namespace _V1 {

template <typename T> static auto process_arg_for_macos(T x) {
// Workaround for MacOS that doesn't provide some std::is* functions as
// overloads over FP types (e.g., isfinite)
if constexpr (std::is_same_v<T, half>)
return static_cast<float>(x);
else
return x;
}

#if defined(__GNUC__) && !defined(__clang__)
// sycl::vec has UB in operator[] (aliasing violation) that causes the following
// warning here. Note that the way this #pragma works is that we have to put it
Expand All @@ -36,7 +45,9 @@ inline namespace _V1 {
} \
EXPORT_SCALAR_AND_VEC_1_16(NUM_ARGS, NAME, FP_TYPES)
#define REL_BUILTIN(NUM_ARGS, NAME) \
REL_BUILTIN_CUSTOM(NUM_ARGS, NAME, std::NAME)
REL_BUILTIN_CUSTOM(NUM_ARGS, NAME, [](auto... xs) { \
return std::NAME(process_arg_for_macos(xs)...); \
})

#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
Expand All @@ -57,10 +68,9 @@ REL_BUILTIN(ONE_ARG, isfinite)
REL_BUILTIN(ONE_ARG, isinf)
REL_BUILTIN(ONE_ARG, isnan)
REL_BUILTIN(ONE_ARG, isnormal)
REL_BUILTIN(TWO_ARGS, isunordered)
REL_BUILTIN_CUSTOM(TWO_ARGS, isordered,
([](auto x, auto y) { return !std::isunordered(x, y); }))
REL_BUILTIN_CUSTOM(TWO_ARGS, isunordered,
([](auto x, auto y) { return std::isunordered(x, y); }))
([](auto x, auto y) { return !sycl::isunordered(x, y); }))
#if defined(__GNUC__) && !defined(__clang__)
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=112816
#pragma GCC push_options
Expand Down