12.0.1 Release

Also remove llvm11 compat package.

Related: rhbz#1931726
This commit is contained in:
Tom Stellard 2021-07-12 15:09:34 -07:00
parent 46cd2c3ef2
commit 476354d782
4 changed files with 11 additions and 73 deletions

2
.gitignore vendored
View File

@ -102,3 +102,5 @@
/llvm-12.0.0rc5.src.tar.xz.sig
/llvm-12.0.0.src.tar.xz
/llvm-12.0.0.src.tar.xz.sig
/llvm-12.0.1.src.tar.xz
/llvm-12.0.1.src.tar.xz.sig

View File

@ -1,67 +0,0 @@
From f78f530bd38472f6bd058a0307484fc5edc57b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
Date: Thu, 10 Jun 2021 06:48:09 +0200
Subject: [PATCH] [llvm][PPC] Add missing case for 'I' asm memory operands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From https://llvm.org/docs/LangRef.html#asm-template-argument-modifiers:
I: Print the letter i if the operand is an integer constant,
otherwise nothing. Used to print addi vs add instructions.
Differential Revision: https://reviews.llvm.org/D103968
(cherry picked from commit a9e4f91adf59bbc72541b96dd30245eaeeedf3ce)
---
llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 6 ++++++
llvm/test/CodeGen/PowerPC/asm-template-I.ll | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 llvm/test/CodeGen/PowerPC/asm-template-I.ll
diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index cce21f32414a..6257709731b9 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -321,6 +321,12 @@ bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
O << "0, ";
printOperand(MI, OpNo, O);
return false;
+ case 'I':
+ // Write 'i' if an integer constant, otherwise nothing. Used to print
+ // addi vs add, etc.
+ if (MI->getOperand(OpNo).isImm())
+ O << "i";
+ return false;
case 'U': // Print 'u' for update form.
case 'X': // Print 'x' for indexed form.
// FIXME: Currently for PowerPC memory operands are always loaded
diff --git a/llvm/test/CodeGen/PowerPC/asm-template-I.ll b/llvm/test/CodeGen/PowerPC/asm-template-I.ll
new file mode 100644
index 000000000000..f77e6900efc0
--- /dev/null
+++ b/llvm/test/CodeGen/PowerPC/asm-template-I.ll
@@ -0,0 +1,19 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -verify-machineinstrs < %s -mtriple=powerpc64le-- | FileCheck %s
+; https://bugs.llvm.org/show_bug.cgi?id=50608
+
+define dso_local signext i32 @main(i32 signext %argc, i8** %argv) {
+; CHECK-LABEL: main:
+; CHECK: # %bb.0: # %entry
+; CHECK-NEXT: stw 3, -4(1)
+; CHECK-NEXT: li 3, 0
+; CHECK-NEXT: addi 4, 1, -4
+; CHECK-NEXT: #APP
+; CHECK-NEXT: .ascii "-1@0(4)"
+; CHECK-NEXT: .byte 0
+; CHECK-NEXT: #NO_APP
+; CHECK-NEXT: blr
+entry:
+ call void asm sideeffect " .asciz \22${0:n}@${1:I}$1\22 ", "n,nZr"(i32 1, i32 %argc)
+ ret i32 0
+}
--
2.27.0

View File

@ -8,7 +8,7 @@
%bcond_with compat_build
%bcond_without bundle_compat_lib
%bcond_with bundle_compat_lib
%if %{with bundle_compat_lib}
%global compat_maj_ver 11
@ -21,7 +21,7 @@
%global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
%global maj_ver 12
%global min_ver 0
%global patch_ver 0
%global patch_ver 1
%if %{with compat_build}
%global pkg_name llvm%{maj_ver}
@ -53,7 +53,7 @@
Name: %{pkg_name}
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
Release: 6%{?dist}
Release: 1%{?dist}
Summary: The Low Level Virtual Machine
License: NCSA
@ -599,6 +599,10 @@ fi
%endif
%changelog
* Mon Jul 12 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1
- 12.0.1 Release
- Remove llvm11 compat package
* Wed Jul 07 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-6
- Fix DTRACE_PROBE4() compilation failure

View File

@ -1,3 +1,2 @@
SHA512 (llvm-12.0.0.src.tar.xz) = ec17153ef774a1e08085763bda7d0dfce6802fbaa17e89831695ce1b2eb015a6c2aebfaa9fe7985a83b9c51bd75d40bb4f1fc706dc16d4c0dc2b2722a1d8a24e
SHA512 (llvm-12.0.0.src.tar.xz.sig) = c8d55589e86a29a6c19a8adecb54ce0e7b3398fb9d2263ecba9ac02be88a160915b88c3f9f595d6cb807c82f1ed7648dd5c90c334407f624aacfb02386e7014c
SHA512 (llvm-11.1.0rc2.src.tar.xz) = 4293bedabfacc3de5384b5567eb69d4ae19095540c31cf1f46b8e841db36b28215353aace2e55ccc15a069a63ba2954b2c969ad6337bebaa8877248a2dca024b
SHA512 (llvm-12.0.1.src.tar.xz) = ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f
SHA512 (llvm-12.0.1.src.tar.xz.sig) = 4c2904e13f1a51b624eed8f74fbf132ae1289f8e17d59b46bda78cd896a904f2bb53642fda7cef543905f17c3c9e2a65d5f97cd270b0182281518036d0fe1595