Skip to content

Commit 4369c97

Browse files
mnaczkigcbot
mnaczk
authored and
igcbot
committed
Upgrade github Action build IGC
- Add IGC build by gcc with LLVM 12 on Ubuntu20.04 - Add IGC build by gcc with LLVM 12 on Ubuntu22.04 - Add IGC build by gcc with LLVM 13 on Ubuntu22.04 - Add IGC build by clang with LLVM 12 on Ubuntu20.04 - Remove IGC build by clang with LLVM 10 on Ubuntu18.04 - Remove IGC build by clang with LLVM 11 on Ubuntu18.04 - Fix build IGC with LLVM 12 with prebuild by change in cmake - Fix build IGC on Ubuntu 22.04 by adding missing include
1 parent 63498f3 commit 4369c97

File tree

6 files changed

+47
-18
lines changed

6 files changed

+47
-18
lines changed

‎.github/workflows/build-IGC.yml‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,17 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
ubuntu_version: [ 18, 20 ]
48+
ubuntu_version: [ '18.04', '20.04']
4949
llvm_ver: [ 10, 11 ]
50+
include:
51+
- ubuntu_version: '20.04'
52+
llvm_ver: 12
53+
- ubuntu_version: '22.04'
54+
llvm_ver: 12
55+
experimental: true
56+
- ubuntu_version: '22.04'
57+
llvm_ver: 13
58+
experimental: true
5059
steps:
5160
- uses: actions/checkout@v2
5261
- name: cloning SPIRV-LLVM-Translator repository
@@ -72,7 +81,7 @@ jobs:
7281
--env DEBIAN_FRONTEND="noninteractive" \
7382
--env UBUNTU_VERSION=${{ matrix.ubuntu_version }} \
7483
--env LLVM_VERSION=${{ matrix.llvm_ver }} \
75-
ubuntu:${{ matrix.ubuntu_version }}.04 \
84+
ubuntu:${{ matrix.ubuntu_version }} \
7685
sh /buildSLT.sh
7786
- name: creating folders to store SPIRV-LLVM-Translator build outputs
7887
if: steps.cache-spirv-llvm-translator.outputs.cache-hit != 'true'
@@ -91,9 +100,27 @@ jobs:
91100
strategy:
92101
fail-fast: false
93102
matrix:
94-
ubuntu_version: [ 18, 20 ]
103+
ubuntu_version: [ '18.04', '20.04' ]
95104
llvm_ver: [ 10, 11 ]
96105
compiler: [ gcc, clang ]
106+
exclude:
107+
- ubuntu_version: '18.04'
108+
compiler: clang
109+
include:
110+
- ubuntu_version: '20.04'
111+
llvm_ver: 12
112+
compiler: gcc
113+
- ubuntu_version: '20.04'
114+
llvm_ver: 12
115+
compiler: clang
116+
- ubuntu_version: '22.04'
117+
llvm_ver: 12
118+
compiler: gcc
119+
experimental: true
120+
- ubuntu_version: '22.04'
121+
llvm_ver: 13
122+
compiler: gcc
123+
experimental: true
97124
steps:
98125
- uses: actions/checkout@v2
99126

@@ -140,7 +167,7 @@ jobs:
140167
--env UBUNTU_VERSION=${{ matrix.ubuntu_version }} \
141168
--env LLVM_VERSION=${{ matrix.llvm_ver }} \
142169
--env COMPILER=${{ matrix.compiler }} \
143-
ubuntu:${{ matrix.ubuntu_version }}.04 \
170+
ubuntu:${{ matrix.ubuntu_version }} \
144171
sh /buildIGC.sh
145172
- name: creating folder to store output artifacts
146173
run: mkdir Artifacts

‎external/llvm/llvm_deps.cmake‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ include(llvm_spirv_source_hook)
4444
# LLD source hook.
4545
if(IGC_OPTION__LLVM_LLD)
4646
include(llvm_lld_source_hook)
47-
if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
48-
# Need to copy one header from unwind package for LLD (only for building from sources)
49-
file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
50-
file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
51-
DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
52-
endif()
5347
endif()
5448

5549
# Process LLVM.

‎external/llvm/llvm_lld_source_hook.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,12 @@ if(NOT EXISTS "${IGC_COPIED_LLD_DIR}")
4747
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${IGC_OPTION__lld_SOURCES_DIR} ${IGC_COPIED_LLD_DIR})
4848
endif()
4949

