Skip to content

Commit aec361c

Browse files
AlexeySachkovAlexeySachkov
committed
Merge remote-tracking branch 'origin/sycl' into private/asachkov/generic-module-splitter
2 parents cf3a365 + aba6d85 commit aec361c

31 files changed

+1340
-2162
lines changed

‎.github/workflows/sycl_post_commit.yml

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -47,76 +47,19 @@ jobs:
4747
build_cache_suffix: gcc_no_assertions
4848
build_artifact_suffix: gcc_no_assertions
4949
build_configure_extra_args: --no-assertions
50-
linux_clang_shared_libs:
51-
# TODO use nightly images when Docker containers are available
52-
name: Linux + Clang + Shared libs
53-
runs-on: ubuntu-20.04
50+
linux_self_prod:
51+
name: Linux (Self build + shared libraries)
5452
if: github.repository == 'intel/llvm'
55-
steps:
56-
- uses: actions/checkout@v3
57-
with:
58-
path: src
59-
- name: Install Ubuntu deps
60-
run: sudo apt install -y ninja-build ccache
61-
- name: Setup Cache
62-
uses: actions/cache@v3
63-
id: cache
64-
with:
65-
path: ${{ github.workspace }}/cache
66-
key: build-linux-shared-libs-${{ github.sha }}
67-
restore-keys: |
68-
build-linux-shared-libs-
69-
- name: Configure
70-
run: |
71-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
72-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
73-
sudo apt-get update
74-
sudo apt-get install -y clang-15
75-
export CC="clang-15"
76-
export CXX="clang++-15"
77-
mkdir -p $GITHUB_WORKSPACE/build
78-
cd $GITHUB_WORKSPACE/build
79-
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
80-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
81-
--ci-defaults --shared-libs --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
82-
--cmake-opt="-DLLVM_CCACHE_DIR=$GITHUB_WORKSPACE/cache" \
83-
--cmake-opt="-DLLVM_CCACHE_MAXSIZE=2G"
84-
- name: Compile
85-
run: |
86-
python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w $GITHUB_WORKSPACE \
87-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build
88-
- name: check-llvm
89-
if: always()
90-
run: |
91-
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
92-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm
93-
- name: check-clang
94-
if: always()
95-
run: |
96-
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
97-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-clang
98-
- name: check-sycl
99-
if: always()
100-
run: |
101-
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
102-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-sycl
103-
- name: check-llvm-spirv
104-
if: always()
105-
run: |
106-
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
107-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
108-
- name: check-xptifw
109-
if: always()
110-
run: |
111-
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
112-
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
113-
- name: Pack
114-
run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
115-
- name: Upload artifacts
116-
uses: actions/upload-artifact@v3
117-
with:
118-
name: sycl_linux_${{ matrix.config }}
119-
path: llvm_sycl.tar.gz
53+
uses: ./.github/workflows/sycl_linux_build_and_test.yml
54+
with:
55+
build_cache_root: "/__w/llvm"
56+
build_cache_suffix: sprod_shared
57+
build_artifact_suffix: sprod_shared
58+
build_configure_extra_args: --shared-libs
59+
# Docker image has last nightly pre-installed and added to the PATH
60+
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers"
61+
cc: clang
62+
cxx: clang++
12063

12164
windows_default:
12265
name: Windows

‎devops/dependencies.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
2626
},
2727
"tbb": {
28-
"github_tag": "v2021.8.0",
29-
"version": "2021.8.0",
30-
"url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.8.0/oneapi-tbb-2021.8.0-lin.tgz",
28+
"github_tag": "v2021.5.0",
29+
"version": "2021.5.0",
30+
"url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0/oneapi-tbb-2021.5.0-lin.tgz",
3131
"root": "{DEPS_ROOT}/tbb/lin"
3232
},
3333
"oclcpu": {
34-
"github_tag": "2023-WW13",
35-
"version": "2023.15.3.0.20",
36-
"url": "https://github.com/intel/llvm/releases/download/2023-WW13/oclcpuexp-2023.15.3.0.20_rel.tar.gz",
34+
"github_tag": "2022-WW33",
35+
"version": "2022.14.8.0.04",
36+
"url": "https://github.com/intel/llvm/releases/download/2022-WW33/oclcpuexp-2022.14.8.0.04_rel.tar.gz",
3737
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclcpu"
3838
},
3939
"fpgaemu": {
40-
"github_tag": "2023-WW13",
41-
"version": "2023.15.3.0.20",
42-
"url": "https://github.com/intel/llvm/releases/download/2023-WW13/fpgaemu-2023.15.3.0.20_rel.tar.gz",
40+
"github_tag": "2022-WW33",
41+
"version": "2022.14.8.0.04",
42+
"url": "https://github.com/intel/llvm/releases/download/2022-WW33/fpgaemu-2022.14.8.0.04_rel.tar.gz",
4343
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclfpgaemu"
4444
},
4545
"fpga": {
@@ -53,25 +53,25 @@
5353
"root": ""
5454
},
5555
"tbb": {
56-
"github_tag": "v2021.8.0",
57-
"version": "2021.8.0",
58-
"url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.8.0/oneapi-tbb-2021.8.0-win.zip",
56+
"github_tag": "v2021.5.0",
57+
"version": "2021.5.0",
58+
"url": "https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0/oneapi-tbb-2021.5.0-win.zip",
5959
"root": "{DEPS_ROOT}/tbb/win"
6060
},
6161
"oclcpu": {
62-
"github_tag": "2023-WW13",
63-
"version": "2023.15.3.0.20",
64-
"url": "https://github.com/intel/llvm/releases/download/2023-WW13/win-oclcpuexp-2023.15.3.0.20_rel.zip",
62+
"github_tag": "2022-WW33",
63+
"version": "2022.14.8.0.04",
64+
"url": "https://github.com/intel/llvm/releases/download/2022-WW33/win-oclcpuexp-2022.14.8.0.04_rel.zip",
6565
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclcpu"
6666
},
6767
"fpgaemu": {
68-
"github_tag": "2023-WW13",
69-
"version": "2023.15.3.0.20",
70-
"url": "https://github.com/intel/llvm/releases/download/2023-WW13/win-fpgaemu-2023.15.3.0.20_rel.zip",
68+
"github_tag": "2022-WW33",
69+
"version": "2022.14.8.0.04",
70+
"url": "https://github.com/intel/llvm/releases/download/2022-WW33/win-fpgaemu-2022.14.8.0.04_rel.zip",
7171
"root": "{DEPS_ROOT}/opencl/runtime/linux/oclfpgaemu"
7272
},
7373
"fpga": {
7474
"root": "{ARCHIVE_ROOT}/comp/oclfpga/win"
7575
}
7676
}
77-
}
77+
}

‎sycl/include/CL/__spirv/spirv_ops.hpp

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,23 @@
2525
#ifdef __SYCL_DEVICE_ONLY__
2626

2727
#if (SYCL_EXT_ONEAPI_MATRIX_VERSION > 1)
28-
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
28+
extern __DPCPP_SYCL_EXTERNAL float __spirv_RoundFToTF32INTEL(float a);
29+
template <typename T, typename Tp, std::size_t R, std::size_t C,
30+
__spv::MatrixUse U,
2931
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
3032
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
31-
extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *
32-
__spirv_JointMatrixLoadINTEL(T *Ptr, std::size_t Stride,
33-
__spv::MatrixLayout Layout = L,
34-
__spv::Scope::Flag Sc = S, int MemOperand = 0);
33+
extern __DPCPP_SYCL_EXTERNAL
34+
__spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S, U> *
35+
__spirv_JointMatrixLoadINTEL(T *Ptr, std::size_t Stride,
36+
__spv::MatrixLayout Layout = L,
37+
__spv::Scope::Flag Sc = S, int MemOperand = 0);
3538

36-
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
39+
template <typename T, typename Tp, std::size_t R, std::size_t C,
40+
__spv::MatrixUse U,
3741
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
3842
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
3943
extern __DPCPP_SYCL_EXTERNAL void __spirv_JointMatrixStoreINTEL(
40-
T *Ptr, __spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *Object,
44+
T *Ptr, __spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S, U> *Object,
4145
std::size_t Stride, __spv::MatrixLayout Layout = L,
4246
__spv::Scope::Flag Sc = S, int MemOperand = 0);
4347

@@ -100,11 +104,13 @@ extern __DPCPP_SYCL_EXTERNAL
100104
__spv::__spirv_JointMatrixINTEL<T3, M, N, LC, S, UC> *C,
101105
__spv::Scope::Flag Sc = __spv::Scope::Flag::Subgroup);
102106

103-
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
107+
template <typename T, typename Tp, std::size_t R, std::size_t C,
108+
__spv::MatrixUse U,
104109
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
105110
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
106-
extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *
107-
__spirv_CompositeConstruct(const T v);
111+
extern __DPCPP_SYCL_EXTERNAL
112+
__spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S, U> *
113+
__spirv_CompositeConstruct(const T v);
108114

109115
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
110116
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
@@ -119,18 +125,20 @@ template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
119125
extern __DPCPP_SYCL_EXTERNAL size_t __spirv_JointMatrixWorkItemLengthINTEL(
120126
__spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *);
121127

122-
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
128+
template <typename Ts, typename T, std::size_t R, std::size_t C,
129+
__spv::MatrixUse U,
123130
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
124131
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
125-
extern __DPCPP_SYCL_EXTERNAL T __spirv_VectorExtractDynamic(
132+
extern __DPCPP_SYCL_EXTERNAL Ts __spirv_VectorExtractDynamic(
126133
__spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *, size_t i);
127134

128-
template <typename T, std::size_t R, std::size_t C, __spv::MatrixUse U,
135+
template <typename Ts, typename T, std::size_t R, std::size_t C,
136+
__spv::MatrixUse U,
129137
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
130138
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
131139
extern __DPCPP_SYCL_EXTERNAL __spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *
132140
__spirv_VectorInsertDynamic(__spv::__spirv_JointMatrixINTEL<T, R, C, L, S, U> *,
133-
T val, size_t i);
141+
Ts val, size_t i);
134142
#else
135143
template <typename T, std::size_t R, std::size_t C,
136144
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,

‎sycl/include/sycl/detail/pi_error.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ _PI_ERRC(PI_ERROR_INVALID_VA_API_MEDIA_ADAPTER_INTEL, -1098)
9797
_PI_ERRC(PI_ERROR_INVALID_VA_API_MEDIA_SURFACE_INTEL, -1099)
9898
_PI_ERRC(PI_ERROR_VA_API_MEDIA_SURFACE_ALREADY_ACQUIRED_INTEL, -1100)
9999
_PI_ERRC(PI_ERROR_VA_API_MEDIA_SURFACE_NOT_ACQUIRED_INTEL, -1101)
100+
// backend is lost, e.g. it was already unloaded
101+
_PI_ERRC(PI_ERROR_UNINITIALIZED, -1102)
100102

101103
// PI specific error codes
102104
// PI_ERROR_PLUGIN_SPECIFIC_ERROR indicates that an backend spcific error or

0 commit comments

Comments
 (0)