Fix buildbot failure due to triple normalization issues #138747
Draft
Conversation
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
We have been seeing buildbot failures due to llvm#122629 I posted llvm#135571 to update the triple normalization logic, but that patch hasn't gotten any traction. So in this patch I am updating the lit config to use triple from clang's output for `%itanium_abi_triple` substitution, instead of relying on `self.config.target_triple` which might not be in a canonical form. Buildbot failure example: https://lab.llvm.org/buildbot/#/builders/40 Change-Id: Ib9c3425fddac45d7468fad20929fd29358a55e1b
Member
|
@llvm/pr-subscribers-testing-tools Author: Usman Nadeem (UsmanNadeem) ChangesWe have been seeing buildbot failures due to #122629. I posted #135571 to update the triple normalization logic, but that patch hasn't gotten any traction. So in this patch I am updating the lit config to use triple from clang's output for Buildbot failure example: https://lab.llvm.org/buildbot/#/builders/40 Change-Id: Ib9c3425fddac45d7468fad20929fd29358a55e1b Full diff: https://github.com/llvm/llvm-project/pull/138747.diff 1 Files Affected:
diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py
index c134cda90e2ee..4715936a6e51c 100644
--- a/llvm/utils/lit/lit/llvm/config.py
+++ b/llvm/utils/lit/lit/llvm/config.py
@@ -674,7 +674,11 @@ def use_clang(
(
"%itanium_abi_triple",
self.normalize_triple(
- self.make_itanium_abi_triple(self.config.target_triple)
+ self.make_itanium_abi_triple(
+ self.get_process_output(
+ [self.config.clang, "--print-target-triple"]
+ )[0].split("\n")[0]
+ )
),
)
)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We have been seeing buildbot failures due to #122629. I posted #135571 to update the triple normalization logic, but that patch hasn't gotten any traction.
So in this patch I am updating the lit config to use triple from clang's output for
%itanium_abi_triplesubstitution, instead of relying onself.config.target_triplewhich might not be in a canonical form.Buildbot failure example: https://lab.llvm.org/buildbot/#/builders/40
Change-Id: Ib9c3425fddac45d7468fad20929fd29358a55e1b