50+
if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
51+
# Need to copy one header from unwind package for LLD (only for building from sources)
52+
file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
53+
file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
54+
DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
55+
endif()
56+
5057
# Just register lld as external llvm project.
5158
register_llvm_external_project(lld ${IGC_COPIED_LLD_DIR})

‎scripts/buildIGC.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo "====================BUILD IGC========================="
1919
echo "[Build Status] build script started"
2020
if [ -z ${UBUNTU_VERSION+x} ]; then
2121
echo "[Build Status] UBUNTU_VERSION is unset, use default 20";
22-
UBUNTU_VERSION="20"
22+
UBUNTU_VERSION="20.04"
2323
else
2424
echo "[Build Status] UBUNTU_VERSION = ${UBUNTU_VERSION}"
2525
fi
@@ -44,10 +44,10 @@ fi
4444

4545

4646
apt-get update
47-
apt-get install -y flex bison libz-dev cmake curl wget build-essential git software-properties-common unzip
48-
echo "[Build Status] flex bison libz-dev cmake curl wget build-essential git software-properties-common INSTALLED"
47+
apt-get install -y flex bison libz-dev cmake curl wget build-essential git software-properties-common unzip file
48+
echo "[Build Status] flex bison libz-dev cmake curl wget build-essential git software-properties-common unzip file INSTALLED"
4949

50-
if [ "$UBUNTU_VERSION" = "18" ]; then
50+
if [ "$UBUNTU_VERSION" = "18.04" ]; then
5151
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add -
5252
apt-add-repository "deb https://apt.kitware.com/ubuntu/ bionic main"
5353
apt update
@@ -61,7 +61,7 @@ fi
6161
apt-get install -y llvm-"$LLVM_VERSION" llvm-"$LLVM_VERSION"-dev clang-"$LLVM_VERSION" liblld-"$LLVM_VERSION" liblld-"$LLVM_VERSION"-dev
6262
echo "[Build Status] LLVM INSTALLED"
6363

64-
if [ "$UBUNTU_VERSION" = "18" ] && [ "$LLVM_VERSION" = "11" ]; then
64+
if [ "$UBUNTU_VERSION" = "18.04" ] && [ "$LLVM_VERSION" = "11" ]; then
6565
LLVM_VERSION_PREFERRED="$LLVM_VERSION".1.0
6666
else
6767
LLVM_VERSION_PREFERRED="$LLVM_VERSION".0.0

‎scripts/buildSLT.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ echo "====================BUILD SPIRV-LLVM-Translator========================="
1818
echo "[Build Status] build script started"
1919
if [ -z ${UBUNTU_VERSION+x} ]; then
2020
echo "[Build Status] UBUNTU_VERSION is unset, use default 20";
21-
UBUNTU_VERSION="20"
21+
UBUNTU_VERSION="20.04"
2222
else
2323
echo "[Build Status] UBUNTU_VERSION = ${UBUNTU_VERSION}"
2424
fi
@@ -33,7 +33,7 @@ apt-get update
3333
apt-get install -y flex bison libz-dev cmake curl wget build-essential git software-properties-common unzip
3434
echo "[Build Status] flex bison libz-dev cmake curl wget build-essential git software-properties-common INSTALLED"
3535

36-
if [ "$UBUNTU_VERSION" = "18" ]; then
36+
if [ "$UBUNTU_VERSION" = "18.04" ]; then
3737
wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
3838
add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$LLVM_VERSION main"
3939
apt update
@@ -42,7 +42,7 @@ fi
4242
apt-get install -y llvm-"$LLVM_VERSION" llvm-"$LLVM_VERSION"-dev clang-"$LLVM_VERSION" liblld-"$LLVM_VERSION" liblld-"$LLVM_VERSION"-dev
4343
echo "[Build Status] LLVM INSTALLED"
4444

45-
if [ "$UBUNTU_VERSION" = "18" ] && [ "$LLVM_VERSION" = "11" ]; then
45+
if [ "$UBUNTU_VERSION" = "18.04" ] && [ "$LLVM_VERSION" = "11" ]; then
4646
LLVM_VERSION_PREFERRED="$LLVM_VERSION".1.0
4747
else
4848
LLVM_VERSION_PREFERRED="$LLVM_VERSION".0.0

‎visa/iga/IGALibrary/IR/SWSBSetter.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ SPDX-License-Identifier: MIT
1515
#include "Operand.hpp"
1616
#include "../ErrorHandler.hpp"
1717
#include "RegDeps.hpp"
18+
#include <limits>
1819

1920
namespace iga
2021
{

0 commit comments

Comments
 (0)