Skip to content
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

Jump to bottom

[SYCL] Support stdlib function div, ldiv, lldiv in device library #3262

Merged
merged 7 commits into from
Mar 9, 2021
Merged

[SYCL] Support stdlib function div, ldiv, lldiv in device library #3262

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
784895a
support div/ldiv/lldiv from <stdlib.h> in libdevice
jinge90 Feb 25, 2021
6f13dd5
Move actual implementation of div into fallback lib
jinge90 Feb 26, 2021
5967d33
add wrapper obj impl
jinge90 Mar 1, 2021
e035475
clang format the patch
jinge90 Mar 1, 2021
54717e3
clang-format patch
jinge90 Mar 1, 2021
375416d
move cstdlib inclusion under __SPIR__
jinge90 Mar 4, 2021
77b7cf2
rebase to latest sycl-post-link
jinge90 Mar 5, 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
10 changes: 10 additions & 0 deletions libdevice/cmath_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
#include "device_math.h"

#ifdef __SPIR__
DEVICE_EXTERN_C
div_t div(int x, int y) { return __devicelib_div(x, y); }

DEVICE_EXTERN_C
ldiv_t ldiv(long int x, long int y) { return __devicelib_ldiv(x, y); }

DEVICE_EXTERN_C
lldiv_t lldiv(long long int x, long long int y) {
return __devicelib_lldiv(x, y);
}

DEVICE_EXTERN_C
float scalbnf(float x, int n) { return __devicelib_scalbnf(x, n); }
Expand Down
11 changes: 10 additions & 1 deletion libdevice/device_math.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@
#define __LIBDEVICE_DEVICE_MATH_H__

#include "device.h"

#include <cstdlib>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please move this under __SPIR__ below.

#ifdef __SPIR__

DEVICE_EXTERN_C
div_t __devicelib_div(int x, int y);

DEVICE_EXTERN_C
ldiv_t __devicelib_ldiv(long int x, long int y);

DEVICE_EXTERN_C
lldiv_t __devicelib_lldiv(long long int x, long long int y);

DEVICE_EXTERN_C
double __devicelib_log(double x);

Expand Down
12 changes: 12 additions & 0 deletions libdevice/fallback-cmath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
// or remove any item in this file.
// TODO: generate the DeviceLibFuncMap in sycl-post-link.cpp automatically
// during the build based on libdevice to avoid manually sync.

DEVICE_EXTERN_C
jinge90 marked this conversation as resolved.
Show resolved Hide resolved
div_t __devicelib_div(int x, int y) { return {x / y, x % y}; }

DEVICE_EXTERN_C
ldiv_t __devicelib_ldiv(long int x, long int y) { return {x / y, x % y}; }

DEVICE_EXTERN_C
lldiv_t __devicelib_lldiv(long long int x, long long int y) {
return {x / y, x % y};
}

DEVICE_EXTERN_C
float __devicelib_scalbnf(float x, int n) { return __spirv_ocl_ldexp(x, n); }

Expand Down
3 changes: 3 additions & 0 deletions llvm/tools/sycl-post-link/sycl-post-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ static std::unordered_map<std::string, DeviceLibExt> DeviceLibFuncMap = {
{"__devicelib_cbrtf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_cosf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_coshf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_div", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_erfcf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_erff", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_exp2f", DeviceLibExt::cl_intel_devicelib_math},
Expand All @@ -203,8 +204,10 @@ static std::unordered_map<std::string, DeviceLibExt> DeviceLibFuncMap = {
{"__devicelib_frexpf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_hypotf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_ilogbf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_ldiv", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_ldexpf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_lgammaf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_lldiv", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_log10f", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_log1pf", DeviceLibExt::cl_intel_devicelib_math},
{"__devicelib_log2f", DeviceLibExt::cl_intel_devicelib_math},
Expand Down
5 changes: 5 additions & 0 deletions sycl/include/CL/sycl/builtins.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,6 +1544,11 @@ detail::enable_if_t<detail::is_genfloatf<T>::value, T> tan(T x) __NOEXC {
} // __SYCL_INLINE_NAMESPACE(cl)

#ifdef __SYCL_DEVICE_ONLY__
extern "C" {
extern SYCL_EXTERNAL div_t div(int x, int y);
extern SYCL_EXTERNAL ldiv_t ldiv(long int x, long int y);
extern SYCL_EXTERNAL lldiv_t lldiv(long long int x, long long int y);
}
#ifdef __GLIBC__
extern "C" {
extern SYCL_EXTERNAL void __assert_fail(const char *expr, const char *file,
Expand Down