Skip to content

[BOLT] Workaround failures #131245

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
Mar 14, 2025
Merged

Conversation

kazutakahirata
Copy link
Contributor

These tests have been failing since:

commit 1cfca53
Author: Arthur Eubanks [email protected]
Date: Wed Mar 12 16:20:13 2025 -0700

This patch works around the failures by removing some FileCheck
directives. Hopefully, BOLT folks can chime in and commit a right
fix.

These tests have been failing since:

  commit 1cfca53
  Author: Arthur Eubanks <[email protected]>
  Date:   Wed Mar 12 16:20:13 2025 -0700

This patch works around the failures by removing some FileCheck
directives.  Hopefully, BOLT folks can chime in and commit a right
fix.
@llvmbot
Copy link
Member

llvmbot commented Mar 14, 2025

@llvm/pr-subscribers-bolt

Author: Kazu Hirata (kazutakahirata)

Changes

These tests have been failing since:

commit 1cfca53
Author: Arthur Eubanks <[email protected]>
Date: Wed Mar 12 16:20:13 2025 -0700

This patch works around the failures by removing some FileCheck
directives. Hopefully, BOLT folks can chime in and commit a right
fix.


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

4 Files Affected:

  • (modified) bolt/test/X86/icf-safe-icp.test (-1)
  • (modified) bolt/test/X86/icf-safe-process-rela-data.test (-1)
  • (modified) bolt/test/X86/icf-safe-test1.test (-2)
  • (modified) bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test (-1)
diff --git a/bolt/test/X86/icf-safe-icp.test b/bolt/test/X86/icf-safe-icp.test
index a9227d311edce..9a302c8ac8192 100644
--- a/bolt/test/X86/icf-safe-icp.test
+++ b/bolt/test/X86/icf-safe-icp.test
@@ -15,7 +15,6 @@
 # SAFEICFCHECK: skipping function with reference taken Derived3Func
 # SAFEICFCHECK-NEXT: ICF iteration 1
 # SAFEICFCHECK-NEXT: folding Derived3Destructor into Derived2Destructor
-# SAFEICFCHECK-NEXT: ===---------
 
 
 ## generate profile
diff --git a/bolt/test/X86/icf-safe-process-rela-data.test b/bolt/test/X86/icf-safe-process-rela-data.test
index cf71f55257777..27b0cf456e1fc 100644
--- a/bolt/test/X86/icf-safe-process-rela-data.test
+++ b/bolt/test/X86/icf-safe-process-rela-data.test
@@ -12,7 +12,6 @@
 # SAFEICFCHECK:      skipping function with reference taken fooAddFunc
 # SAFEICFCHECK-NEXT: skipping function with reference taken barAddFunc
 # SAFEICFCHECK-NEXT: ICF iteration 1
-# SAFEICFCHECK-NEXT: ===---------
 
 ## clang++ main.cpp
 ## Other functions removed for brevity.
diff --git a/bolt/test/X86/icf-safe-test1.test b/bolt/test/X86/icf-safe-test1.test
index 8a8e5ccf38e7c..45e23d1e40ea5 100644
--- a/bolt/test/X86/icf-safe-test1.test
+++ b/bolt/test/X86/icf-safe-test1.test
@@ -18,12 +18,10 @@
 # SAFEICFCHECK: skipping function with reference taken barAddFunc
 # SAFEICFCHECK-NEXT: ICF iteration 1
 # SAFEICFCHECK-NEXT: folding barSubFunc into fooSubFunc
-# SAFEICFCHECK-NEXT: ===---------
 
 # SAFEICFCHECKNOCFG: skipping function with reference taken barAddFunc
 # SAFEICFCHECKNOCFG-NEXT: ICF iteration 1
 # SAFEICFCHECKNOCFG-NEXT: folding barSubFunc into fooSubFunc
-# SAFEICFCHECKNOCFG-NEXT: ===---------
 
 ## clang++ -c main.cpp -o main.o
 ## extern int FooVar;
diff --git a/bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test b/bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test
index ea2d8a5f11e06..cb720f096fd40 100644
--- a/bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test
+++ b/bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test
@@ -15,7 +15,6 @@
 # SAFEICFCHECK-NEXT: skipping function with reference taken barMulFunc
 # SAFEICFCHECK-NEXT: skipping function with reference taken barAddFunc
 # SAFEICFCHECK-NEXT: ICF iteration 1
-# SAFEICFCHECK-NEXT: ===---------
 
 ## clang++ main.cpp -c -o -fno-PIC
 ## Similar code gets generated for external reference function.

@kazutakahirata kazutakahirata merged commit 03614b9 into llvm:main Mar 14, 2025
10 of 11 checks passed
@kazutakahirata kazutakahirata deleted the bolt_workaround branch March 14, 2025 03:55
@maksfb
Copy link
Contributor

maksfb commented Mar 14, 2025

Thanks. This appears to be the right fix, I don't think we need to check for the timers output. cc: @ayermolo

frederik-h pushed a commit to frederik-h/llvm-project that referenced this pull request Mar 18, 2025
These tests have been failing since:

  commit 1cfca53
  Author: Arthur Eubanks <[email protected]>
  Date:   Wed Mar 12 16:20:13 2025 -0700

This patch works around the failures by removing some FileCheck
directives.  Hopefully, BOLT folks can chime in and commit a right
fix.
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