-
Notifications
You must be signed in to change notification settings - Fork 798
[SYCL][NVPTX][AMDGCN] Move devicelib cmath to header #18706
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.
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
Conversation
@bader this is a proof of concept for moving C++ library handling from libdevice code into headers. It allows us to remove the hack blocking LLVM intrinsic generation for standard math built-ins, since we intercept them earlier in the header for device side, which is in-line with what clang cuda does. Only for cmath and for Nvidia and AMD for now. I've currently placed the header into the This still needs a ton of work which is why it's a draft, but let me know if you have any feedback on the approach. It would be good to know if this would be interesting for non-AOT targets as well, there's a lot of logic in the driver to conditionally link libdevice libraries, I suspect in theory most of that could be replaced with this header approach, but I haven't looked into this much so I'm not 100% sure if this is something we'd want. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@npmiller, thanks for working on this.
It allows us to remove the hack blocking LLVM intrinsic generation for standard math built-ins, since we intercept them earlier in the header for device side, which is in-line with what clang cuda does.
I discussed this approach with Johannes Doerfert a few years ago. He told me that he doesn't like "what clang cuda does" and plans to change it. I think clang still uses the header solution, but it may be worth to double check with LLVM community is doing any work in that direction.
I've currently placed the header into the stl_wrappers directory, it might be better as a clang header, but at least on CUDA the clang header is always included whereas with the stl wrappers it will only be included when the matching standard library header is included.
Interesting... I thought that clang only adds path to the clang headers at the beginning of the search paths list to make sure that clang wrapper header is included before STL one. I didn't know that CUDA compiler always includes clang wrapper headers.
It would be good to know if this would be interesting for non-AOT targets as well, there's a lot of logic in the driver to conditionally link libdevice libraries, I suspect in theory most of that could be replaced with this header approach, but I haven't looked into this much so I'm not 100% sure if this is something we'd want.
@AlexeySachkov, could you take into SPIR-V part, please?
The change looks to be aligned with the community approach. The only concern I have is compile time, but potential increase should be negligible.
cc @Naghasan just to keep in the loop.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't forget to add tests and documentation for the attribute before undrafting :)
Yeah in the driver here it does: CC1Args.push_back("-include");
CC1Args.push_back("__clang_cuda_runtime_wrapper.h"); And Using our stl wrappers solution should allow us to be a little more conservative about when we include all of this stuff. |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this review, I have four outstanding requests:
- Fixing a misnamed header guard.
- A change to diagnose declarations that have both the
sycl_device
andsycl_device_only
attributes as errors. - A change to diagnose overload sets that contain both
sycl_device
andsycl_device_only
attributed overloads. - The reverse mangled name declaration lookup issue.
The 4th item will take some time and I understand that this feature is needed with some urgency, so I'm ok to defer that one to a later PR and will file an issue to address it after this PR lands. If possible though, I'd like to see the first three issues addressed in this PR.
@tahonermann, are okay to make these changes in follow-up PR(s)? |
I've added diagnostics for these and tightened up overlapping usages of the attributes, as well as added a lit test for it. That allowed a small cleanup of the problematic code in EmitGlobal, although as I explained the bulk of it still remains to handle the mangling lookup issue. I've also added a small check in Hopefully that resolves the remaining issues and we can go ahead with the PR. And then iterate on what remains to be improved. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for adding those diagnostics so quickly, @npmiller! This looks good to me. I'll file an issue after this PR is merged to follow up on the reverse mangled name declaration lookup issue.
Tom has approved this PR, but apparently, he is not member of the @intel/dpcpp-cfe-reviewers team. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@npmiller, a couple of follow-ups.
UPD: the second item might be some bug in my environment, please, ignore it. I'll double-check and fix it myself if it's the case. |
Follow up from: #18706 * Include `<type_traits>`, this was working because `<cmath>` pulls it in but this is cleaner. * Use C++14 and C++17 `_v` and `_t` helpers. * Switch to variadic template for `__sycl_promote`, using C++17 fold expressions. In theory only needed for 1 to 3 types, but this is an internal helper anyway so it doesn't seem worth restricting. * Switch `typedef` to `using` With this patch the header now require C++17 support to compile. Which is fine since it's the minimum requirement for SYCL 2020, and this header is only compiled on the device side which is always handled by clang, so there shouldn't be any support issues.
Today, From what I understand, this PR implements an alternative approach to "wrappers" part - where instead of providing a symbol that is expected to come from the standard C/C++ runtime library at device code link time, we provide it directly through headers. I don't think that it should otherwise change much in how |
Just to clarify this PR implements both the "wrappers" but also the "fallback" in one step, it doesn't need anything else from libdevice. So in theory enabling this for non-AOT targets would allow us to remove linking both the cmath wrapper and the cmath fallback. The few things to consider when enabling this for non-AOT targets:
|
Ah, that's right since we redirect
We have a fallback implementation for every
At least the "fallback" implementation (that is used in absolute most cases, if not always) is written using SPIR-V built-ins anyway, because it is supposed to work everywhere. It is actual device backends who are supposed to provide optimized versions. And as I said above, we can do a different redirect in headers to preserve the rest of the devicelib mechanism and just replace the "wrappers" part of it if we want to be conservative. There is a direction to move away from the complexity that devicelib introduces, because there are only a handful of libraries which are actually provided in their "native" form by one or another backend. I.e. the benefit of having that infrastructure is very small comparing to amount of code and redistributable files that we have. From that point of view its indeed better to replace both "wrappers" and "fallback", dropping the ability to plug-in native implementation |
Follow-up from #18706 Initially the header introduced in the other PR was called `cmath-fallback.h`, but we renamed it, so just rename this test as well to something a bit more descriptive.
The implementation is easier to maintain and deploy. In my opinion, this is a win.
To get the benefits the "fallback" path we need driver runtimes to implement new extensions, which they are not going to. I don't think it's worth keeping the "fallback" path.
This is where whole idea breaks. Device backends don't do that and I haven't seen any interest in doing that in the future.
That's exactly my point. You can still plug-in native implementation at compile time through macro. Potentially we could do the same at JIT time with the spec constants, but again, I don't see any interest in such a feature form either users or developers. |
Overview
Currently to support C++ builtins in SYCL kernels, we rely on
libdevice
whichprovides implementations for standard library builtins. This library is built
either to bitcode or SPIR-V and linked in our kernels.
On some targets this causes issues because clang sometimes turns standard
library calls into LLVM intrinsics that not all targets support. Specifically on
NVPTX and AMDGCN we can't easily support these intrinsics because we currently
use implementations provided by CUDA and HIP in the form of a bitcode library,
which is not something we can use from the LLVM backend.
In upstream LLVM for CUDA and HIP kernels, the way this is handled is that they
have clang headers providing device-side overloads of C++ library functions that
hook into the target specific versions of the builtins (for example
std::sin
to
__nv_sin
). This way on the device side C++ builtins are hijacked beforeclang can turn them to intrinsics which solves the issue mentioned above.
This patch is adding the infrastructure to support handling C++ builtins in SYCL
in the same way as it is done for CUDA and HIP in upstream LLVM. And is using it
to support
cmath
in NVPTX and AMDGCN compilation.Breakdown
sycl_device_only
attribute: This new attribute allows functions markedwith it to be treated as device-side overload of existing functions. This is
what allows us to overload C++ library functions for device in SYCL.
builtins for NVPTX and AMDGCN. In theory since this is only moving
cmath
, thehack could still be needed, but it looks fine in testing and if we run into
issues we should just move the problematic builtins to this solution. The test
sycl-libdevice-cmath.cpp
was testing this hack, so it was removed.cmath
support for NVPTX and AMDGCN inlibdevice
was disabled. To limit thescope of the patch
libdevice
is still fully wired up for these targets, but itjust won't provide the
cmath
functions.cmath-fallback.h
header providing the device-side math functionoverloads. They are defined using SPIR-V builtins, so in theory this header
could be used as-is for other targets.
cmath
stl wrapper to includecmath-fallback.h
for NVPTXand AMDGCN. In upstream LLVM
clang-cuda
always includes with-include
theheader with these overloads, using the stl wrappers is a bit more selective.
rint
to device lib tests and stl wrapper, this was added in[SYCL][Devicelib] Implement cmath rintf wrapper with __spirv_ocl_rint #18857 but wasn't in E2E testing.
Compile-time performance
A quick check of compile-time shows that this seems to provide a small performance improvement. Using two samples, one using cmath (the E2E
cmath_test.cpp
), and a sample not using cmath, over 10 iterations, I'm getting the following results:Which suggest that the no cmath compile time performance is pretty much equivalent, and the cmath compile-time performance is faster by roughly ~0.12s.
And this is with the whole
libdevice
setup still in place, so it's possible this approach could be even more beneficial with more work.Future work
cmath-fallback.h
, theseweren't defined in libdevice, we should either remove the commented out lines or
implement them properly.
cmath
andmath.h
, the currentcmath-fallback.h
implements bothwhich seems to work fine, but ideally we should split it up.
nearbyint
, this was only implemented for NVPTX and AMDGCN inlibdevice
, this patch keeps it the same, but we should look into propersupport and testing for this.
libdevice
into headers (complex, assert, crt, etc ...).