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

Commit e28494c

Browse files
committed
Update to LLVM 16
1 parent 19acac0 commit e28494c

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ RUN apt-get update && apt-get install -y \
3131
# LLVM
3232
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
3333
apt-add-repository \
34-
'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' && \
34+
'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main' && \
3535
apt-get update && apt-get install -y \
36-
llvm-15 \
37-
llvm-15-dev \
38-
clang-15 \
39-
libclang-15-dev \
36+
llvm-16 \
37+
llvm-16-dev \
38+
clang-16 \
39+
libclang-16-dev \
4040
--
4141

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

4444
# Dependencies
4545
RUN apt-get update && apt-get install -y \

docker/Dockerfile.l0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN mkdir /intel-gpu-drivers && cd /intel-gpu-drivers && \
1212

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

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

omniscidb/QueryEngine/Compiler/HelperFunctions.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ namespace compiler {
5555
std::string mangle_spirv_builtin(const llvm::Function& func) {
5656
CHECK(func.getName().startswith("__spirv_")) << func.getName().str();
5757
std::string new_name;
58-
#if LLVM_VERSION_MAJOR > 14
58+
#if LLVM_VERSION_MAJOR > 15
59+
llvm::mangleOpenClBuiltin(func.getName().str(), func.getArg(0)->getType(), new_name);
60+
61+
#elif LLVM_VERSION_MAJOR > 14
5962
mangleOpenClBuiltin(
6063
func.getName().str(), func.getArg(0)->getType(), /*pointer_types=*/{}, new_name);
6164
#else

omniscidb/Tests/L0MgrExecuteTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ std::unique_ptr<llvm::Module> read_gen_module_from_bc(const std::string& bc_file
156156
std::string mangle_spirv_builtin(const llvm::Function& func) {
157157
CHECK(func.getName().startswith("__spirv_"));
158158
std::string new_name;
159-
#if LLVM_VERSION_MAJOR > 14
159+
#if LLVM_VERSION_MAJOR > 15
160+
llvm::mangleOpenClBuiltin(func.getName().str(), func.getArg(0)->getType(), new_name);
161+
#elif LLVM_VERSION_MAJOR > 14
160162
mangleOpenClBuiltin(
161163
func.getName().str(), func.getArg(0)->getType(), /*pointer_types=*/{}, new_name);
162164
#else

omniscidb/scripts/mapd-deps-conda-dev-env.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- arrow-cpp 11.0
2121
- pyarrow 11.0
2222
- pandas 1.5.3
23-
- llvmdev 15.*
23+
- llvmdev 16.*
2424
- openjdk 20.*
2525
- cmake
2626
- tbb-devel
@@ -29,7 +29,7 @@ dependencies:
2929
- fmt
3030
- maven
3131
- boost-cpp
32-
- clangdev 15.*
32+
- clangdev 16.*
3333
- llvm
3434
- double-conversion
3535
- snappy
@@ -45,8 +45,8 @@ dependencies:
4545
# when cuda is enabled, install also
4646
# - arrow-cpp=11.0=*cuda
4747
- binutils
48-
- llvm-spirv 15.0.*
49-
- libllvmspirv 15.0.*
48+
- llvm-spirv 16.0.*
49+
- libllvmspirv 16.0.*
5050
- folly 2022.11.07.00
5151
- sqlite 3.40.0
5252
- python 3.9.*

0 commit comments

Comments
 (0)