Skip to content

Commit e51dc57

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web'
2 parents fd993c8 + f295e78 commit e51dc57

File tree

5 files changed

+31
-25
lines changed

5 files changed

+31
-25
lines changed

‎buildbot/dependency.conf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ ocl_gpu_rt_ver=21.02.18820
1010
# https://downloadmirror.intel.com/30066/a08/igfx_win10_100.9030.zip
1111
ocl_gpu_rt_ver_win=27.20.100.9030
1212
intel_sycl_ver=build
13-
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.1-beta10/oneapi-tbb-2021.1-beta10-lin.tgz
14-
tbb_ver=2021.1.053
15-
# Binaries can be built from sources following instructions under:
13+
14+
# TBB binaries can be built from sources following instructions under
1615
# https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md
16+
# or downloaded using links below:
17+
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.1.1/oneapi-tbb-2021.1.1-lin.tgz
18+
tbb_ver=2021.1.053
19+
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.1.1/oneapi-tbb-2021.1.1-win.zip
1720
tbb_ver_win=2021.1.049
21+
1822
# https://github.com/intel/llvm/releases/download/2020-WW45/fpgaemu-2020.11.11.0.04_rel.tar.gz
1923
ocl_fpga_emu_ver=2020.11.11.0.04
2024
# https://github.com/intel/llvm/releases/download/2020-WW45/win-fpgaemu-2020.11.11.0.04_rel.zip

‎clang/test/SemaSYCL/sycl-device-intel-max-work-group-size-template.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int main() {
3838
// CHECK: ClassTemplateDecl {{.*}} {{.*}} KernelFunctor
3939
// CHECK: ClassTemplateSpecializationDecl {{.*}} {{.*}} class KernelFunctor definition
4040
// CHECK: CXXRecordDecl {{.*}} {{.*}} implicit class KernelFunctor
41-
// SYCLIntelMaxWorkGroupSizeAttr {{.*}}
41+
// CHECK: SYCLIntelMaxWorkGroupSizeAttr {{.*}}
4242
// CHECK: SubstNonTypeTemplateParmExpr {{.*}}
4343
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}}
4444
// CHECK-NEXT: IntegerLiteral{{.*}}4{{$}}
@@ -49,7 +49,7 @@ int main() {
4949
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}}
5050
// CHECK-NEXT: IntegerLiteral{{.*}}4{{$}}
5151

52-
// Test that checks template parameter suppport on function.
52+
// Test that checks template parameter support on function.
5353
template <int N, int N1, int N2>
5454
[[intel::max_work_group_size(N, N1, N2)]] void func3() {}
5555

@@ -61,7 +61,7 @@ int check() {
6161
// CHECK: FunctionTemplateDecl {{.*}} {{.*}} func3
6262
// CHECK: NonTypeTemplateParmDecl {{.*}} {{.*}} referenced 'int' depth 0 index 0 N
6363
// CHECK: FunctionDecl {{.*}} {{.*}} func3 'void ()'
64-
// SYCLIntelMaxWorkGroupSizeAttr {{.*}}
64+
// CHECK: SYCLIntelMaxWorkGroupSizeAttr {{.*}}
6565
// CHECK: SubstNonTypeTemplateParmExpr {{.*}}
6666
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}}
6767
// CHECK-NEXT: IntegerLiteral{{.*}}8{{$}}

‎clang/test/SemaSYCL/sycl-device-intel-reqd-work-group-size-template.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int main() {
4949
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}}
5050
// CHECK-NEXT: IntegerLiteral{{.*}}1{{$}}
5151

52-
// Test that checks template parameter suppport on function.
52+
// Test that checks template parameter support on function.
5353
template <int N, int N1, int N2>
5454
[[intel::reqd_work_group_size(N, N1, N2)]] void func3() {}
5555

‎clang/test/SemaSYCL/sycl-device-reqd-work-group-size-template.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int main() {
4949
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}}
5050
// CHECK-NEXT: IntegerLiteral{{.*}}1{{$}}
5151

52-
// Test that checks template parameter suppport on function.
52+
// Test that checks template parameter support on function.
5353
template <int N, int N1, int N2>
5454
[[cl::reqd_work_group_size(N, N1, N2)]] void func3() {}
5555

