Skip to content

Commit 059dae0

Browse files
clang-format
1 parent 32a1c5c commit 059dae0

8 files changed

Lines changed: 60 additions & 64 deletions

File tree

oneapi-rs-sys/include/event.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ enum class EventCommandStatus : std::uint8_t;
2020

2121
namespace sycl_shims::event {
2222
void wait(std::unique_ptr<Event> &);
23-
void register_callback(std::unique_ptr<Queue> &, Event const &, rust::Box<Waker>);
23+
void register_callback(std::unique_ptr<Queue> &, Event const &,
24+
rust::Box<Waker>);
2425
EventCommandStatus get_command_execution_status(Event const &);
2526
std::unique_ptr<Event> clone(Event const &);
2627
} // namespace sycl_shims::event

oneapi-rs-sys/include/platform.hpp

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

99
#pragma once
1010

11-
#include "rust/cxx.h"
1211
#include "oneapi-rs-sys/include/types.hpp"
12+
#include "rust/cxx.h"
1313

1414
#include <sycl/sycl.hpp>
1515

@@ -23,8 +23,8 @@ struct PlatformPtr;
2323

2424
namespace sycl_shims::platform {
2525
rust::Vec<PlatformPtr> get_platforms();
26-
rust::Vec<DevicePtr> get_devices(Platform const&);
27-
rust::String get_version(Platform const&);
28-
rust::String get_name(Platform const&);
29-
rust::String get_vendor(Platform const&);
26+
rust::Vec<DevicePtr> get_devices(Platform const &);
27+
rust::String get_version(Platform const &);
28+
rust::String get_name(Platform const &);
29+
rust::String get_vendor(Platform const &);
3030
} // namespace sycl_shims::platform

oneapi-rs-sys/include/queue.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,9 @@ std::unique_ptr<Queue> new_queue();
2222
std::unique_ptr<Queue> new_queue_immediate();
2323
std::unique_ptr<Queue> new_queue_from_device(Device const &);
2424
std::unique_ptr<Queue> clone(Queue const &);
25-
std::unique_ptr<Event> memset(
26-
std::unique_ptr<Queue> &,
27-
std::uint8_t * ptr,
28-
int value,
29-
std::size_t num_bytes,
30-
rust::Vec<EventPtr>
31-
);
25+
std::unique_ptr<Event> memset(std::unique_ptr<Queue> &, std::uint8_t *ptr,
26+
int value, std::size_t num_bytes,
27+
rust::Vec<EventPtr>);
3228
std::unique_ptr<Event> barrier(std::unique_ptr<Queue> &, rust::Vec<EventPtr>);
3329
void wait(std::unique_ptr<Queue> &);
3430
} // namespace sycl_shims::queue

oneapi-rs-sys/include/types.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ using Device = sycl::device;
1515
using Platform = sycl::platform;
1616
using Queue = sycl::queue;
1717
using Event = sycl::event;
18-
}
18+
} // namespace sycl_shims

oneapi-rs-sys/include/usm.hpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
#include <memory>
1515

1616
namespace sycl_shims::usm {
17-
std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t num_bytes, Queue const &);
18-
std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t num_bytes, Queue const &);
19-
std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes, Queue const &);
20-
void free(std::uint8_t*, Queue const &);
17+
std::uint8_t *aligned_alloc_device(std::size_t alignment, std::size_t num_bytes,
18+
Queue const &);
19+
std::uint8_t *aligned_alloc_host(std::size_t alignment, std::size_t num_bytes,
20+
Queue const &);
21+
std::uint8_t *aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes,
22+
Queue const &);
23+
void free(std::uint8_t *, Queue const &);
2124
} // namespace sycl_shims::usm

oneapi-rs-sys/src/event.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,26 @@ using sycl::info::event_command_status;
1313
namespace syclintel = sycl::ext::intel;
1414

