Date: Thursday, May 27, 2021 @ 05:03:42 Author: foutrelis Revision: 416514
Add llvm10 for bootstrapping the rust/ldc rebuilds Added: llvm11/ llvm11/repos/ llvm11/trunk/ llvm11/trunk/PKGBUILD llvm11/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch ----------------------------------------------------------+ PKGBUILD | 86 +++++++++++++ amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch | 85 ++++++++++++ 2 files changed, 171 insertions(+) Added: llvm11/trunk/PKGBUILD =================================================================== --- llvm11/trunk/PKGBUILD (rev 0) +++ llvm11/trunk/PKGBUILD 2021-05-27 05:03:42 UTC (rev 416514) @@ -0,0 +1,86 @@ +# Maintainer: Evangelos Foutras <[email protected]> +# Contributor: Jan "heftig" Steffens <[email protected]> + +pkgname=('llvm11' 'llvm11-libs') +pkgver=11.1.0 +pkgrel=1 +arch=('x86_64') +url="https://llvm.org/"; +license=('custom:Apache 2.0 with LLVM Exception') +makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' + 'python-setuptools') +options=('staticlibs') +_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver +source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig} + amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch) +sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3' + 'SKIP') +validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <[email protected]> +validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <[email protected]> + +prepare() { + cd "$srcdir/llvm-$pkgver.src" + mkdir build + + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4107 + # https://bugs.llvm.org/show_bug.cgi?id=48921#c2 + patch -Np2 -i ../amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch +} + +build() { + cd "$srcdir/llvm-$pkgver.src/build" + + cmake .. -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_HOST_TRIPLE=$CHOST \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_INSTALL_UTILS=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_BINUTILS_INCDIR=/usr/include + ninja +} + +check() { + cd "$srcdir/llvm-$pkgver.src/build" + ninja check +} + +package_llvm11() { + pkgdesc="Collection of modular and reusable compiler and toolchain technologies" + depends=('llvm11-libs' 'perl') + conflicts=('llvm') + + cd "$srcdir/llvm-$pkgver.src/build" + + DESTDIR="$pkgdir" ninja install + + # Include lit for running lit-based tests in other projects + pushd ../utils/lit + python3 setup.py install --root="$pkgdir" -O1 + popd + + # The runtime libraries go into llvm11-libs + mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$srcdir" + + # Remove files which conflict with llvm-libs + rm "$pkgdir"/usr/lib/{LLVMgold,lib{LLVM,LTO,Remarks}}.so + + install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm11-libs() { + pkgdesc="LLVM 11 runtime libraries" + depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2') + + install -d "$pkgdir/usr/lib" + cp -P "$srcdir"/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$pkgdir/usr/lib/" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Added: llvm11/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch =================================================================== --- llvm11/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch (rev 0) +++ llvm11/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch 2021-05-27 05:03:42 UTC (rev 416514) @@ -0,0 +1,85 @@ +commit b08a140a8fe8d0b0d16a93042b4952d6e34ab913 +Author: Piotr Sobczak <[email protected]> +Date: Wed Jan 27 16:02:49 2021 +0100 + + [AMDGPU] Avoid an illegal operand in si-shrink-instructions + + Before the patch it was possible to trigger a constant bus + violation when folding immediates into a shrunk instruction. + + The patch adds a check to enforce the legality of the new operand. + + Differential Revision: https://reviews.llvm.org/D95527 + +diff --git a/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp b/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp +index 9c6833a7dab6..6c1b16eddc84 100644 +--- a/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp ++++ b/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp +@@ -84,21 +84,23 @@ static bool foldImmediates(MachineInstr &MI, const SIInstrInfo *TII, + MachineOperand &MovSrc = Def->getOperand(1); + bool ConstantFolded = false; + +- if (MovSrc.isImm() && (isInt<32>(MovSrc.getImm()) || +- isUInt<32>(MovSrc.getImm()))) { +- // It's possible to have only one component of a super-reg defined by +- // a single mov, so we need to clear any subregister flag. +- Src0.setSubReg(0); +- Src0.ChangeToImmediate(MovSrc.getImm()); +- ConstantFolded = true; +- } else if (MovSrc.isFI()) { +- Src0.setSubReg(0); +- Src0.ChangeToFrameIndex(MovSrc.getIndex()); +- ConstantFolded = true; +- } else if (MovSrc.isGlobal()) { +- Src0.ChangeToGA(MovSrc.getGlobal(), MovSrc.getOffset(), +- MovSrc.getTargetFlags()); +- ConstantFolded = true; ++ if (TII->isOperandLegal(MI, Src0Idx, &MovSrc)) { ++ if (MovSrc.isImm() && ++ (isInt<32>(MovSrc.getImm()) || isUInt<32>(MovSrc.getImm()))) { ++ // It's possible to have only one component of a super-reg defined ++ // by a single mov, so we need to clear any subregister flag. ++ Src0.setSubReg(0); ++ Src0.ChangeToImmediate(MovSrc.getImm()); ++ ConstantFolded = true; ++ } else if (MovSrc.isFI()) { ++ Src0.setSubReg(0); ++ Src0.ChangeToFrameIndex(MovSrc.getIndex()); ++ ConstantFolded = true; ++ } else if (MovSrc.isGlobal()) { ++ Src0.ChangeToGA(MovSrc.getGlobal(), MovSrc.getOffset(), ++ MovSrc.getTargetFlags()); ++ ConstantFolded = true; ++ } + } + + if (ConstantFolded) { +diff --git a/llvm/test/CodeGen/AMDGPU/shrink-instructions-illegal-fold.mir b/llvm/test/CodeGen/AMDGPU/shrink-instructions-illegal-fold.mir +new file mode 100644 +index 000000000000..7889f437facf +--- /dev/null ++++ b/llvm/test/CodeGen/AMDGPU/shrink-instructions-illegal-fold.mir +@@ -0,0 +1,23 @@ ++# RUN: llc -march=amdgcn -mcpu=gfx900 -run-pass=si-shrink-instructions --verify-machineinstrs %s -o - | FileCheck %s ++ ++# Make sure immediate folding into V_CNDMASK respects constant bus restrictions. ++--- ++ ++name: shrink_cndmask_illegal_imm_folding ++tracksRegLiveness: true ++body: | ++ bb.0: ++ liveins: $vgpr0, $vgpr1 ++ ; CHECK-LABEL: name: shrink_cndmask_illegal_imm_folding ++ ; CHECK: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0 ++ ; CHECK: [[MOV:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 32768, implicit $exec ++ ; CHECK: V_CMP_EQ_U32_e32 0, [[COPY]], implicit-def $vcc, implicit $exec ++ ; CHECK: V_CNDMASK_B32_e32 [[MOV]], killed [[COPY]], implicit $vcc, implicit $exec ++ ++ %0:vgpr_32 = COPY $vgpr0 ++ %1:vgpr_32 = V_MOV_B32_e32 32768, implicit $exec ++ V_CMP_EQ_U32_e32 0, %0:vgpr_32, implicit-def $vcc, implicit $exec ++ %2:vgpr_32 = V_CNDMASK_B32_e64 0, %1:vgpr_32, 0, killed %0:vgpr_32, $vcc, implicit $exec ++ S_NOP 0 ++ ++...
