8000 Halide fixes (#7) · awakecoding/llvm-prebuilt@61830ce · GitHub
[go: up one dir, main page]
Skip to content

Commit 61830ce

Browse files
awakecodingMarc-André Moreau
awakecoding
and
Marc-André Moreau
authored
Halide fixes (#7)
* update config * add patch for lld-headers target * switch to initial cache * try and fix cmake generation * more fixes * more stuff * syntax stuff * fix cmake install prefix Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
1 parent 8460286 commit 61830ce

9 files changed

+74
-11
lines changed

‎.github/workflows/llvm-prebuilt.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ jobs:
7575
ref: ${{matrix.branch}}
7676
path: llvm-project
7777

78+
- name: Patch LLVM
79+
run: |
80+
git -C llvm-project apply ../llvm-prebuilt/patches/0001-add-lld-headers-target.patch
81+
7882
- name: Enable Windows host environment
7983
if: runner.os == 'Windows'
8084
uses: ilammy/msvc-dev-cmd@v1
@@ -97,22 +101,20 @@ jobs:
97101
echo "CLANG_TABLEGEN=$HostBinPath/clang-tblgen$ExeExt" >> $Env:GITHUB_ENV
98102
echo "LLVM_CONFIG_PATH=$HostBinPath/llvm-config$ExeExt" >> $Env:GITHUB_ENV
99103
100-
- name: Set CMake environment
101-
shell: pwsh
102-
run: |
103-
$ToolchainPath = "$Env:GITHUB_WORKSPACE/llvm-prebuilt/toolchains"
104-
$ToolchainName = "${{matrix.arch}}-${{matrix.os}}"
105-
echo "CMAKE_TOOLCHAIN_FILE=$ToolchainPath/$ToolchainName.cmake" >> $Env:GITHUB_ENV
106-
echo "CMAKE_INSTALL_PREFIX=$Env:GITHUB_WORKSPACE/llvm-install" >> $Env:GITHUB_ENV
107-
108104
- name: Enable Windows target environment
109105
if: runner.os == 'Windows'
110106
uses: ilammy/msvc-dev-cmd@v1
111107
with:
112108
arch: ${{matrix.msvc}}
113109

114110
- name: Configure LLVM
115-
run: "cmake -G Ninja -S llvm-project/llvm -B llvm-build -Wno-dev"
111+
shell: pwsh
112+
run: |
113+
$TargetName = "${{matrix.arch}}-${{matrix.os}}"
114+
$CMakeCache = "$Env:GITHUB_WORKSPACE/llvm-prebuilt/cmake/$TargetName.cmake"
115+
cmake -G Ninja -S llvm-project/llvm -B llvm-build `
116+
-DCMAKE_INSTALL_PREFIX=llvm-install `
117+
-C $CMakeCache -Wno-dev
116118
117119
- name: Build LLVM
118120
run: cmake --build llvm-build

‎toolchains/aarch64-linux.cmake renamed to ‎cmake/aarch64-linux.cmake

File renamed without changes.

‎toolchains/aarch64-macos.cmake renamed to ‎cmake/aarch64-macos.cmake

File renamed without changes.

‎toolchains/aarch64-windows.cmake renamed to ‎cmake/aarch64-windows.cmake

File renamed without changes.

‎toolchains/llvm-distribution.cmake renamed to ‎cmake/llvm-distribution.cmake

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,31 @@ if(DEFINED ENV{LLVM_CONFIG_PATH})
1818
message(STATUS "LLVM_CONFIG_PATH: ${LLVM_CONFIG_PATH}")
1919
endif()
2020

21+
if(CMAKE_INSTALL_PREFIX)
22+
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
23+
endif()
24+
2125
set(PACKAGE_VENDOR "awakecoding" CACHE STRING "")
2226

23-
set(LLVM_TARGETS_TO_BUILD "X86;ARM;AArch64;Mips;PowerPC;RISCV;WebAssembly" CACHE STRING "")
27+
set(LLVM_TARGETS_TO_BUILD
28+
"X86"
29+
"ARM"
30+
"AArch64"
31+
"Mips"
32+
"PowerPC"
33+
"RISCV"
34+
"NVPTX"
35+
"Hexagon"
36+
"WebAssembly"
37+
CACHE STRING "")
38+
39+
set(LLVM_ENABLE_PROJECTS
40+
"clang"
41+
"clang-tools-extra"
42+
"llvm"
43+
"lld"
44+
CACHE STRING "")
2445

25-
set(LLVM_ENABLE_PROJECTS "clang;clang-tools-extra;llvm;lld" CACHE STRING "")
2646
set(LLVM_ENABLE_RUNTIMES "" CACHE STRING "")
2747

2848
set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
@@ -74,6 +94,7 @@ set(LLVM_BINUTILS_COMPONENTS
7494

7595
set(LLVM_TOOLCHAIN_TOOLS
7696
dsymutil
97+
llvm-as
7798
llvm-cat
7899
llvm-cov
79100
llvm-config
@@ -83,6 +104,7 @@ set(LLVM_TOOLCHAIN_TOOLS
83104
llvm-ifs
84105
llvm-gsymutil
85106
llvm-lib
107+
57AE llvm-link
86108
llvm-mt
87109
llvm-pdbutil
88110
llvm-profdata
@@ -102,6 +124,9 @@ set(LLVM_DEVELOPMENT_COMPONENTS
102124
clang-libraries
103125
clang-cmake-exports
104126
clang-resource-headers
127+
libclang-headers
128+
lld-headers # requires patch
129+
lld-cmake-exports
105130
CACHE STRING "")
106131

107132
set(LLVM_DISTRIBUTION_COMPONENTS

‎toolchains/x86_64-linux.cmake renamed to ‎cmake/x86_64-linux.cmake

File renamed without changes.

‎toolchains/x86_64-macos.cmake renamed to ‎cmake/x86_64-macos.cmake

File renamed without changes.

‎toolchains/x86_64-windows.cmake renamed to ‎cmake/x86_64-windows.cmake

File renamed without changes.

‎patches/0001-add-lld-headers-target.patch

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 65610409f3a55c9f9793fab44d76088e589ffbb3 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <mamoreau@devolutions.net>
3+
Date: Wed, 8 Sep 2021 08:49:13 -0400
4+
Subject: [PATCH] add lld-headers target
5+
6+
---
7+
lld/CMakeLists.txt | 10 ++++++++++
8+
1 file changed, 10 insertions(+)
9+
10+
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
11+
index 2e99564f4..2d02b0cb5 100644
12+
--- a/lld/CMakeLists.txt
13+
+++ b/lld/CMakeLists.txt
14+
@@ -189,9 +189,19 @@ include_directories(BEFORE
15+
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
16+
install(DIRECTORY include/
17+
DESTINATION include
18+
+ COMPONENT lld-headers
19+
FILES_MATCHING
20+
PATTERN "*.h"
21+
)
22+
+
23+
+ add_custom_target(lld-headers)
24+
+ set_target_properties(lld-headers PROPERTIES FOLDER "Misc")
25+
+
26+
+ if(NOT LLVM_ENABLE_IDE)
27+
+ add_llvm_install_targets(install-lld-headers
28+
+ DEPENDS lld-headers
29+
+ COMPONENT lld-headers)
30+
+ endif()
31+
endif()
32+
33+
add_subdirectory(Common)
34+
--
35+
2.25.1
36+

0 commit comments

Comments
 (0)
0