Skip to content

Commit 49ad839

Browse files
ci: use IGC from manifest
Signed-off-by: Jacek Danecki <jacek.danecki@intel.com> #238 Change-Id: I57316456cbea47bbea19a353475280c0b22baca3
1 parent 32d1869 commit 49ad839

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

scripts/build-igc-llvm7.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
# SPDX-License-Identifier: MIT
66
#
77

8+
set -x
9+
10+
IGC=($(grep -B 1 intelgraphicscompiler manifest.yml))
11+
812
mkdir /root/build-igc
913
cd /root/build-igc
1014

15+
1116
export cclang_commit_id=6257ffe137a2c8df95a3f3b39fa477aa8ed15837
1217
export spirv_id=8ce6443ec1020183eafaeb3410c7d1edc2355dc3
13-
export igc_commit_id=8234eab514161d6a45ff04ed6418840f4e959942
18+
export igc_commit_id=${IGC[1]}
1419

1520
wget --no-check-certificate https://github.com/intel/opencl-clang/archive/${cclang_commit_id}/opencl-clang.tar.gz
1621
wget --no-check-certificate https://github.com/intel/intel-graphics-compiler/archive/${igc_commit_id}/igc.tar.gz

scripts/build-igc-llvm8.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
# SPDX-License-Identifier: MIT
66
#
77

8+
set -x
9+
10+
IGC=($(grep -B 1 intelgraphicscompiler manifest.yml))
11+
812
mkdir /root/build-igc
913
cd /root/build-igc
1014

15+
1116
export cclang_commit_id=41cad395859684b18e762ca4a2c713c2fa349622
1217
export spirv_id=83298e3c9b124486c16d0fde54c764a6c5a2b554
13-
export igc_commit_id=8234eab514161d6a45ff04ed6418840f4e959942
18+
export igc_commit_id=${IGC[1]}
1419

1520
wget --no-check-certificate https://github.com/intel/opencl-clang/archive/${cclang_commit_id}/opencl-clang.tar.gz
1621
wget --no-check-certificate https://github.com/intel/intel-graphics-compiler/archive/${igc_commit_id}/igc.tar.gz

scripts/docker/Dockerfile-ubuntu-18.04-llvm-7

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ MAINTAINER Jacek Danecki <jacek.danecki@intel.com>
44
COPY neo /root/neo
55
COPY scripts/build-igc-llvm7.sh /root
66
COPY scripts/igc/llvm7.patch /root
7+
COPY manifests/manifest.yml /root
78

89
RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg cmake git pkg-config ninja-build clang-7 wget llvm-7-dev libclang-7-dev bison python2.7 flex python procps; \
910
echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \
1011
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \
1112
apt-get -y update ; apt-get install -y --allow-unauthenticated intel-gmmlib-dev
12-
RUN /root/build-igc-llvm7.sh
13+
RUN cd /root; ./build-igc-llvm7.sh
1314
RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \
1415
-DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 \
1516
-DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc`

scripts/docker/Dockerfile-ubuntu-18.04-llvm-8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ MAINTAINER Jacek Danecki <jacek.danecki@intel.com>
33

44
COPY neo /root/neo
55
COPY scripts/build-igc-llvm8.sh /root
6+
COPY manifests/manifest.yml /root
67

78
RUN apt-get -y update ; apt-get install -y --allow-unauthenticated gpg cmake git pkg-config ninja-build clang-8 wget llvm-8-dev libclang-8-dev bison python2.7 flex python procps dos2unix; \
89
echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \
910
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C3086B78CC05B8B1; \
1011
apt-get -y update ; apt-get install -y --allow-unauthenticated intel-gmmlib-dev
11-
RUN /root/build-igc-llvm8.sh
12+
RUN cd /root; ./build-igc-llvm8.sh
1213
RUN mkdir /root/build; cd /root/build ; cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \
1314
-DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 \
1415
-DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo ; ninja -j `nproc`

0 commit comments

Comments
 (0)