Date: Monday, October 12, 2020 @ 17:14:56 Author: foutrelis Revision: 723688
Remove obsolete patch Modified: ldc/trunk/PKGBUILD Deleted: ldc/trunk/fix-llvm_prefetch-for-LLVM-10.patch -------------------------------------+ PKGBUILD | 6 +-- fix-llvm_prefetch-for-LLVM-10.patch | 55 ---------------------------------- 2 files changed, 3 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-12 17:13:56 UTC (rev 723687) +++ PKGBUILD 2020-10-12 17:14:56 UTC (rev 723688) @@ -7,7 +7,7 @@ pkgver=1.23.0 _pkgcommit=a83dc56ad5a6ba87023756c05b54b5824053da96 _dversion=2.093.1 -_clangversion=10.0.1 # related to where ldc2 looks for compiler-rt sanitizers +_clangversion=11.0.0 # related to where ldc2 looks for compiler-rt sanitizers epoch=2 pkgrel=2 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" @@ -14,7 +14,7 @@ arch=('x86_64') url="https://github.com/ldc-developers/ldc" license=('BSD') -makedepends=('git' 'cmake' 'llvm10' 'ldc') +makedepends=('git' 'cmake' 'llvm' 'ldc') source=( "git+https://github.com/ldc-developers/ldc#commit=$_pkgcommit" @@ -66,7 +66,7 @@ } package_ldc() { - depends=('liblphobos' 'llvm10-libs' 'gcc' 'compiler-rt') + depends=('liblphobos' 'llvm-libs' 'gcc' 'compiler-rt') backup=('etc/ldc2.conf') provides=("d-compiler=$_dversion") Deleted: fix-llvm_prefetch-for-LLVM-10.patch =================================================================== --- fix-llvm_prefetch-for-LLVM-10.patch 2020-10-12 17:13:56 UTC (rev 723687) +++ fix-llvm_prefetch-for-LLVM-10.patch 2020-10-12 17:14:56 UTC (rev 723688) @@ -1,55 +0,0 @@ -diff --git a/src/core/simd.d b/src/core/simd.d -index c27dc4c1..7641c8a9 100644 ---- a/src/core/simd.d -+++ b/src/core/simd.d -@@ -84,6 +84,20 @@ version (LDC) - enum dataCache = 1; - llvm_prefetch(address, writeFetch, locality, dataCache); - } -+ -+ unittest -+ { -+ float[4] data = [ 0.5, 1, 1.5, 2 ]; -+ auto ptr = &data[0]; -+ -+ prefetch!(false, 0)(ptr); -+ auto v = loadUnaligned!float4(ptr); -+ v *= 2; -+ storeUnaligned!float4(v, ptr); -+ -+ float[4] expected = [ 1, 2, 3, 4 ]; -+ assert(data == expected); -+ } - } - else version (D_SIMD) - { -diff --git a/src/ldc/intrinsics.di b/src/ldc/intrinsics.di -index 914cd5e1..091b2aac 100644 ---- a/src/ldc/intrinsics.di -+++ b/src/ldc/intrinsics.di -@@ -129,6 +129,14 @@ pragma(LDC_intrinsic, "llvm.stacksave") - pragma(LDC_intrinsic, "llvm.stackrestore") - void llvm_stackrestore(void* ptr); - -+version(INTRINSICS_FROM_1000) -+{ -+ private enum llvm_prefetch_fullname = "llvm.prefetch.p0i8"; -+} -+else -+{ -+ private enum llvm_prefetch_fullname = "llvm.prefetch"; -+} - /// The 'llvm.prefetch' intrinsic is a hint to the code generator to insert a - /// prefetch instruction if supported; otherwise, it is a noop. Prefetches have - /// no effect on the behavior of the program but can change its performance -@@ -139,8 +147,8 @@ pragma(LDC_intrinsic, "llvm.stackrestore") - /// keep in cache. The cache type specifies whether the prefetch is performed on - /// the data (1) or instruction (0) cache. The rw, locality and cache type - /// arguments must be constant integers. --pragma(LDC_intrinsic, "llvm.prefetch") -- void llvm_prefetch(void* ptr, uint rw, uint locality, uint cachetype) pure @safe; -+pragma(LDC_intrinsic, llvm_prefetch_fullname) -+ void llvm_prefetch(const(void)* ptr, uint rw, uint locality, uint cachetype) pure @safe; - - /// The 'llvm.pcmarker' intrinsic is a method to export a Program Counter (PC) - /// in a region of code to simulators and other tools. The method is target