parent
26f02f62c3
commit
f009a3b7e9
46
D156379.diff
Normal file
46
D156379.diff
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
diff --git a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp
|
||||||
|
--- a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp
|
||||||
|
+++ b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp
|
||||||
|
@@ -1152,6 +1152,11 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Type legalization (via getNumberOfParts) can't handle structs
|
||||||
|
+ if (TLI->getValueType(DL, Src, true) == MVT::Other)
|
||||||
|
+ return BaseT::getMemoryOpCost(Opcode, Src, Alignment, AddressSpace,
|
||||||
|
+ CostKind);
|
||||||
|
+
|
||||||
|
unsigned NumOps =
|
||||||
|
(Src->isVectorTy() ? getNumVectorRegs(Src) : getNumberOfParts(Src));
|
||||||
|
|
||||||
|
diff --git a/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll
|
||||||
|
new file mode 100644
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll
|
||||||
|
@@ -0,0 +1,25 @@
|
||||||
|
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 2
|
||||||
|
+; RUN: opt -passes="print<cost-model>" 2>&1 -disable-output < %s | FileCheck %s
|
||||||
|
+;
|
||||||
|
+; Check that SystemZTTIImpl::getMemoryOpCost doesn't try to legalize structs,
|
||||||
|
+; which was failing llvm_unreachable in MVT::getVT.
|
||||||
|
+
|
||||||
|
+target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64"
|
||||||
|
+target triple = "s390x-unknown-linux-gnu"
|
||||||
|
+
|
||||||
|
+declare { i64, i32 } @bar()
|
||||||
|
+
|
||||||
|
+define i8 @foo() {
|
||||||
|
+; CHECK-LABEL: 'foo'
|
||||||
|
+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1
|
||||||
|
+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: %2 = call { i64, i32 } @bar()
|
||||||
|
+; CHECK-NEXT: Cost Model: Found an estimated cost of 4 for instruction: store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16
|
||||||
|
+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1
|
||||||
|
+;
|
||||||
|
+ br label %1
|
||||||
|
+
|
||||||
|
+1: ; preds = %1, %0
|
||||||
|
+ %2 = call { i64, i32 } @bar()
|
||||||
|
+ store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16
|
||||||
|
+ br label %1
|
||||||
|
+}
|
||||||
|
|
@ -81,7 +81,7 @@ ver:rc%{rc_ver}}.src
|
|||||||
|
|
||||||
Name: %{pkg_name}
|
Name: %{pkg_name}
|
||||||
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: The Low Level Virtual Machine
|
Summary: The Low Level Virtual Machine
|
||||||
|
|
||||||
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
||||||
@ -103,6 +103,9 @@ Source8: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat
|
|||||||
Patch1: 0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch
|
Patch1: 0001-SystemZ-Improve-error-messages-for-unsupported-reloc.patch
|
||||||
# See https://reviews.llvm.org/D137890 for the next two patches
|
# See https://reviews.llvm.org/D137890 for the next two patches
|
||||||
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
|
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
|
||||||
|
# Backport of https://reviews.llvm.org/D156379 from LLVM 18.
|
||||||
|
Patch3: D156379.diff
|
||||||
|
|
||||||
# Patching third-party dir with a 200 offset in patch number
|
# Patching third-party dir with a 200 offset in patch number
|
||||||
Patch201: 0201-third-party-Add-install-targets-for-gtest.patch
|
Patch201: 0201-third-party-Add-install-targets-for-gtest.patch
|
||||||
|
|
||||||
@ -648,6 +651,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 03 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.6-3
|
||||||
|
- Fix rhbz #2226795
|
||||||
|
|
||||||
* Tue Aug 01 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-2
|
* Tue Aug 01 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-2
|
||||||
- Fix CET support
|
- Fix CET support
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user