‎sycl/doc/GetStartedGuide.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -207,35 +207,37 @@ run the following commands
207207
/etc/OpenCL/vendors/intel_expcpu.icd
208208
```
209209

210-
3) Extract TBB libraries. For example, for the archive tbb-<tbb_version>-lin.tgz
210+
3) Extract or build TBB libraries using links in
211+
[the dependency configuration file](../../buildbot/dependency.conf). For example,
212+
for the archive oneapi-tbb-<tbb_version>-lin.tgz:
211213

212214
```bash
213-
mkdir -p /opt/intel/tbb_<tbb_version>
214-
cd /opt/intel/tbb_<tbb_version>
215-
tar -zxvf tbb*lin.tgz
215+
mkdir -p /opt/intel
216+
cd /opt/intel
217+
tar -zxvf oneapi-tbb*lin.tgz
216218
```
217219

218220
4) Copy files from or create symbolic links to TBB libraries in OpenCL RT
219221
folder:
220222

221223
```bash
222224
# OpenCL FPGA emulation RT
223-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbb.so
225+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbb.so
224226
/opt/intel/oclfpgaemu_<fpga_version>/x64
225-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbbmalloc.so
227+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbbmalloc.so
226228
/opt/intel/oclfpgaemu_<fpga_version>/x64
227-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbb.so.12
229+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbb.so.12
228230
/opt/intel/oclfpgaemu_<fpga_version>/x64
229-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbbmalloc.so.2
231+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbbmalloc.so.2
230232
/opt/intel/oclfpgaemu_<fpga_version>/x64
231233
# OpenCL CPU RT
232-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbb.so
234+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbb.so
233235
/opt/intel/oclcpuexp_<cpu_version>/x64
234-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbbmalloc.so
236+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbbmalloc.so
235237
/opt/intel/oclcpuexp_<cpu_version>/x64
236-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbb.so.12
238+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbb.so.12
237239
/opt/intel/oclcpuexp_<cpu_version>/x64
238-
ln -s /opt/intel/tbb_<tbb_version>/tbb/lib/intel64/gcc4.8/libtbbmalloc.so.2
240+
ln -s /opt/intel/oneapi-tbb-<tbb_version>/lib/intel64/gcc4.8/libtbbmalloc.so.2
239241
/opt/intel/oclcpuexp_<cpu_version>/x64
240242
```
241243

@@ -262,9 +264,9 @@ not working properly.
262264
[the dependency configuration file](../../buildbot/dependency.conf). For
263265
example, to `c:\oclcpu_rt_<cpu_version>`.
264266

265-
3) Extract the archive with TBB runtime using links in
266-
[the dependency configuration file](../../buildbot/dependency.conf). For
267-
example, to `c:\tbb_<tbb_version>`.
267+
3) Extract the archive with TBB runtime or build it from sources using links
268+
in [the dependency configuration file](../../buildbot/dependency.conf). For
269+
example, to `c:\oneapi-tbb-<tbb_version>`.
268270

269271
4) Run `Command Prompt` as `Administrator`. To do that click `Start` button,
270272
type `Command Prompt`, click the Right mouse button on it, then click
@@ -278,10 +280,10 @@ command:
278280
```bash
279281
# Install OpenCL FPGA emulation RT
280282
# Answer N to clean previous OCL_ICD_FILENAMES configuration
281-
c:\oclfpga_rt_<fpga_version>\install.bat c:\tbb_<tbb_version>\tbb\bin\intel64\vc14
283+
c:\oclfpga_rt_<fpga_version>\install.bat c:\oneapi-tbb-<tbb_version>\redist\intel64\vc14
282284
# Install OpenCL CPU RT
283285
# Answer Y to setup CPU RT side-bi-side with FPGA RT
284-
c:\oclcpu_rt_<cpu_version>\install.bat c:\tbb_<tbb_version>\tbb\bin\intel64\vc14
286+
c:\oclcpu_rt_<cpu_version>\install.bat c:\oneapi-tbb-<tbb_version>\redist\intel64\vc14
285287
```
286288
287289
### Obtain prerequisites for ahead of time (AOT) compilation

0 commit comments

Comments
 (0)