Skip to content

Conversation

@yozhu
Copy link
Contributor

@yozhu yozhu commented Jan 31, 2025

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Jan 31, 2025

@llvm/pr-subscribers-bolt

Author: YongKang Zhu (yozhu)

Changes

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

1 Files Affected:

  • (modified) bolt/test/X86/dynamic-relocs-on-entry.s (+2-2)
diff --git a/bolt/test/X86/dynamic-relocs-on-entry.s b/bolt/test/X86/dynamic-relocs-on-entry.s
index 2a29a43c4939a2..a5bf89c8824434 100644
--- a/bolt/test/X86/dynamic-relocs-on-entry.s
+++ b/bolt/test/X86/dynamic-relocs-on-entry.s
@@ -9,7 +9,7 @@
 # RUN: FileCheck %s --input-file=%t.out.txt
 
 ## Check if the new address in `chain` is correctly updated by BOLT
-# CHECK: Relocation section '.rela.dyn' at offset 0x{{.*}} contains 1 entry:
+# CHECK: Relocation section '.rela.dyn' at offset 0x{{.*}} contains 1 entries:
 # CHECK: {{.*}} R_X86_64_RELATIVE [[#%x,ADDR:]]
 # CHECK: [[#ADDR]]: c3 retq
 	.text
@@ -29,4 +29,4 @@ _start:
 
 	.data
 .Lfoo:
-	.quad Label
\ No newline at end of file
+	.quad Label

@dcci
Copy link
Member

dcci commented Jan 31, 2025

Thanks @yozhu -- I wonder where this was failing?

@yozhu
Copy link
Contributor Author

yozhu commented Jan 31, 2025

Thanks @yozhu -- I wonder where this was failing?

It fails in a "ninja check-bolt" run.

Copy link
Member

@dcci dcci left a comment

Choose a reason for hiding this comment

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

I see what's happening now. I think a better way of fixing this test would be that of using llvm-readelf rather than the system readelf. This is used to dump parts of the executable, so the format isn't particularly relevant.

Copy link
Member

@dcci dcci left a comment

Choose a reason for hiding this comment

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

LG if it passes CI. Thanks for the fix @yozhu

@maksfb maksfb changed the title [bolt][nfc] Fix test X86/dynamic-relocs-on-entry.s [BOLT][NFC] Fix test X86/dynamic-relocs-on-entry.s Jan 31, 2025
@yozhu yozhu merged commit e6d12ad into llvm:main Jan 31, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants