Skip to content

Commit d845ae0

Browse files
author
Przemek Malon
committed
Apply nfc feedback
1 parent 1f85d37 commit d845ae0

File tree

6 files changed

+199
-200
lines changed

6 files changed

+199
-200
lines changed

‎sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
#pragma once
1010

11-
#include <ur_api.h>
12-
13-
#include <stddef.h> // for size_t
11+
#include "interop_common.hpp" // For external_mem_handle_type.
1412

15-
#include "interop_common.hpp" // for external_mem_handle_type
13+
#include <ur_api.h>
14+
#include <stddef.h> // For size_t.
1615

1716
namespace sycl {
1817
inline namespace _V1 {

‎sycl/include/sycl/ext/oneapi/interop_common.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace sycl {
1212
inline namespace _V1 {
1313
namespace ext::oneapi::experimental {
1414

15-
// Types of external memory handles
15+
// Types of external memory handles.
1616
enum class external_mem_handle_type {
1717
opaque_fd = 0,
1818
win32_nt_handle = 1,

‎sycl/include/sycl/ext/oneapi/memory_export.hpp‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
#pragma once
1010

11-
#include <cstddef> // for size_t
11+
#include "interop_common.hpp" // For external_mem_handle_type.
12+
#include <sycl/context.hpp> // For context.
13+
#include <sycl/detail/export.hpp> // For __SYCL_EXPORT.
14+
#include <sycl/device.hpp> // For device.
15+
#include <sycl/queue.hpp> // For queue.
1216

13-
#include "interop_common.hpp" // for external_mem_handle_type
14-
#include <sycl/context.hpp> // for context
15-
#include <sycl/detail/export.hpp> // for __SYCL_EXPORT
16-
#include <sycl/device.hpp> // for device
17-
#include <sycl/queue.hpp> // for queue
17+
#include <cstddef> // For size_t.
1818

1919
namespace sycl {
2020
inline namespace _V1 {
@@ -35,90 +35,90 @@ template <> struct exported_mem<external_mem_handle_type::win32_nt_handle> {
3535
template <external_mem_handle_type ExternalMemHandleType>
3636
using exported_mem_t = typename exported_mem<ExternalMemHandleType>::type;
3737

38-
__SYCL_EXPORT int export_device_mem_opaque_fd(void *deviceMemory,
39-
const sycl::device &syclDevice,
40-
const sycl::context &syclContext);
38+
__SYCL_EXPORT int export_device_mem_opaque_fd(void *DeviceMemory,
39+
const sycl::device &SyclDevice,
40+
const sycl::context &SyclContext);
4141

4242
__SYCL_EXPORT void *
43-
export_device_mem_win32_nt_handle(void *deviceMemory,
44-
const sycl::device &syclDevice,
45-
const sycl::context &syclContext);
43+
export_device_mem_win32_nt_handle(void *DeviceMemory,
44+
const sycl::device &SyclDevice,
45+
const sycl::context &SyclContext);
4646
} // namespace detail
4747

4848
__SYCL_EXPORT void *alloc_exportable_device_mem(
49-
size_t alignment, size_t size,
50-
external_mem_handle_type externalMemHandleType,
51-
const sycl::device &syclDevice, const sycl::context &syclContext,
52-
[[maybe_unused]] const sycl::property_list &propList = {});
49+
size_t Alignment, size_t Size,
50+
external_mem_handle_type ExternalMemHandleType,
51+
const sycl::device &SyclDevice, const sycl::context &SyclContext,
52+
[[maybe_unused]] const sycl::property_list &PropList = {});
5353

5454
inline void *alloc_exportable_device_mem(
55-
size_t alignment, size_t size,
56-
external_mem_handle_type externalMemHandleType,
57-
const sycl::queue &syclQueue,
58-
[[maybe_unused]] const sycl::property_list &propList = {}) {
59-
return alloc_exportable_device_mem(alignment, size, externalMemHandleType,
60-
syclQueue.get_device(),
61-
syclQueue.get_context(), propList);
55+
size_t Alignment, size_t Size,
56+
external_mem_handle_type ExternalMemHandleType,
57+
const sycl::queue &SyclQueue,
58+
[[maybe_unused]] const sycl::property_list &PropList = {}) {
59+
return alloc_exportable_device_mem(Alignment, Size, ExternalMemHandleType,
60+
SyclQueue.get_device(),
61+
SyclQueue.get_context(), PropList);
6262
}
6363

64-
__SYCL_EXPORT void free_exportable_memory(void *deviceMemory,
65-
const sycl::device &syclDevice,
66-
const sycl::context &syclContext);
64+
__SYCL_EXPORT void free_exportable_memory(void *DeviceMemory,
65+
const sycl::device &SyclDevice,
66+
const sycl::context &SyclContext);
6767

68-
inline void free_exportable_memory(void *deviceMemory,
69-
const sycl::queue &syclQueue) {
70-
free_exportable_memory(deviceMemory, syclQueue.get_device(),
71-
syclQueue.get_context());
68+
inline void free_exportable_memory(void *DeviceMemory,
69+
const sycl::queue &SyclQueue) {
70+
free_exportable_memory(DeviceMemory, SyclQueue.get_device(),
71+
SyclQueue.get_context());
7272
}
7373

7474
// Available only when
75-
// ExternalMemHandleType == external_mem_handle_type::opaque_fd
75+
// ExternalMemHandleType == external_mem_handle_type::opaque_fd.
7676
template <external_mem_handle_type ExternalMemHandleType,
7777
std::enable_if_t<ExternalMemHandleType ==
7878
external_mem_handle_type::opaque_fd,
7979
bool> = true>
8080
inline detail::exported_mem_t<ExternalMemHandleType>
81-
export_device_mem_handle(void *deviceMemory, const sycl::device &syclDevice,
82-
const sycl::context &syclContext) {
83-
return detail::export_device_mem_opaque_fd(deviceMemory, syclDevice,
84-
syclContext);
81+
export_device_mem_handle(void *DeviceMemory, const sycl::device &SyclDevice,
82+
const sycl::context &SyclContext) {
83+
return detail::export_device_mem_opaque_fd(DeviceMemory, SyclDevice,
84+
SyclContext);
8585
}
8686

8787
// Available only when
88-
// ExternalMemHandleType == external_mem_handle_type::opaque_fd
88+
// ExternalMemHandleType == external_mem_handle_type::opaque_fd.
8989
template <external_mem_handle_type ExternalMemHandleType,
9090
std::enable_if_t<ExternalMemHandleType ==
9191
external_mem_handle_type::opaque_fd,
9292
bool> = true>
9393
inline detail::exported_mem_t<ExternalMemHandleType>
94-
export_device_mem_handle(void *deviceMemory, const sycl::queue &syclQueue) {
94+
export_device_mem_handle(void *DeviceMemory, const sycl::queue &SyclQueue) {
9595
return export_device_mem_handle<ExternalMemHandleType>(
96-
deviceMemory, syclQueue.get_device(), syclQueue.get_context());
96+
DeviceMemory, SyclQueue.get_device(), SyclQueue.get_context());
9797
}
9898

9999
// Available only when
100-
// ExternalMemHandleType == external_mem_handle_type::win32_nt_handle
100+
// ExternalMemHandleType == external_mem_handle_type::win32_nt_handle.
101101
template <external_mem_handle_type ExternalMemHandleType,
102102
std::enable_if_t<ExternalMemHandleType ==
103103
external_mem_handle_type::win32_nt_handle,
104104
bool> = true>
105105
inline detail::exported_mem_t<ExternalMemHandleType>
106-
export_device_mem_handle(void *deviceMemory, const sycl::device &syclDevice,
107-
const sycl::context &syclContext) {
108-
return detail::export_device_mem_win32_nt_handle(deviceMemory, syclDevice,
109-
syclContext);
106+
export_device_mem_handle(void *DeviceMemory, const sycl::device &SyclDevice,
107+
const sycl::context &SyclContext) {
108+
return detail::export_device_mem_win32_nt_handle(DeviceMemory, SyclDevice,
109+
SyclContext);
110110
}
111111

112112
// Available only when
113-
// ExternalMemHandleType == external_mem_handle_type::win32_nt_handle
113+
// ExternalMemHandleType == external_mem_handle_type::win32_nt_handle.
114114
template <external_mem_handle_type ExternalMemHandleType,
115115
std::enable_if_t<ExternalMemHandleType ==
116116
external_mem_handle_type::win32_nt_handle,
117117
bool> = true>
118118
inline detail::exported_mem_t<ExternalMemHandleType>
119-
export_device_mem_handle(void *deviceMemory, const sycl::queue &syclQueue) {
119+
export_device_mem_handle(void *DeviceMemory, const sycl::queue &SyclQueue) {
120120
return export_device_mem_handle<ExternalMemHandleType>(
121-
deviceMemory, syclQueue.get_device(), syclQueue.get_context());
121+
DeviceMemory, SyclQueue.get_device(), SyclQueue.get_context());
122122
}
123123

124124
} // namespace ext::oneapi::experimental

‎sycl/source/detail/memory_export.cpp‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <sycl/detail/export.hpp> // for __SYCL_EXPORT
9+
#include <sycl/detail/export.hpp> // For __SYCL_EXPORT.
1010
#include <sycl/detail/ur.hpp>
1111
#include <sycl/ext/oneapi/memory_export.hpp>
1212

1313
#include <detail/context_impl.hpp>
1414
#include <detail/queue_impl.hpp>
1515

16-
#include <assert.h> // for assert
17-
#include <stddef.h> // for size_t
16+
#include <cassert> // For assert.
17+
#include <cstddef> // For size_t.
1818

1919
namespace sycl {
2020
inline namespace _V1 {
2121
namespace ext::oneapi::experimental {
2222

2323
__SYCL_EXPORT void *alloc_exportable_device_mem(
24-
size_t alignment, size_t size,
25-
external_mem_handle_type externalMemHandleType,
26-
const sycl::device &syclDevice, const sycl::context &syclContext,
27-
[[maybe_unused]] const sycl::property_list &propList) {
24+
size_t Alignment, size_t Size,
25+
external_mem_handle_type ExternalMemHandleType,
26+
const sycl::device &SyclDevice, const sycl::context &SyclContext,
27+
[[maybe_unused]] const sycl::property_list &PropList) {
2828

29-
if (!syclDevice.has(sycl::aspect::ext_oneapi_exportable_device_mem)) {
29+
if (!SyclDevice.has(sycl::aspect::ext_oneapi_exportable_device_mem)) {
3030
throw sycl::exception(
3131
sycl::make_error_code(sycl::errc::feature_not_supported),
3232
"Device does not support memory export");
3333
}
3434

35-
auto [urDevice, urCtx, Adapter] = get_ur_handles(syclDevice, syclContext);
35+
auto [UrDevice, UrCtx, Adapter] = get_ur_handles(SyclDevice, SyclContext);
3636

37-
void *retDeviceMemory = nullptr;
37+
void *RetDeviceMemory = nullptr;
3838

39-
ur_exp_external_mem_type_t urExternalMemType;
40-
switch (externalMemHandleType) {
39+
ur_exp_external_mem_type_t UrExternalMemType;
40+
switch (ExternalMemHandleType) {
4141
case external_mem_handle_type::opaque_fd:
42-
urExternalMemType = UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD;
42+
UrExternalMemType = UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD;
4343
break;
4444
case external_mem_handle_type::win32_nt_handle:
45-
urExternalMemType = UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT;
45+
UrExternalMemType = UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT;
4646
break;
4747
default:
4848
throw sycl::exception(sycl::make_error_code(sycl::errc::invalid),
@@ -52,61 +52,61 @@ __SYCL_EXPORT void *alloc_exportable_device_mem(
5252
Adapter
5353
->call<sycl::errc::runtime,
5454
sycl::detail::UrApiKind::urMemoryExportAllocExportableMemoryExp>(
55-
urCtx, urDevice, alignment, size, urExternalMemType,
56-
&retDeviceMemory);
55+
UrCtx, UrDevice, Alignment, Size, UrExternalMemType,
56+
&RetDeviceMemory);
5757

58-
return retDeviceMemory;
58+
return RetDeviceMemory;
5959
}
6060

61-
__SYCL_EXPORT void free_exportable_memory(void *deviceMemory,
62-
const sycl::device &syclDevice,
63-
const sycl::context &syclContext) {
64-
auto [urDevice, urCtx, Adapter] = get_ur_handles(syclDevice, syclContext);
61+
__SYCL_EXPORT void free_exportable_memory(void *DeviceMemory,
62+
const sycl::device &SyclDevice,
63+
const sycl::context &SyclContext) {
64+
auto [UrDevice, UrCtx, Adapter] = get_ur_handles(SyclDevice, SyclContext);
6565

6666
Adapter->call<sycl::errc::runtime,
6767
sycl::detail::UrApiKind::urMemoryExportFreeExportableMemoryExp>(
68-
urCtx, urDevice, deviceMemory);
68+
UrCtx, UrDevice, DeviceMemory);
6969

7070
return;
7171
}
7272

7373
namespace detail {
7474

7575
__SYCL_EXPORT int
76-
export_device_mem_opaque_fd(void *deviceMemory, const sycl::device &syclDevice,
77-
const sycl::context &syclContext) {
78-
auto [urDevice, urCtx, Adapter] = get_ur_handles(syclDevice, syclContext);
76+
export_device_mem_opaque_fd(void *DeviceMemory, const sycl::device &SyclDevice,
77+
const sycl::context &SyclContext) {
78+
auto [UrDevice, UrCtx, Adapter] = get_ur_handles(SyclDevice, SyclContext);
7979

80-
ur_exp_external_mem_type_t urExternalMemType =
80+
ur_exp_external_mem_type_t UrExternalMemType =
8181
UR_EXP_EXTERNAL_MEM_TYPE_OPAQUE_FD;
8282

83-
int retFDHandle = 0;
83+
int RetFDHandle = 0;
8484

8585
Adapter->call<sycl::errc::runtime,
8686
sycl::detail::UrApiKind::urMemoryExportExportMemoryHandleExp>(
87-
urCtx, urDevice, urExternalMemType, deviceMemory,
88-
reinterpret_cast<void *>(&retFDHandle));
87+
UrCtx, UrDevice, UrExternalMemType, DeviceMemory,
88+
reinterpret_cast<void *>(&RetFDHandle));
8989

90-
return retFDHandle;
90+
return RetFDHandle;
9191
}
9292

9393
__SYCL_EXPORT void *
94-
export_device_mem_win32_nt_handle(void *deviceMemory,
95-
const sycl::device &syclDevice,
96-
const sycl::context &syclContext) {
97-
auto [urDevice, urCtx, Adapter] = get_ur_handles(syclDevice, syclContext);
94+
export_device_mem_win32_nt_handle(void *DeviceMemory,
95+
const sycl::device &SyclDevice,
96+
const sycl::context &SyclContext) {
97+
auto [UrDevice, UrCtx, Adapter] = get_ur_handles(SyclDevice, SyclContext);
9898

99-
ur_exp_external_mem_type_t urExternalMemType =
99+
ur_exp_external_mem_type_t UrExternalMemType =
100100
UR_EXP_EXTERNAL_MEM_TYPE_WIN32_NT;
101101

102-
void *retNTHandle;
102+
void *RetNTHandle;
103103

104104
Adapter->call<sycl::errc::runtime,
105105
sycl::detail::UrApiKind::urMemoryExportExportMemoryHandleExp>(
106-
urCtx, urDevice, urExternalMemType, deviceMemory,
107-
static_cast<void *>(&retNTHandle));
106+
UrCtx, UrDevice, UrExternalMemType, DeviceMemory,
107+
static_cast<void *>(&RetNTHandle));
108108

109-
return retNTHandle;
109+
return RetNTHandle;
110110
}
111111

112112
} // namespace detail

‎sycl/test-e2e/MemoryExport/export_memory_api_test.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,43 @@ using exported_handle_type = int;
1616
#endif // _WIN32
1717

1818
int main() {
19-
sycl::device device;
20-
sycl::context context = sycl::context(device);
21-
sycl::queue queue(context, device);
19+
sycl::device Device;
20+
sycl::context Context = sycl::context(Device);
21+
sycl::queue Queue(Context, Device);
2222

2323
// Check if the device supports memory export.
24-
bool hasExportSupport =
25-
device.has(sycl::aspect::ext_oneapi_exportable_device_mem);
24+
bool HasExportSupport =
25+
Device.has(sycl::aspect::ext_oneapi_exportable_device_mem);
2626

27-
if (!hasExportSupport) {
27+
if (!HasExportSupport) {
2828
std::cerr << "Device does not support memory export.\n";
2929
return 1;
3030
} else {
3131
std::cout << "Device supports memory export.\n";
3232
}
3333

3434
#ifdef _WIN32
35-
constexpr auto exportHandleType =
35+
constexpr auto ExportHandleType =
3636
syclexp::external_mem_handle_type::win32_nt_handle;
3737
#else
38-
constexpr auto exportHandleType =
38+
constexpr auto ExportHandleType =
3939
syclexp::external_mem_handle_type::opaque_fd;
4040
#endif // _WIN32
4141

4242
try {
4343
// Allocate exportable memory.
44-
size_t size = 1024;
45-
void *mem = syclexp::alloc_exportable_device_mem(
46-
0 /* alignment */, size, exportHandleType, device, context);
44+
size_t Size = 1024;
45+
void *Mem = syclexp::alloc_exportable_device_mem(
46+
0 /* alignment */, Size, ExportHandleType, Device, Context);
4747

4848
// Export the memory handle.
49-
exported_handle_type exportableMemoryHandle =
50-
syclexp::export_device_mem_handle<exportHandleType>(mem, device,
51-
context);
52-
std::cout << "Exported memory handle == " << exportableMemoryHandle << "\n";
49+
exported_handle_type ExportableMemoryHandle =
50+
syclexp::export_device_mem_handle<ExportHandleType>(Mem, Device,
51+
Context);
52+
std::cout << "Exported memory handle == " << ExportableMemoryHandle << "\n";
5353

5454
// Free the exportable memory.
55-
syclexp::free_exportable_memory(mem, device, context);
55+
syclexp::free_exportable_memory(Mem, Device, Context);
5656

5757
} catch (const sycl::exception &e) {
5858
std::cerr << "SYCL exception caught: " << e.what() << "\n";

0 commit comments

Comments
 (0)