Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions sycl/include/sycl/access/access.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,12 @@ enum class placeholder { false_t = 0, true_t = 1 };
enum class address_space : int {
private_space = 0,
global_space = 1,
constant_space = 2,
constant_space __SYCL2020_DEPRECATED("sycl::access::address_space::constant_"
"space is deprecated since SYCL 2020") =
2,
local_space = 3,
ext_intel_global_device_space = 4,
ext_intel_global_host_space = 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it in any way related to the host-device that was removed in SYCL2020 ? If so, should we put a deprecation here as well?

Copy link
Contributor Author

@steffenlarsen steffenlarsen Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it maps to opencl_global_host according to the design document, so I don't think it has any relation to the host device.

global_device_space __SYCL2020_DEPRECATED(
"use 'ext_intel_global_device_space' instead") =
ext_intel_global_device_space,
global_host_space __SYCL2020_DEPRECATED(
"use 'ext_intel_global_host_space' instead") =
ext_intel_global_host_space,
ext_intel_host_device_space __SYCL2020_DEPRECATED(
"use 'ext_intel_global_host_space' instead") =
ext_intel_global_host_space,
generic_space = 6, // TODO generic_space address space is not supported yet
};

Expand Down
4 changes: 2 additions & 2 deletions sycl/test/basic_tests/address_space_traits.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ int main() {
"Unexpected address space");
static_assert(
detail::deduce_AS<__attribute__((opencl_global_device)) int>::value ==
access::address_space::global_device_space,
access::address_space::ext_intel_global_device_space,
"Unexpected address space");
static_assert(
detail::deduce_AS<__attribute__((opencl_global_host)) int>::value ==
access::address_space::global_host_space,
access::address_space::ext_intel_global_host_space,
"Unexpected address space");
});
});
Expand Down
8 changes: 4 additions & 4 deletions sycl/test/extensions/fpga.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ int main() {
cgh.single_task<class HostAnnotation>([=]() {
sycl::host_ptr<int> input_ptr(in_ptr);
sycl::host_ptr<int> output_ptr(out_ptr);
intelfpga::lsu_body<int,
sycl::access::address_space::global_host_space>(
intelfpga::lsu_body<
int, sycl::access::address_space::ext_intel_global_host_space>(
input_ptr, output_ptr);
});
});
Expand All @@ -113,8 +113,8 @@ int main() {
cgh.single_task<class DeviceAnnotation>([=]() {
sycl::device_ptr<int> input_ptr(in_ptr);
sycl::device_ptr<int> output_ptr(out_ptr);
intelfpga::lsu_body<int,
sycl::access::address_space::global_device_space>(
intelfpga::lsu_body<
int, sycl::access::address_space::ext_intel_global_device_space>(
input_ptr, output_ptr);
});
});
Expand Down