Skip to content

[SYCL] Add a mutex to state-modifying program functions #1204

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

Merged
bader merged 4 commits into from
Apr 15, 2020
Merged

[SYCL] Add a mutex to state-modifying program functions #1204

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98ad98c
[SYCL] Add a mutex to state-dependent program functions
sergey-semenov Feb 26, 2020
d07e3b4
Merge branch 'sycl' into programmutex
sergey-semenov Apr 14, 2020
f0794e9
Address comments
sergey-semenov Apr 14, 2020
acada7e
Apply more comments
sergey-semenov Apr 14, 2020
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
8 changes: 8 additions & 0 deletions sycl/source/detail/program_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <algorithm>
#include <fstream>
#include <memory>
#include <mutex>

__SYCL_INLINE_NAMESPACE(cl) {
namespace sycl {
Expand Down Expand Up @@ -42,7 +43,9 @@ program_impl::program_impl(
DevicesSorted = sort_devices_by_cl_device_id(MDevices);
}
check_device_feature_support<info::device::is_linker_available>(MDevices);
vector_class<std::unique_lock<std::mutex>> Locks;
for (const auto &Prg : ProgramList) {
Locks.emplace_back(Prg->MMutex);
Prg->throw_if_state_is_not(program_state::compiled);
if (Prg->MContext != MContext) {
throw invalid_object_error(
Expand Down Expand Up @@ -162,6 +165,7 @@ cl_program program_impl::get() const {
void program_impl::compile_with_kernel_name(string_class KernelName,
string_class CompileOptions,
OSModuleHandle M) {
std::unique_lock<std::mutex> Lock(MMutex);
throw_if_state_is_not(program_state::none);
MProgramModuleHandle = M;
if (!is_host()) {
Expand All @@ -173,6 +177,7 @@ void program_impl::compile_with_kernel_name(string_class KernelName,

void program_impl::compile_with_source(string_class KernelSource,
string_class CompileOptions) {
std::unique_lock<std::mutex> Lock(MMutex);
throw_if_state_is_not(program_state::none);
// TODO should it throw if it's host?
if (!is_host()) {
Expand All @@ -185,6 +190,7 @@ void program_impl::compile_with_source(string_class KernelSource,
void program_impl::build_with_kernel_name(string_class KernelName,
string_class BuildOptions,
OSModuleHandle Module) {
std::unique_lock<std::mutex> Lock(MMutex);
throw_if_state_is_not(program_state::none);
MProgramModuleHandle = Module;
if (!is_host()) {
Expand All @@ -205,6 +211,7 @@ void program_impl::build_with_kernel_name(string_class KernelName,

void program_impl::build_with_source(string_class KernelSource,
string_class BuildOptions) {
std::unique_lock<std::mutex> Lock(MMutex);
throw_if_state_is_not(program_state::none);
// TODO should it throw if it's host?
if (!is_host()) {
Expand All @@ -215,6 +222,7 @@ void program_impl::build_with_source(string_class KernelSource,
}

void program_impl::link(string_class LinkOptions) {
std::unique_lock<std::mutex> Lock(MMutex);
throw_if_state_is_not(program_state::compiled);
if (!is_host()) {
check_device_feature_support<info::device::is_linker_available>(MDevices);
Expand Down
2 changes: 2 additions & 0 deletions sycl/source/detail/program_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <cassert>
#include <fstream>
#include <memory>
#include <mutex>

__SYCL_INLINE_NAMESPACE(cl) {
namespace sycl {
Expand Down Expand Up @@ -364,6 +365,7 @@ class program_impl {

RT::PiProgram MProgram = nullptr;
program_state MState = program_state::none;
std::mutex MMutex;
ContextImplPtr MContext;
bool MLinkable = false;
vector_class<device> MDevices;
Expand Down