Move LLVM 15 patches to interim configuration

---------------------------

Author: pszymich

external/llvm/trunk/patches_external/0001-SCEV-Cache-ZExt-SCEV-expressions.patch

@@ -0,0 +1,64 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2024 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+/*========================== begin_copyright_notice ============================
+
+Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+See https://llvm.org/LICENSE.txt for license information.
+SPDX-License-Identifier: Apache-2.0 with LLVM-exception
+
+============================= end_copyright_notice ===========================*/
+
+From 6164d7ef36755d5addf029da753cc41606e64a6f Mon Sep 17 00:00:00 2001
+From: Max Kazantsev <[email protected]>
+Date: Mon, 19 Sep 2022 17:37:17 +0700
+Subject: [PATCH 1/5] [SCEV] Verify contents of loop disposition cache
+
+It seems that it is sometimes broken. Initial motivation for this was
+investigation of https://github.com/llvm/llvm-project/issues/56260, but
+it also seems that we have found an unrelated bug in LoopFusion that leaves
+broken caches.
+
+Differential Revision: https://reviews.llvm.org/D134158
+Reviewed By: nikic
+---
+ llvm/lib/Analysis/ScalarEvolution.cpp | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
+index 2958a5054afc..76074c715cf7 100644
+--- a/llvm/lib/Analysis/ScalarEvolution.cpp
++++ b/llvm/lib/Analysis/ScalarEvolution.cpp
+@@ -13892,6 +13892,24 @@ void ScalarEvolution::verify() const {
+   };
+   VerifyBECountUsers(/* Predicated */ false);
+   VerifyBECountUsers(/* Predicated */ true);
++
++  // Verify intergity of loop disposition cache.
++  for (const auto &It : LoopDispositions) {
++    const SCEV *S = It.first;
++    auto &Values = It.second;
++    for (auto &V : Values) {
++      auto CachedDisposition = V.getInt();
++      const auto *Loop = V.getPointer();
++      const auto RecomputedDisposition = SE2.getLoopDisposition(S, Loop);
++      if (CachedDisposition != RecomputedDisposition) {
++        dbgs() << "Cached disposition of " << *S << " for loop " << *Loop
++               << " is incorrect: cached "
++               << loopDispositionToStr(CachedDisposition) << ", actual "
++               << loopDispositionToStr(RecomputedDisposition) << "\n";
++        std::abort();
++      }
++    }
++  }
+ }
+ 
+ bool ScalarEvolution::invalidate(
+-- 
+2.34.1
+

external/llvm/trunk/patches_external/0002-SCEV-Cache-ZExt-SCEV-expressions.patch

@@ -0,0 +1,64 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2024 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+/*========================== begin_copyright_notice ============================
+
+Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+See https://llvm.org/LICENSE.txt for license information.
+SPDX-License-Identifier: Apache-2.0 with LLVM-exception
+
+============================= end_copyright_notice ===========================*/
+
+From f41249dc86ead5cb54a6b5394c086aa79dbeb687 Mon Sep 17 00:00:00 2001
+From: Florian Hahn <[email protected]>
+Date: Mon, 10 Oct 2022 20:42:18 +0100
+Subject: [PATCH 2/5] [SCEV] Verify block disposition cache.
+
+This extends the existing SCEV verification to catch cache invalidation
+issues as in #57837.
+
+The validation logic is similar to the recently added loop disposition
+cache validation in bb68b2402daa9.
+
+Reviewed By: nikic
+
+Differential Revision: https://reviews.llvm.org/D134531
+---
+ llvm/lib/Analysis/ScalarEvolution.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
+index 76074c715cf7..3ea6f61c7021 100644
+--- a/llvm/lib/Analysis/ScalarEvolution.cpp
++++ b/llvm/lib/Analysis/ScalarEvolution.cpp
+@@ -13910,6 +13910,22 @@ void ScalarEvolution::verify() const {
+       }
+     }
+   }
++
++  // Verify integrity of the block disposition cache.
++  for (const auto &It : BlockDispositions) {
++    const SCEV *S = It.first;
++    auto &Values = It.second;
++    for (auto &V : Values) {
++      auto CachedDisposition = V.getInt();
++      const BasicBlock *BB = V.getPointer();
++      const auto RecomputedDisposition = SE2.getBlockDisposition(S, BB);
++      if (CachedDisposition != RecomputedDisposition) {
++        dbgs() << "Cached disposition of " << *S << " for block %"
++               << BB->getName() << " is incorrect! \n";
++        std::abort();
++      }
++    }
++  }
+ }
+ 
+ bool ScalarEvolution::invalidate(
+-- 
+2.34.1
+

external/llvm/trunk/patches_external/0006-SCEV-Cache-ZExt-SCEV-expressions.patch renamed to external/llvm/trunk/patches_external/0003-SCEV-Cache-ZExt-SCEV-expressions.patch

@@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0 with LLVM-exception
 
 ============================= end_copyright_notice ===========================*/
 
-From 65fb672dce4a7f2df0df7626ec3a18d6cbc73090 Mon Sep 17 00:00:00 2001
+From 926869982768eae1af7e9ae3fe7c63270296aec6 Mon Sep 17 00:00:00 2001
 From: Florian Hahn <[email protected]>
 Date: Fri, 9 Dec 2022 22:14:03 +0000
 Subject: [PATCH 3/5] [SCEV] Cache ZExt SCEV expressions.
@@ -55,10 +55,10 @@ Differential Revision: https://reviews.llvm.org/D137505
  2 files changed, 134 insertions(+)
 
 diff --git a/llvm/include/llvm/Analysis/ScalarEvolution.h b/llvm/include/llvm/Analysis/ScalarEvolution.h
-index b16aa7017719..f0c3ba40a8d6 100644
+index fd00c744840b..c8f9a871a5a7 100644
 --- a/llvm/include/llvm/Analysis/ScalarEvolution.h
 +++ b/llvm/include/llvm/Analysis/ScalarEvolution.h
-@@ -567,6 +567,8 @@ public:
+@@ -562,6 +562,8 @@ public:
    const SCEV *getPtrToIntExpr(const SCEV *Op, Type *Ty);
    const SCEV *getTruncateExpr(const SCEV *Op, Type *Ty, unsigned Depth = 0);
    const SCEV *getZeroExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth = 0);
