Skip to content

Commit

Permalink
add SVML patch for LLVM 14
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed May 2, 2023
1 parent cc208b6 commit 2bf3e26
Show file tree
Hide file tree
Showing 5 changed files with 504 additions and 380 deletions.
7 changes: 3 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ source:
url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz
sha256: 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a
patches:
# - patches/intel-D47188-svml-VF.patch # Fixes vectorizer and extends SVML support
# - patches/expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch # adjusts test added in 10.0.0 for intel-D47188-svml-VF.patch effects
# - patches/amd-roc-2.7.0.diff
- patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch
- patches/no-windows-symlinks.patch
- patches/0002-Always-copy-on-windows.patch
- patches/0003-Fixes-vectorizer-and-extends-SVML-support.patch

build:
number: 1
number: 2
merge_build_host: false

requirements:
Expand Down
9 changes: 3 additions & 6 deletions recipe/patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 629cea6a21aefda147f674d86a9d9ba550be4e18 Mon Sep 17 00:00:00 2001
From e1ad26b0a967a41b000373af7c25b5ab62b87d4d Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Tue, 4 Aug 2020 21:06:30 -0500
Subject: [PATCH] pass through QEMU_LD_PREFIX & SDKROOT
Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT

---
llvm/utils/lit/lit/TestingConfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/utils/lit/lit/TestingConfig.py b/llvm/utils/lit/lit/TestingConfig.py
index e80369377857..44f5794ed96b 100644
index e803693778..44f5794ed9 100644
--- a/llvm/utils/lit/lit/TestingConfig.py
+++ b/llvm/utils/lit/lit/TestingConfig.py
@@ -21,7 +21,7 @@ class TestingConfig(object):
Expand All @@ -20,6 +20,3 @@ index e80369377857..44f5794ed96b 100644
'CLANG', 'LLDB', 'LD_PRELOAD', 'ASAN_OPTIONS',
'UBSAN_OPTIONS', 'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL',
'SSH_AUTH_SOCK', 'SANITIZER_IGNORE_CVE_2016_2143',
--
2.35.3.windows.1

Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
commit 0d6f97c00e78ed4369bd9a642c22cedeaba5fb11
Author: Isuru Fernando <[email protected]>
Date: Tue Nov 8 13:34:20 2022 -0600
From 3369987c6c4d085692e9a8de8df3e689ba0b453a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Tue, 8 Nov 2022 13:34:20 -0600
Subject: [PATCH 2/3] Always copy on windows

Always copy on windows

The conda package build machine may have permissions to
create symlinks, but conda doesn't handle symlinks on windows
properly
The conda package build machine may have permissions to
create symlinks, but conda doesn't handle symlinks on windows
properly
---
llvm/cmake/modules/LLVMInstallSymlink.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake
index b5c35f706cb7..d63260a62730 100644
index b5c35f706c..d63260a627 100644
--- a/llvm/cmake/modules/LLVMInstallSymlink.cmake
+++ b/llvm/cmake/modules/LLVMInstallSymlink.cmake
@@ -10,10 +10,11 @@ function(install_symlink name target outdir)
Expand Down
Loading

0 comments on commit 2bf3e26

Please sign in to comment.