Date: Tuesday, February 2, 2021 @ 23:59:47 Author: foutrelis Revision: 841876
archrelease: copy trunk to multilib-x86_64 Added: lib32-llvm/repos/multilib-x86_64/PKGBUILD (from rev 841875, lib32-llvm/trunk/PKGBUILD) lib32-llvm/repos/multilib-x86_64/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch (from rev 841875, lib32-llvm/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch) Deleted: lib32-llvm/repos/multilib-x86_64/PKGBUILD ----------------------------------------------------------+ PKGBUILD | 208 ++++++------- amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch | 85 +++++ 2 files changed, 192 insertions(+), 101 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-02-02 23:59:41 UTC (rev 841875) +++ PKGBUILD 2021-02-02 23:59:47 UTC (rev 841876) @@ -1,101 +0,0 @@ -# Maintainer: Laurent Carlier <lordhea...@gmail.com> -# Contributor: Evangelos Foutras <foutre...@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> - -pkgname=('lib32-llvm' 'lib32-llvm-libs') -pkgver=11.0.1 -pkgrel=1 -arch=('x86_64') -url="https://llvm.org/" -license=('custom:Apache 2.0 with LLVM Exception') -makedepends=('cmake' 'ninja' 'lib32-libffi' 'lib32-zlib' 'python' 'gcc-multilib' - 'lib32-libxml2') -options=('staticlibs') -_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver -source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig}) -sha256sums=('ccd87c254b6aebc5077e4e6977d08d4be888e7eb672c6630a26a15d58b59b528' - 'SKIP') -validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> -validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> - -prepare() { - cd "$srcdir/llvm-$pkgver.src" - mkdir build -} - -build() { - cd "$srcdir/llvm-$pkgver.src/build" - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cmake .. -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_LIBDIR_SUFFIX=32 \ - -DCMAKE_C_FLAGS:STRING=-m32 \ - -DCMAKE_CXX_FLAGS:STRING=-m32 \ - -DLLVM_TARGET_ARCH:STRING=i686 \ - -DLLVM_HOST_TRIPLE=$CHOST \ - -DLLVM_DEFAULT_TARGETS_TRIPLE="i686-pc-linux-gnu" \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_FFI=ON \ - -DLLVM_BUILD_DOCS=OFF \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DLLVM_BINUTILS_INCDIR=/usr/include - - ninja all -} - -package_lib32-llvm() { - pkgdesc="Collection of modular and reusable compiler and toolchain technologies (32-bit)" - depends=('lib32-llvm-libs' 'llvm') - - cd "$srcdir/llvm-$pkgver.src/build" - - DESTDIR="$pkgdir" ninja install - - # The runtime library goes into lib32-llvm-libs - mv "$pkgdir"/usr/lib32/lib{LLVM,LTO,Remarks}*.so* "$srcdir" - mv -f "$pkgdir"/usr/lib32/LLVMgold.so "$srcdir" - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib32/*.a - - mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" - mv "$pkgdir/usr/include/llvm/Config/llvm-config.h" \ - "$pkgdir/usr/lib32/llvm-config-32.h" - - rm -rf "$pkgdir"/usr/{bin,include,share/{doc,man,llvm,opt-viewer}} - - # Needed for multilib (https://bugs.archlinux.org/task/29951) - # Header stub is taken from Fedora - install -d "$pkgdir/usr/include/llvm/Config" - mv "$pkgdir/usr/lib32/llvm-config-32.h" "$pkgdir/usr/include/llvm/Config/" - - mkdir "$pkgdir"/usr/bin - mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" - - install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_lib32-llvm-libs() { - pkgdesc="Low Level Virtual Machine (runtime library)(32-bit) " - depends=('lib32-libffi' 'lib32-zlib' 'lib32-ncurses' 'lib32-libxml2' 'lib32-gcc-libs') - - install -d "$pkgdir/usr/lib32" - - cp -P \ - "$srcdir"/lib{LLVM,LTO,Remarks}*.so* \ - "$srcdir"/LLVMgold.so \ - "$pkgdir/usr/lib32/" - - # Symlink LLVMgold.so from /usr/lib/bfd-plugins - # https://bugs.archlinux.org/task/28479 - install -d "$pkgdir/usr/lib32/bfd-plugins" - ln -s ../LLVMgold.so "$pkgdir/usr/lib32/bfd-plugins/LLVMgold.so" - - install -Dm644 llvm-$pkgver.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: lib32-llvm/repos/multilib-x86_64/PKGBUILD (from rev 841875, lib32-llvm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-02-02 23:59:47 UTC (rev 841876) @@ -0,0 +1,107 @@ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Evangelos Foutras <foutre...@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> + +pkgname=('lib32-llvm' 'lib32-llvm-libs') +pkgver=11.0.1 +pkgrel=2 +arch=('x86_64') +url="https://llvm.org/" +license=('custom:Apache 2.0 with LLVM Exception') +makedepends=('cmake' 'ninja' 'lib32-libffi' 'lib32-zlib' 'python' 'gcc-multilib' + 'lib32-libxml2') +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=('ccd87c254b6aebc5077e4e6977d08d4be888e7eb672c6630a26a15d58b59b528' + 'SKIP' + '85b6977005899bc76fcc548e0b6501cae5f50a8ad03060b9f58d03d775323327') +validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> +validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> + +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" + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cmake .. -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_LIBDIR_SUFFIX=32 \ + -DCMAKE_C_FLAGS:STRING=-m32 \ + -DCMAKE_CXX_FLAGS:STRING=-m32 \ + -DLLVM_TARGET_ARCH:STRING=i686 \ + -DLLVM_HOST_TRIPLE=$CHOST \ + -DLLVM_DEFAULT_TARGETS_TRIPLE="i686-pc-linux-gnu" \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_DOCS=OFF \ + -DLLVM_ENABLE_SPHINX=OFF \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DLLVM_BINUTILS_INCDIR=/usr/include + + ninja all +} + +package_lib32-llvm() { + pkgdesc="Collection of modular and reusable compiler and toolchain technologies (32-bit)" + depends=('lib32-llvm-libs' 'llvm') + + cd "$srcdir/llvm-$pkgver.src/build" + + DESTDIR="$pkgdir" ninja install + + # The runtime library goes into lib32-llvm-libs + mv "$pkgdir"/usr/lib32/lib{LLVM,LTO,Remarks}*.so* "$srcdir" + mv -f "$pkgdir"/usr/lib32/LLVMgold.so "$srcdir" + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib32/*.a + + mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" + mv "$pkgdir/usr/include/llvm/Config/llvm-config.h" \ + "$pkgdir/usr/lib32/llvm-config-32.h" + + rm -rf "$pkgdir"/usr/{bin,include,share/{doc,man,llvm,opt-viewer}} + + # Needed for multilib (https://bugs.archlinux.org/task/29951) + # Header stub is taken from Fedora + install -d "$pkgdir/usr/include/llvm/Config" + mv "$pkgdir/usr/lib32/llvm-config-32.h" "$pkgdir/usr/include/llvm/Config/" + + mkdir "$pkgdir"/usr/bin + mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" + + install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lib32-llvm-libs() { + pkgdesc="Low Level Virtual Machine (runtime library)(32-bit) " + depends=('lib32-libffi' 'lib32-zlib' 'lib32-ncurses' 'lib32-libxml2' 'lib32-gcc-libs') + + install -d "$pkgdir/usr/lib32" + + cp -P \ + "$srcdir"/lib{LLVM,LTO,Remarks}*.so* \ + "$srcdir"/LLVMgold.so \ + "$pkgdir/usr/lib32/" + + # Symlink LLVMgold.so from /usr/lib/bfd-plugins + # https://bugs.archlinux.org/task/28479 + install -d "$pkgdir/usr/lib32/bfd-plugins" + ln -s ../LLVMgold.so "$pkgdir/usr/lib32/bfd-plugins/LLVMgold.so" + + install -Dm644 llvm-$pkgver.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: lib32-llvm/repos/multilib-x86_64/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch (from rev 841875, lib32-llvm/trunk/amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch) =================================================================== --- amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch (rev 0) +++ amdgpu-avoid-an-illegal-operand-in-si-shrink-instr.patch 2021-02-02 23:59:47 UTC (rev 841876) @@ -0,0 +1,85 @@ +commit b08a140a8fe8d0b0d16a93042b4952d6e34ab913 +Author: Piotr Sobczak <piotr.sobc...@amd.com> +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 ++ ++...