@@ -67,7 +67,7 @@ index b16aa7017719..f0c3ba40a8d6 100644
    const SCEV *getSignExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth = 0);
    const SCEV *getCastExpr(SCEVTypes Kind, const SCEV *Op, Type *Ty);
    const SCEV *getAnyExtendExpr(const SCEV *Op, Type *Ty);
-@@ -1209,6 +1211,45 @@ public:
+@@ -1206,6 +1208,45 @@ public:
    /// to be infinite, it must also be undefined.
    bool loopIsFiniteByAssumption(const Loop *L);
 
@@ -113,7 +113,7 @@ index b16aa7017719..f0c3ba40a8d6 100644
  private:
    /// A CallbackVH to arrange for ScalarEvolution to be notified whenever a
    /// Value is deleted.
-@@ -1289,6 +1330,11 @@ private:
+@@ -1267,6 +1308,11 @@ private:
    /// This is a cache of the values we have analyzed so far.
    ValueExprMapType ValueExprMap;
 
@@ -125,7 +125,7 @@ index b16aa7017719..f0c3ba40a8d6 100644
    /// Mark predicate values currently being processed by isImpliedCond.
    SmallPtrSet<const Value *, 6> PendingLoopPredicates;
 
-@@ -2263,6 +2309,28 @@ private:
+@@ -2268,6 +2314,28 @@ private:
    const SCEV *BackedgeCount = nullptr;
  };
 
@@ -155,10 +155,10 @@ index b16aa7017719..f0c3ba40a8d6 100644
 
  #endif // LLVM_ANALYSIS_SCALAREVOLUTION_H
 diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
