release/20.x: [OpenMP] Add pre sm_70 load hack back in (#138589) #138626
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
@shiltian What do you think about merging this PR to the release branch? |
Member
Author
|
@llvm/pr-subscribers-offload Author: None (llvmbot) ChangesBackport dfcb8cb Requested by: @ye-luo Full diff: https://github.com/llvm/llvm-project/pull/138626.diff 1 Files Affected:
diff --git a/offload/DeviceRTL/include/Synchronization.h b/offload/DeviceRTL/include/Synchronization.h
index 5a789441b9d35..c510fbf0774c2 100644
--- a/offload/DeviceRTL/include/Synchronization.h
+++ b/offload/DeviceRTL/include/Synchronization.h
@@ -61,7 +61,11 @@ V add(Ty *Address, V Val, atomic::OrderingTy Ordering,
template <typename Ty, typename V = utils::remove_addrspace_t<Ty>>
V load(Ty *Address, atomic::OrderingTy Ordering,
MemScopeTy MemScope = MemScopeTy::device) {
+#ifdef __NVPTX__
+ return __scoped_atomic_fetch_add(Address, V(0), Ordering, MemScope);
+#else
return __scoped_atomic_load_n(Address, Ordering, MemScope);
+#endif
}
template <typename Ty, typename V = utils::remove_addrspace_t<Ty>>
|
Contributor
|
I manually verified the effectiveness of this patch on 20.x release branch. |
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
Summary: Different ordering modes aren't supported for an atomic load, so we just do an add of zero as the same thing. It's less efficient, but it works. Fixes llvm#138560 (cherry picked from commit dfcb8cb)
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@ye-luo (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport dfcb8cb
Requested by: @ye-luo