Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LLVM 16 and 17 support #1730

Merged
merged 16 commits into from
Oct 4, 2023
Merged

LLVM 16 and 17 support #1730

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f4f181e
LLVM 16 support
brechtvl Sep 8, 2023
fb004c1
Merge branch 'main' into llvm16-minimal
brechtvl Sep 17, 2023
e7f2fb3
Keep CMAKE_CXX_STANDARD warning for LLVM 16
brechtvl Sep 18, 2023
c8e684e
Enable LLVM 17 too, adjust for changes in new pass manager PR
brechtvl Sep 19, 2023
dee0540
Fix OptiX data layout mismatch with LLVM 16+
brechtvl Sep 28, 2023
f38d0d7
Work around missing OptiX intrinsic with custom fmod
brechtvl Sep 28, 2023
f3ae105
Work around OptiX parse error by shuffling code around
brechtvl Sep 28, 2023
5707966
Merge branch 'main' into llvm16-minimal
brechtvl Sep 28, 2023
86b6f4b
Modify CI to run the bleeding edge test on LLVM 16
brechtvl Sep 28, 2023
abbd0db
Fix deprecation warning
brechtvl Sep 28, 2023
87524d3
Remove redundant LLVM version check, update CI job names
brechtvl Sep 29, 2023
ad79d38
Avoid invalid global name by forcing device strings to be hashed
brechtvl Sep 29, 2023
d9fe4de
Improve comment
brechtvl Sep 29, 2023
8e97f2b
Manually make global variable names valid for PTX
brechtvl Oct 2, 2023
55cd92c
Fix build with older LLVM
brechtvl Oct 3, 2023
e7c701a
Merge branch 'main' into llvm16-minimal
brechtvl Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ jobs:
python_ver: "3.10"
simd: avx2,f16c
batched: b8_AVX2,b8_AVX512,b16_AVX512
setenvs: export LLVM_VERSION=14.0.0
setenvs: export LLVM_VERSION=15.0.6
LLVM_DISTRO_NAME=ubuntu-18.04
OPENCOLORIO_VERSION=v2.2.0
PUGIXML_VERSION=v1.13
Expand All @@ -359,8 +359,8 @@ jobs:
python_ver: "3.10"
simd: avx2,f16c
batched: b8_AVX2,b8_AVX512,b16_AVX512
setenvs: export LLVM_VERSION=15.0.6
LLVM_DISTRO_NAME=ubuntu-18.04
setenvs: export LLVM_VERSION=16.0.4
LLVM_DISTRO_NAME=ubuntu-22.04
OPENCOLORIO_VERSION=main
PUGIXML_VERSION=master
- desc: clang14/C++17 llvm14 boost1.71 exr3.1 py3.8 avx2 batch-b16avx512
Expand Down
6 changes: 4 additions & 2 deletions src/cmake/externalpackages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ checked_find_package (pugixml REQUIRED
# LLVM library setup
checked_find_package (LLVM REQUIRED
VERSION_MIN 9.0
VERSION_MAX 15.9
VERSION_MAX 17.9
PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES)
# ensure include directory is added (in case of non-standard locations
include_directories (BEFORE SYSTEM "${LLVM_INCLUDES}")
Expand Down Expand Up @@ -147,8 +147,10 @@ if (LLVM_VERSION VERSION_GREATER_EQUAL 15.0
"If you are using LLVM 15 or higher, you should also use clang version "
"15 or higher, or you may get build errors.${ColorReset}\n")
endif ()
if (LLVM_VERSION VERSION_GREATER_EQUAL 18.0)
message (ERROR "${ColorYellow}OSL is not yet compatible with LLVM 18.${ColorReset}\n")
endif ()
if (LLVM_VERSION VERSION_GREATER_EQUAL 16.0)
message (ERROR "${ColorYellow}OSL is not yet compatible with LLVM 16.${ColorReset}\n")
if (CMAKE_CXX_STANDARD VERSION_LESS 17)
message (WARNING "${ColorYellow}LLVM 16+ requires C++17 or higher. "
"Please set CMAKE_CXX_STANDARD to 17 or higher.${ColorReset}\n")
Expand Down
5 changes: 3 additions & 2 deletions src/cmake/modules/FindLLVM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@ if (LLVM_VERSION VERSION_GREATER_EQUAL 9.0 AND (LLVM_SHARED_MODE STREQUAL "share
endif ()

foreach (COMPONENT clangFrontend clangDriver clangSerialization
clangParse clangSema clangAnalysis clangAST clangBasic
clangEdit clangLex clangSupport)
clangParse clangSema clangAnalysis clangAST
clangASTMatchers clangBasic clangEdit clangLex
clangSupport)
find_library ( _CLANG_${COMPONENT}_LIBRARY
NAMES ${COMPONENT}
PATHS ${LLVM_LIB_DIR})
Expand Down
8 changes: 4 additions & 4 deletions src/liboslexec/llvm_instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ BackendLLVM::run()
// The target triple and data layout used here are those specified
// for NVPTX (https://www.llvm.org/docs/NVPTXUsage.html#triples).
ll.module()->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
ll.module()->setTargetTriple("nvptx64-nvidia-cuda");
}
# endif
Expand Down Expand Up @@ -1816,7 +1816,7 @@ BackendLLVM::run()
err);

shadeops_module->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
shadeops_module->setTargetTriple("nvptx64-nvidia-cuda");

std::unique_ptr<llvm::Module> shadeops_ptr(shadeops_module);
Expand All @@ -1843,7 +1843,7 @@ BackendLLVM::run()
err);

rend_lib_module->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
rend_lib_module->setTargetTriple("nvptx64-nvidia-cuda");

for (llvm::Function& fn : *rend_lib_module) {
Expand All @@ -1863,7 +1863,7 @@ BackendLLVM::run()
// See: https://llvm.org/docs/NVPTXUsage.html
ll.module()->setTargetTriple("nvptx64-nvidia-cuda");
ll.module()->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");

// Tag each function as an OSL library function to help with
// inlining and optimization after codegen.
Expand Down
Loading