1515
namespace sycl_shims::event {
16-
void wait(std::unique_ptr<Event> & event) {
17-
event->wait();
18-
}
19-
std::unique_ptr<Event> clone(Event const & event) {
16+
void wait(std::unique_ptr<Event> &event) { event->wait(); }
17+
std::unique_ptr<Event> clone(Event const &event) {
2018
return std::make_unique<Event>(sycl::event(event));
2119
}
22-
EventCommandStatus get_command_execution_status(Event const & event) {
20+
EventCommandStatus get_command_execution_status(Event const &event) {
2321
auto status = event.get_info<sycl::info::event::command_execution_status>();
2422
switch (status) {
25-
case event_command_status::submitted:
26-
return EventCommandStatus::Submitted;
27-
case event_command_status::running:
28-
return EventCommandStatus::Running;
29-
case event_command_status::complete:
30-
return EventCommandStatus::Complete;
31-
default:
32-
return EventCommandStatus::Unknown;
23+
case event_command_status::submitted:
24+
return EventCommandStatus::Submitted;
25+
case event_command_status::running:
26+
return EventCommandStatus::Running;
27+
case event_command_status::complete:
28+
return EventCommandStatus::Complete;
29+
default:
30+
return EventCommandStatus::Unknown;
3331
}
3432
}
35-
void register_callback(std::unique_ptr<Queue> & queue, Event const & event, rust::Box<Waker> waker) {
36-
queue->submit([waker = std::move(waker), event](sycl::handler& cgh) {
33+
void register_callback(std::unique_ptr<Queue> &queue, Event const &event,
34+
rust::Box<Waker> waker) {
35+
queue->submit([waker = std::move(waker), event](sycl::handler &cgh) {
3736
cgh.depends_on(event);
3837
cgh.host_task([&]() { wake(waker); });
3938
});

oneapi-rs-sys/src/queue.cpp

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,37 @@
99
#include "oneapi-rs-sys/include/queue.hpp"
1010
#include "oneapi-rs-sys/src/queue-sys.rs.h"
1111

12-
using sycl::property::queue::in_order;
1312
using sycl::ext::intel::property::queue::immediate_command_list;
13+
using sycl::property::queue::in_order;
1414

1515
namespace sycl_shims::queue {
1616
std::unique_ptr<Queue> new_queue() {
17-
return std::make_unique<Queue>(sycl::queue({
18-
in_order()
19-
}));
17+
return std::make_unique<Queue>(sycl::queue({in_order()}));
2018
}
2119
std::unique_ptr<Queue> new_queue_immediate() {
22-
return std::make_unique<Queue>(sycl::queue({
23-
in_order(),
24-
immediate_command_list()
25-
}));
20+
return std::make_unique<Queue>(
21+
sycl::queue({in_order(), immediate_command_list()}));
2622
}
27-
std::unique_ptr<Queue> new_queue_from_device(Device const & device) {
23+
std::unique_ptr<Queue> new_queue_from_device(Device const &device) {
2824
return std::make_unique<Queue>(sycl::queue(device, {in_order()}));
2925
}
30-
std::unique_ptr<Queue> clone(Queue const & queue) {
26+
std::unique_ptr<Queue> clone(Queue const &queue) {
3127
return std::make_unique<Queue>(sycl::queue(queue));
3228
}
33-
std::unique_ptr<Event> memset(
34-
std::unique_ptr<Queue> & queue,
35-
std::uint8_t * ptr,
36-
int value,
37-
std::size_t num_bytes,
38-
rust::Vec<EventPtr> dep_events
39-
) {
29+
std::unique_ptr<Event> memset(std::unique_ptr<Queue> &queue, std::uint8_t *ptr,
30+
int value, std::size_t num_bytes,
31+
rust::Vec<EventPtr> dep_events) {
4032
std::vector<sycl::event> deps;
41-
for (auto&& e: dep_events)
33+
for (auto &&e : dep_events)
4234
deps.push_back(std::move(*e.ptr.release()));
4335
return std::make_unique<Event>(queue->memset(ptr, value, num_bytes, deps));
4436
}
45-
std::unique_ptr<Event> barrier(std::unique_ptr<Queue> & queue, rust::Vec<EventPtr> dep_events) {
37+
std::unique_ptr<Event> barrier(std::unique_ptr<Queue> &queue,
38+
rust::Vec<EventPtr> dep_events) {
4639
std::vector<sycl::event> deps;
47-
for (auto&& e: dep_events)
40+
for (auto &&e : dep_events)
4841
deps.push_back(std::move(*e.ptr.release()));
4942
return std::make_unique<Event>(queue->ext_oneapi_submit_barrier(deps));
5043
}
51-
void wait(std::unique_ptr<Queue> & queue) {
52-
queue->wait();
53-
}
44+
void wait(std::unique_ptr<Queue> &queue) { queue->wait(); }
5445
} // namespace sycl_shims::queue

oneapi-rs-sys/src/usm.cpp

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,25 @@
1010
#include "oneapi-rs-sys/src/usm-sys.rs.h"
1111

1212
namespace sycl_shims::usm {
13-
std::uint8_t* aligned_alloc_device(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
14-
return static_cast<std::uint8_t*>(sycl::aligned_alloc_device(alignment, num_bytes, queue));
13+
std::uint8_t *aligned_alloc_device(std::size_t alignment, std::size_t num_bytes,
14+
Queue const &queue) {
15+
return static_cast<std::uint8_t *>(
16+
sycl::aligned_alloc_device(alignment, num_bytes, queue));
1517
}
1618

17-
std::uint8_t* aligned_alloc_host(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
18-
return static_cast<std::uint8_t*>(sycl::aligned_alloc_host(alignment, num_bytes, queue));
19+
std::uint8_t *aligned_alloc_host(std::size_t alignment, std::size_t num_bytes,
20+
Queue const &queue) {
21+
return static_cast<std::uint8_t *>(
22+
sycl::aligned_alloc_host(alignment, num_bytes, queue));
1923
}
2024

21-
std::uint8_t* aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes, Queue const & queue) {
22-
return static_cast<std::uint8_t*>(sycl::aligned_alloc_shared(alignment, num_bytes, queue));
25+
std::uint8_t *aligned_alloc_shared(std::size_t alignment, std::size_t num_bytes,
26+
Queue const &queue) {
27+
return static_cast<std::uint8_t *>(
28+
sycl::aligned_alloc_shared(alignment, num_bytes, queue));
2329
}
2430

25-
void free(std::uint8_t* memory, Queue const & queue) {
26-
sycl::free(static_cast<void*>(memory), queue);
31+
void free(std::uint8_t *memory, Queue const &queue) {
32+
sycl::free(static_cast<void *>(memory), queue);
2733
}
2834
} // namespace sycl_shims::usm

0 commit comments

Comments
 (0)