-index 495cd73d8eef..7c745ff07cac 100644
+index 3ea6f61c7021..847d72828570 100644
 --- a/llvm/lib/Analysis/ScalarEvolution.cpp
 +++ b/llvm/lib/Analysis/ScalarEvolution.cpp
-@@ -1587,6 +1587,30 @@ ScalarEvolution::getZeroExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth) {
+@@ -1599,6 +1599,30 @@ ScalarEvolution::getZeroExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth) {
    assert(!Op->getType()->isPointerTy() && "Can't extend pointer!");
    Ty = getEffectiveSCEVType(Ty);
 
@@ -189,7 +189,7 @@ index 495cd73d8eef..7c745ff07cac 100644
    // Fold if the operand is constant.
    if (const SCEVConstant *SC = dyn_cast<SCEVConstant>(Op))
      return getConstant(
-@@ -7840,6 +7864,8 @@ void ScalarEvolution::forgetAllLoops() {
+@@ -8259,6 +8283,8 @@ void ScalarEvolution::forgetAllLoops() {
    HasRecMap.clear();
    MinTrailingZerosCache.clear();
    PredicatedSCEVRewrites.clear();
@@ -198,7 +198,7 @@ index 495cd73d8eef..7c745ff07cac 100644
  }
 
  void ScalarEvolution::forgetLoop(const Loop *L) {
-@@ -13236,6 +13262,12 @@ void ScalarEvolution::forgetMemoizedResultsImpl(const SCEV *S) {
+@@ -13614,6 +13640,12 @@ void ScalarEvolution::forgetMemoizedResultsImpl(const SCEV *S) {
        forgetBackedgeTakenCounts(Pair.getPointer(), Pair.getInt());
      BECountUsers.erase(BEUsersIt);
    }
@@ -211,7 +211,7 @@ index 495cd73d8eef..7c745ff07cac 100644
  }
 
  void
-@@ -13483,6 +13515,40 @@ void ScalarEvolution::verify() const {
+@@ -13926,6 +13958,40 @@ void ScalarEvolution::verify() const {
        }
      }
    }

external/llvm/trunk/patches_external/0004-SCEV-Cache-ZExt-SCEV-expressions.patch

@@ -14,51 +14,73 @@ SPDX-License-Identifier: Apache-2.0 with LLVM-exception
 
 ============================= end_copyright_notice ===========================*/
 
-From e151e07932d68201fe228508fe776f7550150665 Mon Sep 17 00:00:00 2001
-From: Max Kazantsev <mkazantsev@azul.com>
-Date: Mon, 19 Sep 2022 17:37:17 +0700
-Subject: [PATCH 1/5] [SCEV] Verify contents of loop disposition cache
+From 85a1763970eeac7e3410ef3b12d6abb84b9324c4 Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Wed, 14 Dec 2022 11:59:19 +0000
+Subject: [PATCH 4/5] [SCEV] Cache folded SExt SCEV expressions.
 
-It seems that it is sometimes broken. Initial motivation for this was
-investigation of https://github.com/llvm/llvm-project/issues/56260, but
-it also seems that we have found an unrelated bug in LoopFusion that leaves
-broken caches.
+Use FoldID to cache SignExtendExprs that get folded to a different
+SCEV.
 
-Differential Revision: https://reviews.llvm.org/D134158
-Reviewed By: nikic
+Depends on D137505.
+
+Reviewed By: mkazantsev
+
+Differential Revision: https://reviews.llvm.org/D137849
 ---
- llvm/lib/Analysis/ScalarEvolution.cpp | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
+ llvm/include/llvm/Analysis/ScalarEvolution.h |  2 ++
+ llvm/lib/Analysis/ScalarEvolution.cpp        | 25 ++++++++++++++++++++
+ 2 files changed, 27 insertions(+)
 
+diff --git a/llvm/include/llvm/Analysis/ScalarEvolution.h b/llvm/include/llvm/Analysis/ScalarEvolution.h
+index c8f9a871a5a7..fbc393ebb271 100644
+--- a/llvm/include/llvm/Analysis/ScalarEvolution.h
++++ b/llvm/include/llvm/Analysis/ScalarEvolution.h
+@@ -565,6 +565,8 @@ public:
+   const SCEV *getZeroExtendExprImpl(const SCEV *Op, Type *Ty,
+                                     unsigned Depth = 0);
+   const SCEV *getSignExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth = 0);
++  const SCEV *getSignExtendExprImpl(const SCEV *Op, Type *Ty,
++                                    unsigned Depth = 0);
+   const SCEV *getCastExpr(SCEVTypes Kind, const SCEV *Op, Type *Ty);
+   const SCEV *getAnyExtendExpr(const SCEV *Op, Type *Ty);
+   const SCEV *getAddExpr(SmallVectorImpl<const SCEV *> &Ops,
 diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
-index 977fc0911355..1d887d4b60c9 100644
+index 847d72828570..ba49e12f958c 100644
 --- a/llvm/lib/Analysis/ScalarEvolution.cpp
 +++ b/llvm/lib/Analysis/ScalarEvolution.cpp
-@@ -13449,6 +13449,24 @@ void ScalarEvolution::verify() const {
-   };
-   VerifyBECountUsers(/* Predicated */ false);
-   VerifyBECountUsers(/* Predicated */ true);
+@@ -1925,6 +1925,31 @@ ScalarEvolution::getSignExtendExpr(const SCEV *Op, Type *Ty, unsigned Depth) {
+   assert(!Op->getType()->isPointerTy() && "Can't extend pointer!");
+   Ty = getEffectiveSCEVType(Ty);
+ 
++  FoldID ID;
++  ID.addInteger(scSignExtend);
++  ID.addPointer(Op);
++  ID.addPointer(Ty);
++  auto Iter = FoldCache.find(ID);
++  if (Iter != FoldCache.end())
++    return Iter->second;
 +
-+  // Verify intergity of loop disposition cache.
-+  for (const auto &It : LoopDispositions) {
-+    const SCEV *S = It.first;
-+    auto &Values = It.second;
-+    for (auto &V : Values) {
-+      auto CachedDisposition = V.getInt();
-+      const auto *Loop = V.getPointer();
-+      const auto RecomputedDisposition = SE2.getLoopDisposition(S, Loop);
-+      if (CachedDisposition != RecomputedDisposition) {
-+        dbgs() << "Cached disposition of " << *S << " for loop " << *Loop
-+               << " is incorrect: cached "
-+               << loopDispositionToStr(CachedDisposition) << ", actual "
-+               << loopDispositionToStr(RecomputedDisposition) << "\n";
-+        std::abort();
-+      }
-+    }
++  const SCEV *S = getSignExtendExprImpl(Op, Ty, Depth);
++  if (!isa<SCEVSignExtendExpr>(S)) {
++    FoldCache.insert({ID, S});
++    auto R = FoldCacheUser.insert({S, {}});
++    R.first->second.push_back(ID);
 +  }
- }
- 
- bool ScalarEvolution::invalidate(
++  return S;
++}
++
++const SCEV *ScalarEvolution::getSignExtendExprImpl(const SCEV *Op, Type *Ty,
++                                                   unsigned Depth) {
++  assert(getTypeSizeInBits(Op->getType()) < getTypeSizeInBits(Ty) &&
++         "This is not an extending conversion!");
++  assert(isSCEVable(Ty) && "This is not a conversion to a SCEVable type!");
++  assert(!Op->getType()->isPointerTy() && "Can't extend pointer!");
++  Ty = getEffectiveSCEVType(Ty);
++
+   // Fold if the operand is constant.
+   if (const SCEVConstant *SC = dyn_cast<SCEVConstant>(Op))
+     return getConstant(
 -- 
 2.34.1