summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2020-10-12 14:26:41 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2020-10-16 20:14:34 +0000
commit6b2ac1e98b6e3a82826f2ba8ccda5950ad6d64d5 (patch)
treefa9cf5a5e16534b9fe4a8d3e5917bef963679167
parenta805fd7d1143f2bb6cfd3b815c37a70b14222d05 (diff)
downloadarbor-6b2ac1e98b6e3a82826f2ba8ccda5950ad6d64d5.tar.gz
arbor-6b2ac1e98b6e3a82826f2ba8ccda5950ad6d64d5.tar.xz
llvm: drop 8
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-lang/llvm/files/35127d79b908caccd5311ae7f1ce018abab69f4e.patch85
-rw-r--r--packages/dev-lang/llvm/files/llvm-8.0.1-Merging-r366572.patch44
-rw-r--r--packages/dev-lang/llvm/llvm-8.0.1-r2.exheres-026
3 files changed, 0 insertions, 155 deletions
diff --git a/packages/dev-lang/llvm/files/35127d79b908caccd5311ae7f1ce018abab69f4e.patch b/packages/dev-lang/llvm/files/35127d79b908caccd5311ae7f1ce018abab69f4e.patch
deleted file mode 100644
index 2f173cbea..000000000
--- a/packages/dev-lang/llvm/files/35127d79b908caccd5311ae7f1ce018abab69f4e.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Upstream: yes
-From 35127d79b908caccd5311ae7f1ce018abab69f4e Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Sat, 12 Oct 2019 02:47:19 +0000
-Subject: [PATCH] Merging r372606:
-
-------------------------------------------------------------------------
-r372606 | spatel | 2019-09-23 06:30:23 -0700 (Mon, 23 Sep 2019) | 3 lines
-
-[x86] fix assert with horizontal math + broadcast of vector (PR43402)
-
-https://bugs.llvm.org/show_bug.cgi?id=43402
-------------------------------------------------------------------------
-
-llvm-svn: 374633
----
- llvm/lib/Target/X86/X86ISelLowering.cpp | 8 ++++----
- llvm/lib/Target/X86/X86ISelLowering.h | 3 ++-
- llvm/test/CodeGen/X86/haddsub-broadcast.ll | 20 ++++++++++++++++++++
- 3 files changed, 26 insertions(+), 5 deletions(-)
- create mode 100644 llvm/test/CodeGen/X86/haddsub-broadcast.ll
-
-diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
-index 0c5b8a79dd62..1869cc9da017 100644
---- a/llvm/lib/Target/X86/X86ISelLowering.cpp
-+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
-@@ -33651,14 +33651,14 @@ static SDValue foldShuffleOfHorizOp(SDNode *N, SelectionDAG &DAG) {
-
- // When the operands of a horizontal math op are identical, the low half of
- // the result is the same as the high half. If a target shuffle is also
-- // replicating low and high halves, we don't need the shuffle.
-+ // replicating low and high halves (and without changing the type/length of
-+ // the vector), we don't need the shuffle.
- if (Opcode == X86ISD::MOVDDUP || Opcode == X86ISD::VBROADCAST) {
-- if (HOp.getScalarValueSizeInBits() == 64) {
-+ if (HOp.getScalarValueSizeInBits() == 64 && HOp.getValueType() == VT) {
- // movddup (hadd X, X) --> hadd X, X
- // broadcast (extract_vec_elt (hadd X, X), 0) --> hadd X, X
- assert((HOp.getValueType() == MVT::v2f64 ||
-- HOp.getValueType() == MVT::v4f64) && HOp.getValueType() == VT &&
-- "Unexpected type for h-op");
-+ HOp.getValueType() == MVT::v4f64) && "Unexpected type for h-op");
- return updateHOp(HOp, DAG);
- }
- return SDValue();
-diff --git a/llvm/lib/Target/X86/X86ISelLowering.h b/llvm/lib/Target/X86/X86ISelLowering.h
-index db36bcb929e3..d873edb857a8 100644
---- a/llvm/lib/Target/X86/X86ISelLowering.h
-+++ b/llvm/lib/Target/X86/X86ISelLowering.h
-@@ -422,7 +422,8 @@ namespace llvm {
- // Tests Types Of a FP Values for scalar types.
- VFPCLASSS,
-
-- // Broadcast scalar to vector.
-+ // Broadcast (splat) scalar or element 0 of a vector. If the operand is
-+ // a vector, this node may change the vector length as part of the splat.
- VBROADCAST,
- // Broadcast mask to vector.
- VBROADCASTM,
-diff --git a/llvm/test/CodeGen/X86/haddsub-broadcast.ll b/llvm/test/CodeGen/X86/haddsub-broadcast.ll
-new file mode 100644
-index 000000000000..a37cf80ff79e
---- /dev/null
-+++ b/llvm/test/CodeGen/X86/haddsub-broadcast.ll
-@@ -0,0 +1,20 @@
-+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-+; RUN: llc < %s -mtriple=i686-- -mattr=avx2 | FileCheck %s
-+
-+; The broadcast node takes a vector operand as input and changes its length.
-+
-+define <4 x double> @PR43402(i64 %x) {
-+; CHECK-LABEL: PR43402:
-+; CHECK: # %bb.0:
-+; CHECK-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero
-+; CHECK-NEXT: vunpcklps {{.*#+}} xmm0 = xmm0[0],mem[0],xmm0[1],mem[1]
-+; CHECK-NEXT: vsubpd {{\.LCPI.*}}, %xmm0, %xmm0
-+; CHECK-NEXT: vhaddpd %xmm0, %xmm0, %xmm0
-+; CHECK-NEXT: vbroadcastsd %xmm0, %ymm0
-+; CHECK-NEXT: retl
-+ %conv = uitofp i64 %x to double
-+ %t2 = insertelement <4 x double> undef, double %conv, i32 0
-+ %t3 = shufflevector <4 x double> %t2, <4 x double> undef, <4 x i32> zeroinitializer
-+ ret <4 x double> %t3
-+}
-+
diff --git a/packages/dev-lang/llvm/files/llvm-8.0.1-Merging-r366572.patch b/packages/dev-lang/llvm/files/llvm-8.0.1-Merging-r366572.patch
deleted file mode 100644
index 8d8083fe7..000000000
--- a/packages/dev-lang/llvm/files/llvm-8.0.1-Merging-r366572.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream: yes
-Reason: Fix build with gcc10
-
-From 98b1752888c0282bf5504b67484b92d8d069f1b8 Mon Sep 17 00:00:00 2001
-From: Than McIntosh <thanm@google.com>
-Date: Fri, 19 Jul 2019 13:13:54 +0000
-Subject: [PATCH] Merging r366572:
-
-------------------------------------------------------------------------
-r366572 | thanm | 2019-07-19 06:13:54 -0700 (Fri, 19 Jul 2019) | 12 lines
-
-[NFC] include cstdint/string prior to using uint8_t/string
-
-Summary: include proper header prior to use of uint8_t typedef
-and std::string.
-
-Subscribers: llvm-commits
-
-Reviewers: cherry
-
-Tags: #llvm
-
-Differential Revision: https://reviews.llvm.org/D64937
-------------------------------------------------------------------------
----
- include/llvm/Demangle/MicrosoftDemangleNodes.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h b/include/llvm/Demangle/MicrosoftDemangleNodes.h
-index da9d9d5bfdc..3d47471f0ef 100644
---- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
-+++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
-@@ -16,6 +16,8 @@
- #include "llvm/Demangle/DemangleConfig.h"
- #include "llvm/Demangle/StringView.h"
- #include <array>
-+#include <cstdint>
-+#include <string>
-
- namespace llvm {
- namespace itanium_demangle {
---
-2.26.0
-
diff --git a/packages/dev-lang/llvm/llvm-8.0.1-r2.exheres-0 b/packages/dev-lang/llvm/llvm-8.0.1-r2.exheres-0
deleted file mode 100644
index 8611f45c0..000000000
--- a/packages/dev-lang/llvm/llvm-8.0.1-r2.exheres-0
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2012 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require llvm
-
-PLATFORMS="~amd64 ~armv7"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-fix-buildtype-test.patch
- "${FILES}"/0001-Allow-CMAKE_BUILD_TYPE-None.patch
- "${FILES}"/${PNV}-Merging-r366572.patch
-)
-
-src_prepare() {
- llvm_src_prepare
-
- edo pushd "${CMAKE_SOURCE}"
- # Doesn't pass, upstream knows about it
- # https://reviews.llvm.org/D43113
- edo rm test/BugPoint/unsymbolized.ll
-
- edo rm test/CodeGen/AArch64/wineh4.mir
-
- edo popd
-}
-