Skip to content

Commit eaa89ca

Browse files
committed
Merge remote-tracking branch 'upstream/sycl' into sycl
2 parents c86049c + 4b03ddb commit eaa89ca

38 files changed

+1256
-1009
lines changed

buildbot/testlist.cfg

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
:test_exception_handling
1212
:test_group
1313
:test_h_item
14-
:test_handler
14+
#:test_handler
1515
:test_header
1616
:test_hierarchical
1717
:test_id
@@ -20,7 +20,7 @@
2020
:test_item
2121
:test_kernel
2222
:test_kernel_args
23-
:test_math_builtin_api
23+
#:test_math_builtin_api
2424
:test_multi_ptr
2525
:test_nd_item
2626
:test_nd_range
@@ -38,8 +38,7 @@
3838
:test_vector_api
3939
:test_vector_constructors
4040
:test_vector_load_store
41-
# Disable test to speedup testing until JIT is optimized
4241
#:test_vector_operators
4342
:test_vector_swizzle_assignment
44-
:test_vector_swizzles
45-
:test_vector_swizzles_opencl
43+
#:test_vector_swizzles
44+
#:test_vector_swizzles_opencl

sycl/doc/SYCLCompilerUserManual.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,15 @@ your application.
112112

113113
**`-fintelfpga`**
114114

115-
Perform ahead of time compilation for FPGA.
115+
Perform ahead of time compilation for Intel FPGA, which relies on the external tool `aoc`
116+
being available in the `PATH`.
117+
118+
This option is roughly equivalent to `-fsycl-targets=spir64_fpga-unknown-unknown-sycldevice -g -MMD -lOpenCL`.
119+
120+
It is incompatible with `-fsycl-targets=...`; if ahead of time compilation
121+
is needed for multiple backends (e.g. Intel FPGA, Intel GPU, etc.), the
122+
alternative form based on `-fsycl-targets=spir64_fpga-unknown-unknown-sycldevice`
123+
should be used instead.
116124

117125
**`-fsycl-link=<value>`**
118126

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SYCL_INTEL_group_algorithms
2+
3+
A library of group functions, including common parallel algorithms such as reductions and scans.

sycl/doc/extensions/GroupAlgorithms/SYCL_INTEL_group_algorithms.asciidoc

Lines changed: 270 additions & 0 deletions
Large diffs are not rendered by default.

sycl/doc/extensions/GroupCollectives/GroupCollectives.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

sycl/include/CL/sycl/backend/cuda.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ namespace cuda {
1818

1919
// Mem Object info: Retrieve the raw CUDA pointer from a cl_mem
2020
#define PI_CUDA_RAW_POINTER (0xFF01)
21-
// Context creation: Use the primary context instead of a custom one
21+
// Context creation: Use a primary CUDA context instead of a custom one by
22+
// providing a property value of PI_TRUE for the following
23+
// property ID.
2224
#define PI_CONTEXT_PROPERTIES_CUDA_PRIMARY (0xFF02)
2325

2426
// PI Command Queue using Default stream

sycl/include/CL/sycl/context.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class context {
4949
/// @param AsyncHandler is an instance of async_handler.
5050
/// @param UseCUDAPrimaryContext is a bool determining whether to use the
5151
/// primary context in the CUDA backend.
52-
context(const device &Device, async_handler AsyncHandler = {},
53-
bool UseCUDAPrimaryContext = false);
52+
explicit context(const device &Device, async_handler AsyncHandler = {},
53+
bool UseCUDAPrimaryContext = false);
5454

5555
/// Constructs a SYCL context instance using the provided platform.
5656
///
@@ -63,8 +63,8 @@ class context {
6363
/// @param AsyncHandler is an instance of async_handler.
6464
/// @param UseCUDAPrimaryContext is a bool determining whether to use the
6565
/// primary context in the CUDA backend.
66-
context(const platform &Platform, async_handler AsyncHandler = {},
67-
bool UseCUDAPrimaryContext = false);
66+
explicit context(const platform &Platform, async_handler AsyncHandler = {},
67+
bool UseCUDAPrimaryContext = false);
6868

6969
/// Constructs a SYCL context instance using list of devices.
7070
///
@@ -78,8 +78,9 @@ class context {
7878
/// @param AsyncHandler is an instance of async_handler.
7979
/// @param UseCUDAPrimaryContext is a bool determining whether to use the
8080
/// primary context in the CUDA backend.
81-
context(const vector_class<device> &DeviceList,
82-
async_handler AsyncHandler = {}, bool UseCUDAPrimaryContext = false);
81+
explicit context(const vector_class<device> &DeviceList,
82+
async_handler AsyncHandler = {},
83+
bool UseCUDAPrimaryContext = false);
8384

8485
/// Constructs a SYCL context instance from OpenCL cl_context.
8586
///

0 commit comments

Comments
 (0)