rpms/llvm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix llvm-exegesis failures on s390x

Browse Source
This commit is contained in:
Tulio Magno Quites Machado Filho 2023-03-14 16:25:42 -03:00
parent 3c4fee7794
commit 55d7730bb8
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
disable-exegesis-tests-s390x.patch → D145763.diff
View File

@ -1,24 +1,21 @@
diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
index 135f5796b583..20de4ec2cc66 100644
--- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
+++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
@@ -1,3 +1,7 @@
+if 's390x' in config.root.host_triple:
+ # These tests fail to run on s390x.
+ config.unsupported = True
+
@@ -1,3 +1,6 @@
if not ('PowerPC' in config.root.targets):
# We need support for PowerPC.
config.unsupported = True
+elif not ('powerpc' in config.root.host_triple):
+ # We need to be running on an PPC host.
+ config.unsupported = True
diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
index 7230f35fdb83..627bba4dc93d 100644
--- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
+++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
@@ -1,3 +1,7 @@
+if 's390x' in config.root.host_triple:
+ # These tests fail to run on s390x.
+ config.unsupported = True
+
@@ -1,3 +1,6 @@
if not ('X86' in config.root.targets):
# We need support for X86.
config.unsupported = True
+elif not ('x86_64' in config.root.host_triple):
+ # We need to be running on an X86 host.
+ config.unsupported = True

8
llvm.spec
View File

@ -75,7 +75,7 @@
Name: %{pkg_name}
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Low Level Virtual Machine
License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -93,7 +93,8 @@ Source7: run-lit-tests
Source8: lit.fedora.cfg.py
%endif
Patch0: disable-exegesis-tests-s390x.patch
# Backport from LLVM 17.
Patch0: D145763.diff
# See https://reviews.llvm.org/D137890 for the next two patches
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
@ -570,6 +571,9 @@ fi
%endif
%changelog
* Fri Mar 10 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-2
- Fix llvm-exegesis failures on s390x
* Wed Feb 22 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-1
- Update to LLVM 16.0.0 RC3