Skip to content

[NFC] fix failed ompt tests on M1 device #65696

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

Merged
merged 1 commit into from
Nov 24, 2023

Conversation

lixi-zhou
Copy link
Contributor

Fix the 2 failed ompt tests on M1 device found on #63194.

libomp :: ompt/synchronization/masked.c
libomp :: ompt/synchronization/master.c

For the details of this fix, please check the origin discussion in #63194 (comment)

Thanks @jprotze for the fix.

@@ -190,8 +190,8 @@ ompt_label_##id:
// On AArch64 the NOP instruction is 4 bytes long, can be followed by inserted
// store instruction (another 4 bytes long).
#define print_possible_return_addresses(addr) \
printf("%" PRIu64 ": current_address=%p or %p\n", ompt_get_thread_data()->value, \
((char *)addr) - 4, ((char *)addr) - 8)
printf("%" PRIu64 ": current_address=%p or %p or %p\n", ompt_get_thread_data()->value, \
Copy link
Contributor

Choose a reason for hiding this comment

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

We probably want to limit this to macos only, so it might be a good idea to guard it with proper macros.

@lixi-zhou lixi-zhou reopened this Sep 8, 2023
@jprotze jprotze self-requested a review September 8, 2023 07:33
Copy link
Collaborator

@jprotze jprotze left a comment

Choose a reason for hiding this comment

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

Lgtm

@jprotze jprotze merged commit a3c0f70 into llvm:main Nov 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants