Skip to content

[SYCL][SPIRV] Implement islessgreater with FOrdNotEqual instead #5076

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
dm-vodopyanov merged 5 commits into from
Dec 9, 2021
Merged

[SYCL][SPIRV] Implement islessgreater with FOrdNotEqual instead #5076

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e1f311
[SYCL][SPIRV] Replace deprecated LessOrGreater with FOrdNotEqual
Nuullll Dec 3, 2021
a3cb6b9
Fix ABI symbols
Nuullll Dec 3, 2021
113a491
Add device code test
Nuullll Dec 3, 2021
16e3d65
Add LessOrGreater ABI symbols back
Nuullll Dec 7, 2021
cdc4540
Fix format
Nuullll Dec 7, 2021
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
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/builtins.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ template <typename T,
typename = detail::enable_if_t<detail::is_genfloat<T>::value, T>>
detail::common_rel_ret_t<T> islessgreater(T x, T y) __NOEXC {
return detail::RelConverter<T>::apply(
__sycl_std::__invoke_LessOrGreater<detail::rel_ret_t<T>>(x, y));
__sycl_std::__invoke_FOrdNotEqual<detail::rel_ret_t<T>>(x, y));
}

// int isfinite (half x)
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl/detail/builtins.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ __SYCL_MAKE_CALL_ARG2_SAME(FOrdGreaterThanEqual,
__FUNC_PREFIX_CORE) // isgreaterequal
__SYCL_MAKE_CALL_ARG2_SAME(FOrdLessThan, __FUNC_PREFIX_CORE) // isless
__SYCL_MAKE_CALL_ARG2_SAME(FOrdLessThanEqual, __FUNC_PREFIX_CORE) // islessequal
__SYCL_MAKE_CALL_ARG2_SAME(LessOrGreater, __FUNC_PREFIX_CORE) // islessgreater
__SYCL_MAKE_CALL_ARG2_SAME(FOrdNotEqual, __FUNC_PREFIX_CORE) // islessgreater
__SYCL_MAKE_CALL_ARG1(IsFinite, __FUNC_PREFIX_CORE) // isfinite
__SYCL_MAKE_CALL_ARG1(IsInf, __FUNC_PREFIX_CORE) // isinf
__SYCL_MAKE_CALL_ARG1(IsNan, __FUNC_PREFIX_CORE) // isnan
Expand Down
24 changes: 12 additions & 12 deletions sycl/source/detail/builtins_relational.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ template <typename T> inline T __vFOrdLessThanEqual(T x, T y) {

template <typename T> inline T __sFOrdLessThanEqual(T x, T y) { return x <= y; }

template <typename T> inline T __vLessOrGreater(T x, T y) {
template <typename T> inline T __vFOrdNotEqual(T x, T y) {
return -((x < y) || (x > y));
}

template <typename T> inline T __sLessOrGreater(T x, T y) {
template <typename T> inline T __sFOrdNotEqual(T x, T y) {
return ((x < y) || (x > y));
}

Expand Down Expand Up @@ -247,21 +247,21 @@ MAKE_1V_2V_FUNC(FOrdLessThanEqual, __vFOrdLessThanEqual, s::cl_long,
MAKE_1V_2V_FUNC(FOrdLessThanEqual, __vFOrdLessThanEqual, s::cl_short,
s::cl_half, s::cl_half)

// (LessOrGreater) // islessgreater
__SYCL_EXPORT s::cl_int LessOrGreater(s::cl_float x, s::cl_float y) __NOEXC {
return __sLessOrGreater(x, y);
// (FOrdNotEqual) // islessgreater

@bader bader Dec 3, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Nuullll, please, follow Contribution guide and pay attention to ABI policies in particular.
I think we can't remove LessOrGreater immediately and should rather deprecate them first.

@Nuullll Nuullll Dec 6, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bader. That makes sense since this is an ABI-breaking change.
Then may I ask how to deprecate an ABI?

@bader bader Dec 6, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how to deprecate an ABI?

@romanovvlad, @s-kanaev, please, add an answer to this question to ABI Policy Guide.

__SYCL_EXPORT s::cl_int FOrdNotEqual(s::cl_float x, s::cl_float y) __NOEXC {
return __sFOrdNotEqual(x, y);
}
__SYCL_EXPORT s::cl_int LessOrGreater(s::cl_double x, s::cl_double y) __NOEXC {
return __sLessOrGreater(x, y);
__SYCL_EXPORT s::cl_int FOrdNotEqual(s::cl_double x, s::cl_double y) __NOEXC {
return __sFOrdNotEqual(x, y);
}
__SYCL_EXPORT s::cl_int LessOrGreater(s::cl_half x, s::cl_half y) __NOEXC {
return __sLessOrGreater(x, y);
__SYCL_EXPORT s::cl_int FOrdNotEqual(s::cl_half x, s::cl_half y) __NOEXC {
return __sFOrdNotEqual(x, y);
}
MAKE_1V_2V_FUNC(LessOrGreater, __vLessOrGreater, s::cl_int, s::cl_float,
MAKE_1V_2V_FUNC(FOrdNotEqual, __vFOrdNotEqual, s::cl_int, s::cl_float,
s::cl_float)
MAKE_1V_2V_FUNC(LessOrGreater, __vLessOrGreater, s::cl_long, s::cl_double,
MAKE_1V_2V_FUNC(FOrdNotEqual, __vFOrdNotEqual, s::cl_long, s::cl_double,
s::cl_double)
MAKE_1V_2V_FUNC(LessOrGreater, __vLessOrGreater, s::cl_short, s::cl_half,
MAKE_1V_2V_FUNC(FOrdNotEqual, __vFOrdNotEqual, s::cl_short, s::cl_half,
s::cl_half)

// (IsFinite) // isfinite
Expand Down
42 changes: 21 additions & 21 deletions sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,27 @@ _ZN2cl10__host_std12FOrdLessThanENS_4sycl3vecIfLi8EEES3_
_ZN2cl10__host_std12FOrdLessThanENS_4sycl6detail9half_impl4halfES4_
_ZN2cl10__host_std12FOrdLessThanEdd
_ZN2cl10__host_std12FOrdLessThanEff
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi16EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi1EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi2EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi3EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi4EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecINS1_6detail9half_impl4halfELi8EEES6_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi16EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi1EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi2EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi3EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi4EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIdLi8EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi16EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi1EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi2EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi3EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi4EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl3vecIfLi8EEES3_
_ZN2cl10__host_std12FOrdNotEqualENS_4sycl6detail9half_impl4halfES4_
_ZN2cl10__host_std12FOrdNotEqualEdd
_ZN2cl10__host_std12FOrdNotEqualEff
_ZN2cl10__host_std12native_exp10ENS_4sycl3vecIfLi16EEE
_ZN2cl10__host_std12native_exp10ENS_4sycl3vecIfLi1EEE
_ZN2cl10__host_std12native_exp10ENS_4sycl3vecIfLi2EEE
Expand Down Expand Up @@ -351,27 +372,6 @@ _ZN2cl10__host_std12native_rsqrtENS_4sycl3vecIfLi3EEE
_ZN2cl10__host_std12native_rsqrtENS_4sycl3vecIfLi4EEE
_ZN2cl10__host_std12native_rsqrtENS_4sycl3vecIfLi8EEE
_ZN2cl10__host_std12native_rsqrtEf
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi16EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi1EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi2EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi3EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi4EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecINS1_6detail9half_impl4halfELi8EEES6_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi16EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi1EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi2EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi3EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi4EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIdLi8EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi16EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi1EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi2EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi3EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi4EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl3vecIfLi8EEES3_
_ZN2cl10__host_std13LessOrGreaterENS_4sycl6detail9half_impl4halfES4_
_ZN2cl10__host_std13LessOrGreaterEdd
_ZN2cl10__host_std13LessOrGreaterEff
_ZN2cl10__host_std13__vSignBitSetENS_4sycl6detail9half_impl4halfE
_ZN2cl10__host_std13__vSignBitSetEd
_ZN2cl10__host_std13__vSignBitSetEf
Expand Down
42 changes: 21 additions & 21 deletions sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,27 @@
?FOrdLessThanEqual@__host_std@cl@@YAHMM@Z
?FOrdLessThanEqual@__host_std@cl@@YAHNN@Z
?FOrdLessThanEqual@__host_std@cl@@YAHVhalf@half_impl@detail@sycl@2@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$00@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$00@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$01@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$01@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$02@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$02@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$03@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$03@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$07@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$07@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@F$0BA@@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$0BA@@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$00@sycl@2@V?$vec@M$00@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$01@sycl@2@V?$vec@M$01@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$02@sycl@2@V?$vec@M$02@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$03@sycl@2@V?$vec@M$03@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$07@sycl@2@V?$vec@M$07@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@H$0BA@@sycl@2@V?$vec@M$0BA@@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$00@sycl@2@V?$vec@N$00@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$01@sycl@2@V?$vec@N$01@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$02@sycl@2@V?$vec@N$02@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$03@sycl@2@V?$vec@N$03@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$07@sycl@2@V?$vec@N$07@42@0@Z
?FOrdNotEqual@__host_std@cl@@YA?AV?$vec@_J$0BA@@sycl@2@V?$vec@N$0BA@@42@0@Z
?FOrdNotEqual@__host_std@cl@@YAHMM@Z
?FOrdNotEqual@__host_std@cl@@YAHNN@Z
?FOrdNotEqual@__host_std@cl@@YAHVhalf@half_impl@detail@sycl@2@0@Z
?FUnordNotEqual@__host_std@cl@@YA?AV?$vec@F$00@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$00@42@0@Z
?FUnordNotEqual@__host_std@cl@@YA?AV?$vec@F$01@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$01@42@0@Z
?FUnordNotEqual@__host_std@cl@@YA?AV?$vec@F$02@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$02@42@0@Z
Expand Down Expand Up @@ -852,27 +873,6 @@
?IsNormal@__host_std@cl@@YAHM@Z
?IsNormal@__host_std@cl@@YAHN@Z
?IsNormal@__host_std@cl@@YAHVhalf@half_impl@detail@sycl@2@@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$00@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$00@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$01@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$01@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$02@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$02@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$03@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$03@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$07@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$07@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@F$0BA@@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$0BA@@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$00@sycl@2@V?$vec@M$00@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$01@sycl@2@V?$vec@M$01@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$02@sycl@2@V?$vec@M$02@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$03@sycl@2@V?$vec@M$03@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$07@sycl@2@V?$vec@M$07@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@H$0BA@@sycl@2@V?$vec@M$0BA@@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$00@sycl@2@V?$vec@N$00@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$01@sycl@2@V?$vec@N$01@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$02@sycl@2@V?$vec@N$02@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$03@sycl@2@V?$vec@N$03@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$07@sycl@2@V?$vec@N$07@42@0@Z
?LessOrGreater@__host_std@cl@@YA?AV?$vec@_J$0BA@@sycl@2@V?$vec@N$0BA@@42@0@Z
?LessOrGreater@__host_std@cl@@YAHMM@Z
?LessOrGreater@__host_std@cl@@YAHNN@Z
?LessOrGreater@__host_std@cl@@YAHVhalf@half_impl@detail@sycl@2@0@Z
?OffsetSize@stream_impl@detail@sycl@cl@@0_KB
?Ordered@__host_std@cl@@YA?AV?$vec@F$00@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$00@42@0@Z
?Ordered@__host_std@cl@@YA?AV?$vec@F$01@sycl@2@V?$vec@Vhalf@half_impl@detail@sycl@cl@@$01@42@0@Z
Expand Down
9 changes: 9 additions & 0 deletions sycl/test/check_device_code/islessgreater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl-device-only %s -o - -Xclang -disable-llvm-passes | FileCheck %s

#include <CL/sycl.hpp>

SYCL_EXTERNAL void test_islessgreater(float a, float b) {
sycl::islessgreater(a, b);
}
// CHECK-NOT: __spirv_LessOrGreater
// CHECK: {{.*}} = call spir_func zeroext i1 @_Z20__spirv_FOrdNotEqualff(float {{.*}}, float {{.*}})