Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[BOLT][test] Disable PLT check in callcont-fallthru #139953

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
Merged
merged 1 commit into from
May 14, 2025
Merged

[BOLT][test] Disable PLT check in callcont-fallthru #139953

merged 1 commit into from
May 14, 2025

Conversation

aaupov
Copy link
Contributor

@aaupov aaupov commented May 14, 2025

Some testing configurations don't support nm --synthetic option (where
nm is a symlink to llvm-nm), which prevents us from resolving puts@plt
symbol address in profile generation inside the test.
Disable the check until llvm-nm support is landed (#138232).

Test Plan: bin/llvm-lit -a tools/bolt/test/X86/callcont-fallthru.s

@aaupov
[𝘀𝗽𝗿] initial version
c210c4b 
Created using spr 1.3.4
@llvmbot llvmbot added the BOLT label May 14, 2025
@llvmbot
Copy link
Member

llvmbot commented May 14, 2025

@llvm/pr-subscribers-bolt

Author: Amir Ayupov (aaupov)

Changes

Some testing configurations don't support nm --synthetic option (where
nm is a symlink to llvm-nm), which prevents us from resolving puts@<!-- -->plt
symbol address in profile generation inside the test.
Disable the check until llvm-nm support is landed (#138232).

Test Plan: bin/llvm-lit -a tools/bolt/test/X86/callcont-fallthru.s

Full diff: https://github.com/llvm/llvm-project/pull/139953.diff

1 Files Affected:

  • (modified) bolt/test/X86/callcont-fallthru.s (+3-3)
diff --git a/bolt/test/X86/callcont-fallthru.s b/bolt/test/X86/callcont-fallthru.s
index 44e3bf21c14c0..7799e017691f6 100644
--- a/bolt/test/X86/callcont-fallthru.s
+++ b/bolt/test/X86/callcont-fallthru.s
@@ -6,7 +6,7 @@
 # RUN: %clangxx %cxxflags %s %t.so -o %t -Wl,-q -nostdlib
 # RUN: link_fdata %s %t %t.pat PREAGGT1
 # RUN: link_fdata %s %t %t.pat2 PREAGGT2
-# RUN: link_fdata %s %t %t.patplt PREAGGPLT
+# DONTRUN: link_fdata %s %t %t.patplt PREAGGPLT
 
 # RUN: llvm-strip --strip-unneeded %t -o %t.strip
 # RUN: llvm-objcopy --remove-section=.eh_frame %t.strip %t.noeh
@@ -26,8 +26,8 @@
 
 ## Check pre-aggregated traces don't report zero-sized PLT fall-through as
 ## invalid trace
-# RUN: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
-# RUN:   --check-prefix=CHECK-PLT
+# DONTRUN: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
+# DONTRUN:   --check-prefix=CHECK-PLT
 # CHECK-PLT: traces mismatching disassembled function contents: 0
 
   .globl foo

@aaupov aaupov requested a review from paschalis-mpeis May 14, 2025 19:25
@aaupov aaupov mentioned this pull request May 14, 2025
Closed
paschalis-mpeis
paschalis-mpeis approved these changes May 14, 2025
View reviewed changes
Copy link
Member

@paschalis-mpeis paschalis-mpeis left a comment

Choose a reason for hiding this comment

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

LGTM. Great, thank you so much, Amir!

@aaupov aaupov merged commit e24d866 into main May 14, 2025
12 checks passed
@aaupov aaupov deleted the users/aaupov/spr/bolttest-disable-plt-check-in-callcont-fallthru branch May 14, 2025 20:43
@MaskRay
Copy link
Member

MaskRay commented May 15, 2025 •
edited
Loading

You may also inspect the a@plt output from llvm-objdump -d. I prefer it (as you can test additional useful stuff) even if llvm-nm implements --synthetic.

@aaupov
Copy link
Contributor Author

aaupov commented May 15, 2025

You may also inspect the a@plt output from llvm-objdump -d. I prefer it (as you can test additional useful stuff) even if llvm-nm implements --synthetic.

The problem is that the call to nm is inside a wrapper constructing the profile, and replacing nm with objdump is non-trivial.

@paschalis-mpeis paschalis-mpeis mentioned this pull request May 15, 2025
Closed
paschalis-mpeis added a commit that referenced this pull request May 15, 2025
@paschalis-mpeis
[BOLT][test] Fix disable PLT check in callcont-fallthru
ee2feb6 
PR #139953 used `DONTRUN` to disable some run lines, but that
didn't work. Now switching to `RUN-DISABLED` for disabling the
tests until llvm-nm support is  landed (#138232).
@paschalis-mpeis paschalis-mpeis mentioned this pull request May 15, 2025
Merged
paschalis-mpeis added a commit that referenced this pull request May 15, 2025
@paschalis-mpeis
[BOLT][test] Fix disabling of the PLT check in callcont-fallthru (#14…
6090c0e 
…0026)

PR #139953 used `DONTRUN` to disable some run lines, but that didn't
work. Now switching to `RUN-DISABLED` for disabling the tests until
llvm-nm support is landed (#138232).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paschalis-mpeis paschalis-mpeis paschalis-mpeis approved these changes

@maksfb maksfb Awaiting requested review from maksfb maksfb is a code owner

@rafaelauler rafaelauler Awaiting requested review from rafaelauler rafaelauler is a code owner

@ayermolo ayermolo Awaiting requested review from ayermolo ayermolo is a code owner

@yota9 yota9 Awaiting requested review from yota9 yota9 is a code owner

Assignees
No one assigned
Labels
BOLT
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aaupov @llvmbot @MaskRay @paschalis-mpeis
Morty Proxy This is a proxified and sanitized view of the page, visit original site.