diff --git a/0021-fix-loongarch64-test-error-in-r600-encoding.patch b/0021-fix-loongarch64-test-error-in-r600-encoding.patch new file mode 100644 index 0000000000000000000000000000000000000000..c2005315322de63edf6ec46fa7788100c45dd253 --- /dev/null +++ b/0021-fix-loongarch64-test-error-in-r600-encoding.patch @@ -0,0 +1,13 @@ +diff -Naur a/llvm-17.0.6.src/test/CodeGen/AMDGPU/r600-encoding.ll b/llvm-17.0.6.src/test/CodeGen/AMDGPU/r600-encoding.ll +--- a/llvm-17.0.6.src/test/CodeGen/AMDGPU/r600-encoding.ll 2024-05-28 10:17:20.890401370 +0800 ++++ b/llvm-17.0.6.src/test/CodeGen/AMDGPU/r600-encoding.ll 2024-05-28 10:21:01.746401370 +0800 +@@ -8,7 +8,7 @@ + ; EG: MUL_IEEE {{[ *TXYZWPVxyzw.,0-9]+}} ; encoding: [{{0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x10,0x01,0x[0-9a-f]+,0x[0-9a-f]+}}] + + ; R600: {{^}}test: +-; R600: MUL_IEEE {{[ *TXYZWPVxyzw.,0-9]+}} ; encoding: [{{0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x10,0x02,0x[0-9a-f]+,0x[0-9a-f]+}}] ++; R600: MUL_IEEE {{[ *TXYZWPVxyzw.,0-9]+}} ; encoding: [{{0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x[0-9a-f]+,0x21,0x02,0x[0-9a-f]+,0x[0-9a-f]+}}] + + define amdgpu_ps void @test(<4 x float> inreg %reg0) { + entry: + diff --git a/llvm.spec b/llvm.spec index 73dfde2c5fbed50e3121db8807f151f54887da05..9c48a1d3563e5bcbc21db29f8767535aca4d8a71 100644 --- a/llvm.spec +++ b/llvm.spec @@ -38,7 +38,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 10 +Release: 11 Summary: The Low Level Virtual Machine License: NCSA @@ -69,6 +69,7 @@ Patch17: 0017-Add-the-support-for-classic-flang.patch Patch18: 0018-Fix-declaration-definition-mismatch-for-classic-flang.patch Patch19: 0019-Backport-LoongArch-Improve-the-support-for-atomic-and-clear_cache.patch Patch20: 0020-Update-llvm-lit-config-to-support-build_for_openeule.patch +Patch21: 0021-fix-loongarch64-test-error-in-r600-encoding.patch BuildRequires: binutils-devel BuildRequires: cmake @@ -171,7 +172,29 @@ mv cmake-%{version}.src cmake cd .. mv third-party-%{version}.src third-party %setup -T -q -b 0 -n llvm-%{version}.src -%autopatch -p2 +%patch1 -p2 +%patch2 -p2 +%patch3 -p2 +%patch4 -p2 +%patch5 -p2 +%patch6 -p2 +%patch7 -p2 +%patch8 -p2 +%patch9 -p2 +%patch10 -p2 +%patch11 -p2 +%patch12 -p2 +%patch13 -p2 +%patch14 -p2 +%patch15 -p2 +%patch16 -p2 +%patch17 -p2 +%patch18 -p2 +%patch19 -p2 +%patch20 -p2 +%ifarch loongarch64 +%patch21 -p2 +%endif pathfix.py -i %{__python3} -pn \ test/BugPoint/compile-custom.ll.py \ @@ -353,6 +376,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C ./_build %{install_includedir}/llvm-gmock %changelog +* Sun Jun 9 2024 zhangxianjun - 17.0.6-11 +- fix loongarch64 test error:r600-encoding-ll + * Mon Apr 29 2024 wangqiang - 17.0.6-10 - Update llvm-lit config to support macro `build_for_openeuler`