Skip to content

Commit

Permalink
Revert "Update LLVM version from 13 to 14 (KhronosGroup#1134)"
Browse files Browse the repository at this point in the history
This reverts commit 85a9394.
  • Loading branch information
AlexeySotkin committed Aug 20, 2021
1 parent 168cb23 commit b4d1c1c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:
# We need compile command database in order to perform clang-tidy check. So,
# in order to perform configure step we need to setup llvm-dev package. This
# env variable used to specify desired version of it
LLVM_VERSION: 14
LLVM_VERSION: 13

jobs:
clang-format-and-tidy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-in-tree-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
- cron: 0 0 * * *

env:
LLVM_VERSION: 14
LLVM_VERSION: 13

jobs:
build_and_test_linux:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-out-of-tree-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
- cron: 0 0 * * *

env:
LLVM_VERSION: 14
LLVM_VERSION: 13

jobs:
build_and_test:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ compiler:
env:
global:
- MAKEFLAGS="-j2"
- LLVM_VERSION=14
- LLVM_VERSION=13
matrix:
- BUILD_TYPE=Release BUILD_EXTERNAL=1 SHARED_LIBS=ON MAKE_TARGETS="" MAKE_TEST_TARGET="test"
- BUILD_TYPE=Debug BUILD_EXTERNAL=1 SHARED_LIBS=ON MAKE_TARGETS="" MAKE_TEST_TARGET="test"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.13.4)

set (BASE_LLVM_VERSION 14.0.0)
set (BASE_LLVM_VERSION 13.0.0)
set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)

include(FetchContent)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The translator can be built with the latest(nightly) package of LLVM. For Ubuntu
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main"
sudo apt-get update
sudo apt-get install llvm-14-dev llvm-14-tools clang-14 libclang-14-dev
sudo apt-get install llvm-13-dev llvm-13-tools clang-13 libclang-13-dev
```
The installed version of LLVM will be used by default for out-of-tree build of the translator.
```
Expand Down Expand Up @@ -125,7 +125,7 @@ make test
```
This requires that the `-DLLVM_SPIRV_INCLUDE_TESTS=ON` argument is
passed to CMake during the build step. Additionally,
`-DLLVM_EXTERNAL_LIT="/usr/lib/llvm-14/build/utils/lit/lit.py"` is
`-DLLVM_EXTERNAL_LIT="/usr/lib/llvm-13/build/utils/lit/lit.py"` is
needed when building with a pre-installed version of LLVM.

The translator test suite can be disabled by passing
Expand Down

0 comments on commit b4d1c1c

Please sign in to comment.