diff --git a/scripts/build-igc-llvm7.sh b/scripts/build-igc-llvm7.sh index 8a9e806184..00933df685 100755 --- a/scripts/build-igc-llvm7.sh +++ b/scripts/build-igc-llvm7.sh @@ -10,7 +10,7 @@ cd /root/build-igc export cclang_commit_id=6257ffe137a2c8df95a3f3b39fa477aa8ed15837 export spirv_id=8ce6443ec1020183eafaeb3410c7d1edc2355dc3 -export igc_commit_id=igc-1.0.6 +export igc_commit_id=igc-1.0.8 wget --no-check-certificate https://github.com/intel/opencl-clang/archive/${cclang_commit_id}/opencl-clang.tar.gz wget --no-check-certificate https://github.com/intel/intel-graphics-compiler/archive/${igc_commit_id}/igc.tar.gz @@ -20,6 +20,8 @@ mkdir igc common_clang llvm-spirv tar xzf opencl-clang.tar.gz -C common_clang --strip-components=1 tar xzf igc.tar.gz -C igc --strip-components=1 +patch -p1 < /root/llvm7.patch + tar xzf spirv-llvm-translator.tar.gz -C llvm-spirv --strip-components=1 mkdir build_spirv diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-llvm-7 b/scripts/docker/Dockerfile-ubuntu-18.04-llvm-7 index abe0c8b801..0e88ceea11 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-llvm-7 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-llvm-7 @@ -3,6 +3,7 @@ MAINTAINER Jacek Danecki COPY neo /root/neo COPY scripts/build-igc-llvm7.sh /root +COPY scripts/igc/llvm7.patch /root 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; \ echo "deb http://ppa.launchpad.net/ocl-dev/intel-opencl/ubuntu bionic main" >> /etc/apt/sources.list; \ diff --git a/scripts/igc/llvm7.patch b/scripts/igc/llvm7.patch new file mode 100644 index 0000000000..8ca561ae43 --- /dev/null +++ b/scripts/igc/llvm7.patch @@ -0,0 +1,11 @@ +--- a/igc/IGC/BiFModule/CMakeLists.txt ++++ b/igc/IGC/BiFModule/CMakeLists.txt +@@ -866,7 +866,7 @@ endif(${VME_TYPES_DEFINED}) + + igc_bif_find_cl_files(IGC_BUILD__BIF_OCL_COMMON_DEPENDS ${IGC_BUILD__BIF_OCL_COMMON_INC_DIRS} "${IGC_OPTION__BIF_SRC_OCL_DIR}/Implementation") + +-set(KHR_DEFINES "cl_khr_f16" "cl_khrfp64" "cl_khr_gl_msaa_sharing" "cl_khr_mipmap_image" "cl_khr_depth_images" "cl_intel_subgroups_short" "cl_intel_subgroups_char" "cl_intel_subgroups_long" "cl_intel_64bit_global_atomics_placeholder") ++set(KHR_DEFINES "cl_khr_f16" "cl_khrfp64" "cl_khr_gl_msaa_sharing" "cl_khr_mipmap_image" "cl_khr_depth_images" "cl_intel_subgroups_short" "cl_intel_subgroups_char" "cl_intel_subgroups_long" "cl_intel_64bit_global_atomics_placeholder" "cl_intel_device_side_avc_motion_estimation") + + igc_bif_build_bc( + OUTPUT "${IGC_BUILD__BIF_DIR}/IBiF_Impl_int.bc"