Rebase to LLVM 21.1.3

Successfully rebased llvm package from version 20.1.8 to 21.1.3 by syncing from Fedora rawhide branch to CentOS c9s using the centos-sync.sh script. All patches applied cleanly during centpkg prep, sources were uploaded to lookaside cache, and SRPM was generated successfully. Resolves: RHEL-100898 This commit was created by Jotnar, a Red Hat Enterprise Linux software maintenance AI agent. Assisted-by: Jotnar
2025-10-21 13:13:09 +00:00 · 2025-10-21 13:13:09 +00:00 · 9cb7e1045d
commit 9cb7e1045d
parent f610107fb1
12 changed files with 1436 additions and 878 deletions
--- a/.centos-ignore
+++ b/.centos-ignore
@ -0,0 +1,9 @@
+# List of files and directories that are not needed on CentOS/RHEL.
+/centos-sync.sh
+/ci.fmf
+/prepare-copr.sh
+/tests/kernel-ark-build.fmf
+/Makefile
+/.copr
+/.git-blame-ignore-revs
+/.packit.yaml
--- a/0001-22-polly-shared-libs.patch
+++ b/0001-22-polly-shared-libs.patch
@ -0,0 +1,59 @@
+From daf5077c8ce848b39239879369679c9fea7041b1 Mon Sep 17 00:00:00 2001
+From: Konrad Kleine <kkleine@redhat.com>
+Date: Tue, 28 Jan 2025 08:34:09 +0000
+Subject: [PATCH] shared libs
+
+---
+ polly/cmake/polly_macros.cmake    | 5 ++++-
+ polly/lib/CMakeLists.txt          | 1 +
+ polly/lib/External/CMakeLists.txt | 1 +
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake
+index 9bd7b0b0ea59..fc2c3a76901f 100644
+--- a/polly/cmake/polly_macros.cmake
+++ b/polly/cmake/polly_macros.cmake
+@@ -1,5 +1,5 @@
+ macro(add_polly_library name)
+-  cmake_parse_arguments(ARG "" "" "" ${ARGN})
+  cmake_parse_arguments(ARG "SHARED" "" "" ${ARGN})
+   set(srcs ${ARG_UNPARSED_ARGUMENTS})
+   if(MSVC_IDE OR XCODE)
+     file( GLOB_RECURSE headers *.h *.td *.def)
+@@ -17,6 +17,9 @@ macro(add_polly_library name)
+   else()
+     set(libkind)
+   endif()
+  if (ARG_SHARED)
+    set(libkind SHARED)
+  endif()
+   add_library( ${name} ${libkind} ${srcs} )
+   set_target_properties(${name} PROPERTIES FOLDER "Polly/Libraries")
+ 
+diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt
+index 0ed673815ff3..e156dcb31655 100644
+--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
+@@ -41,6 +41,7 @@ set(POLLY_COMPONENTS
+ # the sources them to be recompiled for each of them.
+ add_llvm_pass_plugin(Polly
+   NO_MODULE
+  SHARED
+   SUBPROJECT Polly
+   Analysis/DependenceInfo.cpp
+   Analysis/ScopDetection.cpp
+diff --git a/polly/lib/External/CMakeLists.txt b/polly/lib/External/CMakeLists.txt
+index ab5cba93cdcf..fdfd06864bc7 100644
+--- a/polly/lib/External/CMakeLists.txt
+++ b/polly/lib/External/CMakeLists.txt
+@@ -284,6 +284,7 @@ if (POLLY_BUNDLED_ISL)
+     )
+ 
+   add_polly_library(PollyISL
+    SHARED
+     ${ISL_FILES}
+     )
+ 
+-- 
+2.50.1
+
--- a/0001-CGP-Bail-out-if-Base-Scaled-Reg-does-not-dominate-in.patch
+++ b/0001-CGP-Bail-out-if-Base-Scaled-Reg-does-not-dominate-in.patch
@ -0,0 +1,131 @@
+From dde30a47313bf52fef02bbcb1de931a8d725659f Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Fri, 6 Jun 2025 12:38:30 +0100
+Subject: [PATCH] [CGP] Bail out if (Base|Scaled)Reg does not dominate insert
+ point. (#142949)
+
+(Base|Scaled)Reg may not dominate the chosen insert point, if there are
+multiple uses of the address. Bail out if that's the case, otherwise we
+will generate invalid IR.
+
+In some cases, we could probably adjust the insert point or hoist the
+(Base|Scaled)Reg.
+
+Fixes https://github.com/llvm/llvm-project/issues/142830.
+
+PR: https://github.com/llvm/llvm-project/pull/142949
+---
+ llvm/lib/CodeGen/CodeGenPrepare.cpp           | 13 +++-
+ .../X86/sink-addrmode-reg-does-not-geps.ll    | 76 +++++++++++++++++++
+ 2 files changed, 87 insertions(+), 2 deletions(-)
+ create mode 100644 llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+
+diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
+index 822ed6283117..32348a899683 100644
+--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
+@@ -5945,8 +5945,17 @@ bool CodeGenPrepare::optimizeMemoryInst(Instruction *MemoryInst, Value *Addr,
+   // The current BB may be optimized multiple times, we can't guarantee the
+   // reuse of Addr happens later, call findInsertPos to find an appropriate
+   // insert position.
+-  IRBuilder<> Builder(MemoryInst->getParent(),
+-                      findInsertPos(Addr, MemoryInst, SunkAddr));
+  auto InsertPos = findInsertPos(Addr, MemoryInst, SunkAddr);
+
+  // TODO: Adjust insert point considering (Base|Scaled)Reg if possible.
+  if (!SunkAddr) {
+    auto &DT = getDT(*MemoryInst->getFunction());
+    if ((AddrMode.BaseReg && !DT.dominates(AddrMode.BaseReg, &*InsertPos)) ||
+        (AddrMode.ScaledReg && !DT.dominates(AddrMode.ScaledReg, &*InsertPos)))
+      return Modified;
+  }
+
+  IRBuilder<> Builder(MemoryInst->getParent(), InsertPos);
+ 
+   if (SunkAddr) {
+     LLVM_DEBUG(dbgs() << "CGP: Reusing nonlocal addrmode: " << AddrMode
+diff --git a/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll b/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+new file mode 100644
+index 000000000000..1640bafbd0bf
+--- /dev/null
+++ b/llvm/test/Transforms/CodeGenPrepare/X86/sink-addrmode-reg-does-not-geps.ll
+@@ -0,0 +1,76 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' %s | FileCheck %s
+
+target triple = "x86_64-unknown-linux"
+
+declare i1 @cond(float)
+
+define void @scaled_reg_does_not_dominate_insert_point(ptr %src) {
+; CHECK-LABEL: define void @scaled_reg_does_not_dominate_insert_point(
+; CHECK-SAME: ptr [[SRC:%.*]]) {
+; CHECK-NEXT:  [[BB:.*]]:
+; CHECK-NEXT:    br label %[[LOOP:.*]]
+; CHECK:       [[LOOP]]:
+; CHECK-NEXT:    [[IV:%.*]] = phi i64 [ 0, %[[BB]] ], [ [[IV_NEXT:%.*]], %[[LOOP]] ]
+; CHECK-NEXT:    [[IV_NEXT]] = add i64 [[IV]], 1
+; CHECK-NEXT:    [[SUNKADDR2:%.*]] = mul i64 [[IV_NEXT]], 2
+; CHECK-NEXT:    [[SUNKADDR3:%.*]] = getelementptr i8, ptr [[SRC]], i64 [[SUNKADDR2]]
+; CHECK-NEXT:    [[SUNKADDR4:%.*]] = getelementptr i8, ptr [[SUNKADDR3]], i64 6
+; CHECK-NEXT:    [[L_0:%.*]] = load float, ptr [[SUNKADDR4]], align 4
+; CHECK-NEXT:    [[SUNKADDR:%.*]] = mul i64 [[IV]], 2
+; CHECK-NEXT:    [[SUNKADDR1:%.*]] = getelementptr i8, ptr [[SRC]], i64 [[SUNKADDR]]
+; CHECK-NEXT:    [[L_1:%.*]] = load float, ptr [[SUNKADDR1]], align 4
+; CHECK-NEXT:    [[TMP0:%.*]] = call i1 @cond(float [[L_0]])
+; CHECK-NEXT:    [[C:%.*]] = call i1 @cond(float [[L_1]])
+; CHECK-NEXT:    br i1 [[C]], label %[[LOOP]], label %[[EXIT:.*]]
+; CHECK:       [[EXIT]]:
+; CHECK-NEXT:    ret void
+;
+bb:
+  %gep.base = getelementptr i8, ptr %src, i64 8
+  br label %loop
+
+loop:
+  %iv = phi i64 [ 0, %bb ], [ %iv.next, %loop ]
+  %iv.shl = shl i64 %iv, 1
+  %gep.shl = getelementptr i8, ptr %gep.base, i64 %iv.shl
+  %gep.sub = getelementptr i8, ptr %gep.shl, i64 -8
+  %iv.next = add i64 %iv, 1
+  %l.0 = load float, ptr %gep.shl, align 4
+  %l.1 = load float, ptr %gep.sub, align 4
+  call i1 @cond(float %l.0)
+  %c = call i1 @cond(float %l.1)
+  br i1 %c, label %loop, label %exit
+
+exit:
+  ret void
+}
+
+define void @check_dt_after_modifying_cfg(ptr %dst, i64 %x, i8 %y, i8 %z) {
+; CHECK-LABEL: define void @check_dt_after_modifying_cfg(
+; CHECK-SAME: ptr [[DST:%.*]], i64 [[X:%.*]], i8 [[Y:%.*]], i8 [[Z:%.*]]) {
+; CHECK-NEXT:  [[ENTRY:.*]]:
+; CHECK-NEXT:    [[OFFSET:%.*]] = lshr i64 [[X]], 2
+; CHECK-NEXT:    [[SEL_FROZEN:%.*]] = freeze i8 [[Z]]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i8 [[SEL_FROZEN]], 0
+; CHECK-NEXT:    br i1 [[CMP]], label %[[SELECT_END:.*]], label %[[SELECT_FALSE_SINK:.*]]
+; CHECK:       [[SELECT_FALSE_SINK]]:
+; CHECK-NEXT:    [[SMIN:%.*]] = tail call i8 @llvm.smin.i8(i8 [[Y]], i8 0)
+; CHECK-NEXT:    br label %[[SELECT_END]]
+; CHECK:       [[SELECT_END]]:
+; CHECK-NEXT:    [[SEL:%.*]] = phi i8 [ 0, %[[ENTRY]] ], [ [[SMIN]], %[[SELECT_FALSE_SINK]] ]
+; CHECK-NEXT:    [[SUNKADDR:%.*]] = getelementptr i8, ptr [[DST]], i64 [[OFFSET]]
+; CHECK-NEXT:    store i8 [[SEL]], ptr [[SUNKADDR]], align 1
+; CHECK-NEXT:    ret void
+;
+entry:
+  %offset = lshr i64 %x, 2
+  %gep.dst = getelementptr i8, ptr %dst, i64 %offset
+  %smin = tail call i8 @llvm.smin.i8(i8 %y, i8 0)
+  %cmp = icmp slt i8 %z, 0
+  %sel = select i1 %cmp, i8 0, i8 %smin
+  store i8 %sel, ptr %gep.dst, align 1
+  ret void
+}
+
+declare i8 @llvm.smin.i8(i8, i8) #0
+-- 
+2.50.1
+
--- a/0001-clang-Add-a-hack-to-fix-the-offload-build-with-the-m.patch
+++ b/0001-clang-Add-a-hack-to-fix-the-offload-build-with-the-m.patch
@ -0,0 +1,27 @@
+From f028fc042ef2875a13c6abf3828626a313e4a8e6 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 1 Aug 2025 15:38:22 +0000
+Subject: [PATCH] clang: Add a hack to fix the offload build with the
+ mtls-dialect option
+
+---
+ clang/lib/Driver/ToolChains/CommonArgs.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
+index 097d186ad8ea..0dc9e60f8428 100644
+--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
+@@ -920,6 +920,9 @@ bool tools::isTLSDESCEnabled(const ToolChain &TC,
+   } else if (Triple.isX86()) {
+     SupportedArgument = V == "gnu" || V == "gnu2";
+     EnableTLSDESC = V == "gnu2";
+  } else if( Triple.isGPU()) {
+    // HACK To fix the offload build.
+    return false;
+   } else {
+     Unsupported = true;
+   }
+-- 
+2.49.0
+
--- a/1013
+++ b/1013
--- a/gating.yaml
+++ b/gating.yaml
@ -13,7 +13,7 @@ rules:
 --- !Policy
 product_versions:
  # The version number here should match the current rawhide release.
-  - fedora-43
+  - fedora-44
 decision_contexts:
  - bodhi_update_push_stable
  - bodhi_update_push_stable_critpath
--- a/llvm.spec
+++ b/llvm.spec
--- a/release-keys.asc
+++ b/release-keys.asc
@ -102,3 +102,29 @@ yWfeofTJ7PhKzoXM2Y/rRFoM5gNh1RVA19ngLT5Jwiof8fPZvHJ/9ZkHn+O7eMNm
 m5++gYza3pnn2/PoGpGGAKok+sfJiq5Tb7RUefyJTeZiyTZ/XJrA
 =tMzl
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaMgtRhYJKwYBBAHaRw8BAQdA4NRjJPhVd56sOM+QmTbZKkRT3bYbgg6+Bxed
+CELeGp+0JUN1bGxlbiBSaG9kZXMgPGN1bGxlbi5yaG9kZXNAYXJtLmNvbT6IkwQT
+FgoAOxYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1GAhsDBQsJCAcCAiICBhUK
+CQgLAgQWAgMBAh4HAheAAAoJED6Dur9KT56FkVwA/RLNMBHrjXoAKpRm1iIjiC6w
+gLRqGOnj1qAqPqgntMmmAQCQ2lGpw46rvh88ng84IGsRF0JlTAYb6SR/YYNsQyah
+Arg4BGjILUYSCisGAQQBl1UBBQEBB0B48hCLw13kduwibGDGoIax0BIa+f66IUC+
+HhNlucsjbgMBCAeIeAQYFgoAIBYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1G
+AhsMAAoJED6Dur9KT56FVssBAO1lL/S2cU65XFHgbjc6crwljDrD7PYbxBA7hDpi
+pC4ZAP98rK1hGQ5wxpeiJ0heZ8zhpdUwEeymIDBaIcwgrJRFBQ==
+=HcEB
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaMg2hBYJKwYBBAHaRw8BAQdA2J814YnhPQSdsyjwx8VxZ7AitqCnns9lzvkx
+HX9lWMW0JERvdWdsYXMgWXVuZyA8ZG91Z2xhcy55dW5nQHNvbnkuY29tPoiTBBMW
+CgA7FiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQCGwMFCwkIBwICIgIGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQMWxW0GTKy6XjYgEApJ7p+o7EAeaaOdO2f440KDfg
+t7haaBLaxr5fiaSKjkYA+gLDxWOh39Y84upf23qMmpSTZ3SK5LvJtBTVtV7AEX0B
+uDgEaMg2hBIKKwYBBAGXVQEFAQEHQL3CL6jHZAakhtLLj2Ks34u7ItY/7USl/bYk
+f/+mZTJMAwEIB4h4BBgWCgAgFiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQC
+GwwACgkQMWxW0GTKy6VTOgEArDn9bg58W7bfZfVfneJJbIeICEf3NN9IovbRbAOB
+ax0A/RxtrG4qowLlo907vb25ITOa1hBoheSV2wNoDaDUhFEF
+=JQ8u
+-----END PGP PUBLIC KEY BLOCK-----
--- a/2
+++ b/2
@ -1,2 +1,4 @@
+SHA512 (llvm-project-21.1.3.src.tar.xz) = d3058e7c18ada2a6a6192c7e75970406520e0d2ba390dba3b89e99f05959198fd2976d38c200f8e6af37fb569d866b6367bf6e0e249fe4b340dfab74499e5723
+SHA512 (llvm-project-21.1.3.src.tar.xz.sig) = d218a4071451e32a77890dd2e7de7a3b8a310ca85c7e6d90b88d85bad128979cf6866c9d772b880b50da2ec117832e77ba162049478c1deb7b0299cae008151a
 SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
 SHA512 (llvm-project-20.1.8.src.tar.xz.sig) = d74369bdb4d1b82775161ea53c9c5f3a23ce810f4df5ff617123023f9d8ce720e7d6ecc9e17f8ebd39fd9e7a9de79560abdf2ffe73bcb907a43148d43665d619
--- a/tests/README.md
+++ b/tests/README.md
@ -1,9 +1,9 @@
 # Gating testplans for LLVM

-The tests for LLVM are in a dedicated, separate repo: https://gitlab.com/redhat/centos-stream/tests/llvm.git
+The tests for LLVM are in a separate repo:
+
+* llvm:  https://gitlab.com/redhat/centos-stream/tests/llvm.git/

 This directory should contain only fmf plans (such as build-gating.fmf) which import
 the tests from the tests repo. This can be done using the "url" parameter of the
-plan's "discover" step.
-
-Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf
+plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@ -40,11 +40,10 @@ adjust:
      or distro == rhel-8

 discover:
-  - name: llvm-tests
-    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/llvm.git
-    ref: main
-    filter: "tag:-spoils-installation & tag:-not-in-default"
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/llvm.git
+  ref: main
+  filter: "tag:-spoils-installation & tag:-not-in-default"
 execute:
    how: tmt
 provision:
--- a/tests/lld-alternatives.fmf
+++ b/tests/lld-alternatives.fmf
@ -8,7 +8,7 @@ adjust:
    enabled: false

 discover:
-    - name: lld-tests
+    - name: lld-alternatives
      how: fmf
      url: https://gitlab.com/redhat/centos-stream/tests/llvm.git
      ref: main