Skip to content

Make Sycl resource more consist with other resources #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MrBurmark wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Make Sycl resource more consist with other resources #182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ebcd4
Store queue by value
MrBurmark Aug 28, 2025
fcfff57
Remove deprecated Sycl constructor
MrBurmark Aug 28, 2025
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
38 changes: 16 additions & 22 deletions include/camp/resource/sycl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace resources
}

private:
static sycl::queue *get_a_queue(const sycl::context* syclContext,
static sycl::queue& get_a_queue(const sycl::context* syclContext,
int num)
{
static constexpr int num_queues = 16;
Copy link
Member

@rhornung67 rhornung67 Aug 28, 2025

Choose a reason for hiding this comment

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

Should we make something like this a configure option so it's easier to change if necessary for different architectures? Or, is it expected to always be 16?

Copy link
Member Author

@MrBurmark MrBurmark Aug 28, 2025

Choose a reason for hiding this comment

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

That's not a bad idea.

Expand Down Expand Up @@ -181,28 +181,22 @@ namespace resources
if (num < 0) {
int& previous = cachedContextIter->second.first;
previous = (previous + 1) % num_queues;
return &cachedContextIter->second.second[previous];
return cachedContextIter->second.second[previous];
}
}

return &cachedContextIter->second.second[num % num_queues];
return cachedContextIter->second.second[num % num_queues];
}

// Private from-queue constructor
Sycl(sycl::queue& q) : qu(&q) {}
Sycl(sycl::queue& q) : qu(q) {}

public:
Sycl(int group = -1, sycl::context const& syclContext = get_thread_default_context())
: qu(get_a_queue(&syclContext, group))
{
}

[[deprecated]]
Sycl(sycl::context const& syclContext, int group = -1)
: qu(get_a_queue(&syclContext, group))
{
}

/// Create a resource from a custom queue
static Sycl SyclFromQueue(sycl::queue& q)
{
Expand All @@ -221,7 +215,7 @@ namespace resources
// Event
SyclEvent get_event() { return SyclEvent(get_queue()); }
Event get_event_erased() { return Event{SyclEvent(get_queue())}; }
void wait() { qu->wait(); }
void wait() { qu.wait(); }
void wait_for(Event *e)
{
auto *sycl_event = e->try_get<SyclEvent>();
Expand All @@ -238,17 +232,17 @@ namespace resources
{
T *ret = nullptr;
if (size > 0) {
ret = sycl::malloc_shared<T>(size, *qu);
ret = sycl::malloc_shared<T>(size, qu);
switch (ma) {
case MemoryAccess::Unknown:
case MemoryAccess::Device:
ret = sycl::malloc_device<T>(size, *qu);
ret = sycl::malloc_device<T>(size, qu);
break;
case MemoryAccess::Pinned:
ret = sycl::malloc_host<T>(size, *qu);
ret = sycl::malloc_host<T>(size, qu);
break;
case MemoryAccess::Managed:
ret = sycl::malloc_shared<T>(size, *qu);
ret = sycl::malloc_shared<T>(size, qu);
break;
}
}
Expand All @@ -263,24 +257,24 @@ namespace resources
void deallocate(void *p, MemoryAccess ma = MemoryAccess::Device)
{
CAMP_ALLOW_UNUSED_LOCAL(ma);
sycl::free(p, *qu);
sycl::free(p, qu);
}
void memcpy(void *dst, const void *src, size_t size)
{
if (size > 0) {
qu->memcpy(dst, src, size).wait();
qu.memcpy(dst, src, size).wait();
}
}
void memset(void *p, int val, size_t size)
{
if (size > 0) {
qu->memset(p, val, size).wait();
qu.memset(p, val, size).wait();
}
}

// implementation specific
sycl::queue *get_queue() { return qu; }
sycl::queue const *get_queue() const { return qu; }
sycl::queue& get_queue() { return qu; }
sycl::queue const& get_queue() const { return qu; }

/*
* \brief Compares two (Sycl) resources to see if they are equal.
Expand All @@ -289,7 +283,7 @@ namespace resources
*/
bool operator==(Sycl const& s) const
{
return (get_queue() == s.get_queue());
return (qu == s.qu);
}

/*
Expand All @@ -303,7 +297,7 @@ namespace resources
}

private:
sycl::queue *qu;
sycl::queue qu;
};

} // namespace v1
Expand Down
Loading