Skip to content

[UR] Run tests for hip multi dev ctx #11739

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
merged 4 commits into from
Dec 5, 2023
Merged

[UR] Run tests for hip multi dev ctx #11739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01d0d63
Run tests for hip multi dev ctx
hdelan Nov 1, 2023
ef1ca1c
Update branch
hdelan Nov 24, 2023
2fb37c1
Update sycl/plugins/unified_runtime/CMakeLists.txt
hdelan Dec 5, 2023
817f9fd
Merge branch 'sycl' into run-hip-multi-dev-ctx-tests
hdelan Dec 5, 2023
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
12 changes: 6 additions & 6 deletions sycl/plugins/unified_runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
include(FetchContent)

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit fe5bc760d0a9fa28247d3f0b57c20114f02eda49
# Merge: 47af3ee2 3e1f1636
# commit 67e7da33596c597ef79d940223d372583a78bb2b
# Merge: 9b1fb4e9 f0e0be24
# Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
# Date: Fri Dec 1 11:21:41 2023 +0000
# Merge pull request #1102 from hdelan/adapter-batch1
# [HIP] Adapter PR batch
set(UNIFIED_RUNTIME_TAG fe5bc760d0a9fa28247d3f0b57c20114f02eda49)
# Date: Tue Dec 5 10:46:45 2023 +0000
# Merge pull request #999 from hdelan/hip-adapter-multi-dev-ctx
# [HIP] Hip adapter multi dev ctx
set(UNIFIED_RUNTIME_TAG 67e7da33596c597ef79d940223d372583a78bb2b)

if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)
set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")
Expand Down
12 changes: 12 additions & 0 deletions sycl/plugins/unified_runtime/ur/ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class ur_shared_mutex {
// nop.
class ur_mutex {
std::mutex Mutex;
friend class ur_lock;

public:
void lock() {
Expand All @@ -113,6 +114,17 @@ class ur_mutex {
}
};

class ur_lock {
std::unique_lock<std::mutex> Lock;

public:
explicit ur_lock(ur_mutex &Mutex) {
if (!SingleThreadMode) {
Lock = std::unique_lock<std::mutex>(Mutex.Mutex);
}
}
};

/// SpinLock is a synchronization primitive, that uses atomic variable and
/// causes thread trying acquire lock wait in loop while repeatedly check if
/// the lock is available.
Expand Down
29 changes: 0 additions & 29 deletions sycl/test-e2e/Plugin/interop-buffer-hip.cpp
View file
Open in desktop

This file was deleted.