-
Notifications
You must be signed in to change notification settings - Fork 854
Fix intermittent bus errors in portable pocketfft op on macOS #17378
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
Open
metascroy
wants to merge
2
commits into
main
Choose a base branch
from
metascroy-patch-7
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| diff --git a/pocketfft_hdronly.h b/pocketfft_hdronly.h | ||
| index 57db7d7..e831ac0 100644 | ||
| --- a/pocketfft_hdronly.h | ||
| +++ b/pocketfft_hdronly.h | ||
| @@ -162,8 +162,20 @@ template<> struct VLEN<double> { static constexpr size_t val=2; }; | ||
| // std::aligned_alloc is a bit cursed ... it doesn't exist on MacOS < 10.15 | ||
| // and in musl, and other OSes seem to have even more peculiarities. | ||
| // Let's unconditionally work around it for now. | ||
| -# if 0 | ||
| -//#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15) | ||
| +#if defined(__APPLE__) || defined(__unix__) | ||
| +// Use posix_memalign on POSIX systems - it is ASAN-compatible. | ||
| +// The portable aligned_alloc below stores metadata at ptr[-1], which conflicts | ||
| +// with ASAN's heap redzone and causes intermittent bus errors. | ||
| +inline void *aligned_alloc(size_t align, size_t size) | ||
| + { | ||
| + void *ptr = nullptr; | ||
| + if (posix_memalign(&ptr, align, size) != 0) | ||
| + throw std::bad_alloc(); | ||
| + return ptr; | ||
| + } | ||
| +inline void aligned_dealloc(void *ptr) | ||
| + { free(ptr); } | ||
| +#elif (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) | ||
| inline void *aligned_alloc(size_t align, size_t size) | ||
| { | ||
| // aligned_alloc() requires that the requested size is a multiple of "align" | ||
| @@ -173,7 +185,7 @@ inline void *aligned_alloc(size_t align, size_t size) | ||
| } | ||
| inline void aligned_dealloc(void *ptr) | ||
| { free(ptr); } | ||
| -#else // portable emulation | ||
| +#else // portable emulation (NOT ASAN-compatible - stores metadata at ptr[-1]) | ||
| inline void *aligned_alloc(size_t align, size_t size) | ||
| { | ||
| align = std::max(align, alignof(max_align_t)); |
Oops, something went wrong.
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.
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.
should we land this upstream instead of having this patch, changing code on the fly?
cc @mergennachin
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.
Yeah, let's try upstreaming to https://github.com/mreineck/pocketfft
Uh oh!
There was an error while loading. Please reload this page.
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.
I've put up a PR here: mreineck/pocketfft#28, but should it not land in pocketfft for some reason, should we not patch in ET given we're distributing the buggy software?