AI/rocm-systems
2
0 Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

SWDEV-469422 - Avoid using of hipStream_t in internal methods (#69)

Selaa lähdekoodia 
Change-Id: Ifd5362f371c846a88241927383cb95cf046548ef

[ROCm/clr commit: fb92683d86]
This commit is contained in:
Godavarthy Surya, Anusha authored and GitHub committed 2025-04-28 15:09:11 +05:30
1 vanhempi 0eb2e5e8f2
commit ff69bcc903
10 files changed
+35 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

projects/clr/hipamd/src/hip_event.cpp
+7 -13
Näytä tiedosto
@@ -183,20 +183,17 @@ hipError_t Event::streamWaitCommand(amd::Command*& command, hip::Stream* stream)
return hipSuccess;
}
// ================================================================================================
hipError_t Event::streamWait(hipStream_t stream, uint flags) {
// Get the stream without any resolution
constexpr bool kWait = false;
hip::Stream* hip_stream = hip::getStream(stream, kWait);
hipError_t Event::streamWait(hip::Stream* stream, uint flags) {
// Access to event_ object must be lock protected
amd::ScopedLock lock(lock_);
if ((event_ == nullptr) || (event_->command().queue() == hip_stream) || ready()) {
if ((event_ == nullptr) || (event_->command().queue() == stream) || ready()) {
return hipSuccess;
}
if (!event_->notifyCmdQueue()) {
return hipErrorLaunchOutOfResources;
}
amd::Command* command;
hipError_t status = streamWaitCommand(command, hip_stream);
hipError_t status = streamWaitCommand(command, stream);
if (status != hipSuccess) {
return status;
}
@@ -226,7 +223,7 @@ hipError_t Event::recordCommand(amd::Command*& command, amd::HostQueue* stream,
}
// ================================================================================================
hipError_t Event::enqueueRecordCommand(hipStream_t stream, amd::Command* command) {
hipError_t Event::enqueueRecordCommand(hip::Stream* stream, amd::Command* command) {
command->enqueue();
if (event_ == &command->event()) {
return hipSuccess;
@@ -240,18 +237,15 @@ hipError_t Event::enqueueRecordCommand(hipStream_t stream, amd::Command* command
}
// ================================================================================================
hipError_t Event::addMarker(hipStream_t stream, amd::Command* command,
hipError_t Event::addMarker(hip::Stream* hip_stream, amd::Command* command,
bool batch_flush) {
// Skip wait as we should not be resolving stream in this sub
constexpr bool kWait = false;
hip::Stream* hip_stream = hip::getStream(stream, kWait);
// Keep the lock always at the beginning of this to avoid a race. SWDEV-277847
amd::ScopedLock lock(lock_);
hipError_t status = recordCommand(command, hip_stream, 0, batch_flush);
if (status != hipSuccess) {
return hipSuccess;
}
status = enqueueRecordCommand(stream, command);
status = enqueueRecordCommand(hip_stream, command);
return status;
}
@@ -425,7 +419,7 @@ hipError_t hipEventRecord_common(hipEvent_t event, hipStream_t stream, unsigned
if (g_devices[e->deviceId()]->devices()[0] != &hip_stream->device()) {
return hipErrorInvalidHandle;
}
status = e->addMarker(stream, nullptr, !hip::Event::kBatchFlush);
status = e->addMarker(hip_stream, nullptr, !hip::Event::kBatchFlush);
}
return status;
}