Skip to content
This repository has been archived by the owner on May 9, 2024. It is now read-only.

Commit

Permalink
Update to LLVM 16
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbaden committed Oct 10, 2023
1 parent a366e64 commit 5e4573f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
12 changes: 6 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ RUN apt-get update && apt-get install -y \
# LLVM
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository \
'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' && \
'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main' && \
apt-get update && apt-get install -y \
llvm-15 \
llvm-15-dev \
clang-15 \
libclang-15-dev \
llvm-16 \
llvm-16-dev \
clang-16 \
libclang-16-dev \
--

ENV PATH=/usr/lib/llvm-15/bin${PATH:+:${PATH}}
ENV PATH=/usr/lib/llvm-16/bin${PATH:+:${PATH}}

# Dependencies
RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.l0
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN mkdir /intel-gpu-drivers && cd /intel-gpu-drivers && \

RUN cd /intel-gpu-drivers && dpkg -i *.deb

RUN git clone -b llvm_release_150 https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git && \
RUN git clone -b llvm_release_160 https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git && \
mkdir SPIRV-LLVM-Translator/build && cd SPIRV-LLVM-Translator/build && \
cmake -Wno-dev .. && make llvm-spirv -j`nproc` && make install

5 changes: 4 additions & 1 deletion omniscidb/QueryEngine/Compiler/HelperFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ namespace compiler {
std::string mangle_spirv_builtin(const llvm::Function& func) {
CHECK(func.getName().startswith("__spirv_")) << func.getName().str();
std::string new_name;
#if LLVM_VERSION_MAJOR > 14
#if LLVM_VERSION_MAJOR > 15
llvm::mangleOpenClBuiltin(func.getName().str(), func.getArg(0)->getType(), new_name);

#elif LLVM_VERSION_MAJOR > 14
mangleOpenClBuiltin(
func.getName().str(), func.getArg(0)->getType(), /*pointer_types=*/{}, new_name);
#else
Expand Down
4 changes: 3 additions & 1 deletion omniscidb/Tests/L0MgrExecuteTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ std::unique_ptr<llvm::Module> read_gen_module_from_bc(const std::string& bc_file
std::string mangle_spirv_builtin(const llvm::Function& func) {
CHECK(func.getName().startswith("__spirv_"));
std::string new_name;
#if LLVM_VERSION_MAJOR > 14
#if LLVM_VERSION_MAJOR > 15
llvm::mangleOpenClBuiltin(func.getName().str(), func.getArg(0)->getType(), new_name);
#elif LLVM_VERSION_MAJOR > 14
mangleOpenClBuiltin(
func.getName().str(), func.getArg(0)->getType(), /*pointer_types=*/{}, new_name);
#else
Expand Down
8 changes: 4 additions & 4 deletions omniscidb/scripts/mapd-deps-conda-dev-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- arrow-cpp 11.0
- pyarrow 11.0
- pandas 1.5.3
- llvmdev 15.*
- llvmdev 16.*
- openjdk 20.*
- cmake
- tbb-devel
Expand All @@ -29,7 +29,7 @@ dependencies:
- fmt
- maven
- boost-cpp
- clangdev 15.*
- clangdev 16.*
- llvm
- double-conversion
- snappy
Expand All @@ -45,8 +45,8 @@ dependencies:
# when cuda is enabled, install also
# - arrow-cpp=11.0=*cuda
- binutils
- llvm-spirv 15.0.*
- libllvmspirv 15.0.*
- llvm-spirv 16.0.*
- libllvmspirv 16.0.*
- folly 2022.11.07.00
- sqlite 3.40.0
- python 3.9.*
Expand Down

0 comments on commit 5e4573f

Please sign in to comment.