-
Notifications
You must be signed in to change notification settings - Fork 787
[UR] [V2] Fix synchronization between command_list_manager usages #17297
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.
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
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
unified-runtime/source/adapters/level_zero/v2/lockable.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| //===--------- memory.hpp - Level Zero Adapter ---------------------------===// | ||
| // | ||
| // Copyright (C) 2024 Intel Corporation | ||
| // | ||
| // Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM | ||
| // Exceptions. See LICENSE.TXT | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #pragma once | ||
| #include <mutex> | ||
|
|
||
| template <typename T> struct locked { | ||
| public: | ||
| locked(T *object, std::unique_lock<std::mutex> &&lock) | ||
igchor marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| : lock_(std::move(lock)) { | ||
| object_ = object; | ||
| } | ||
| T *operator->() { return object_; } | ||
|
|
||
| private: | ||
| std::unique_lock<std::mutex> lock_; | ||
| T *object_; | ||
| }; | ||
|
|
||
| /* | ||
| lockable<T> wraps T class object in exclusive access lock, similar to one used | ||
| in rust | ||
|
|
||
| construction: | ||
| lockable<X> l(arguments, to, construct, X); | ||
|
|
||
| access without synchronization: | ||
| X* obj_ptr = l.get_no_lock(); | ||
| obj_ptr->print_name(); | ||
|
|
||
| exclusive access to object kept in l: | ||
| // as long as lock exists, thread has exclusive access to underlaying object | ||
| locked<X> lock = l.lock(); | ||
| // that object is accessed through ->() operator on lock object | ||
| lock->print_name(); | ||
| */ | ||
|
|
||
| template <typename T> struct lockable { | ||
| public: | ||
| template <typename... Args> | ||
| lockable(Args &&...args) : object_(std::forward<Args>(args)...) {} | ||
| locked<T> lock() { | ||
| std::unique_lock lock{mut_}; | ||
| return locked<T>(&object_, std::move(lock)); | ||
| } | ||
| T *get_no_lock() { return &object_; } | ||
|
|
||
| private: | ||
| T object_; | ||
| std::mutex mut_; | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this function reintroduced? I think it might be a rebase error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whoops, let me know if i should revert this
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened a PR to fix this #17476 (not worth a revert, it's dead code but not breaking anything)