133447a412
SWDEV-145570 - [HIP] Track last used event and use last enqueued command in a stream rather than creating a new event ReviewBoardURL = http://ocltc.amd.com/reviews/r/15996/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_context.cpp#15 edit ... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#7 edit ... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#14 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#90 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.hpp#20 edit
198 righe
5.5 KiB
C++
198 righe
5.5 KiB
C++
/*
|
|
Copyright (c) 2015 - present Advanced Micro Devices, Inc. All rights reserved.
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
THE SOFTWARE.
|
|
*/
|
|
|
|
#include <hip/hip_runtime.h>
|
|
#include "hip_internal.hpp"
|
|
#include "hip_event.hpp"
|
|
#include "thread/monitor.hpp"
|
|
|
|
static amd::Monitor streamSetLock("Guards global stream set");
|
|
static std::unordered_set<amd::HostQueue*> streamSet;
|
|
|
|
namespace hip {
|
|
|
|
void syncStreams() {
|
|
amd::ScopedLock lock(streamSetLock);
|
|
|
|
for (const auto& it : streamSet) {
|
|
it->finish();
|
|
}
|
|
}
|
|
|
|
};
|
|
|
|
static hipError_t ihipStreamCreateWithFlags(hipStream_t *stream, unsigned int flags) {
|
|
amd::Device* device = hip::getCurrentContext()->devices()[0];
|
|
|
|
cl_command_queue_properties properties = CL_QUEUE_PROFILING_ENABLE;
|
|
amd::HostQueue* queue = new amd::HostQueue(*hip::getCurrentContext(), *device, properties,
|
|
amd::CommandQueue::RealTimeDisabled,
|
|
amd::CommandQueue::Priority::Normal);
|
|
|
|
if (queue == nullptr || !queue->create()) {
|
|
return hipErrorOutOfMemory;
|
|
}
|
|
|
|
if (!(flags & hipStreamNonBlocking)) {
|
|
hip::syncStreams();
|
|
|
|
{
|
|
amd::ScopedLock lock(streamSetLock);
|
|
streamSet.insert(queue);
|
|
}
|
|
}
|
|
|
|
*stream = reinterpret_cast<hipStream_t>(as_cl(queue));
|
|
|
|
return hipSuccess;
|
|
}
|
|
|
|
|
|
void ihipStreamCallback(hipStream_t stream, hipStreamCallback_t callback, void* userData) {
|
|
//Stream synchronize
|
|
hipError_t status = hipStreamSynchronize(stream);
|
|
|
|
// Call the callback function
|
|
callback(stream, status, userData);
|
|
}
|
|
|
|
hipError_t hipStreamCreateWithFlags(hipStream_t *stream, unsigned int flags) {
|
|
HIP_INIT_API(stream, flags);
|
|
|
|
HIP_RETURN(ihipStreamCreateWithFlags(stream, flags));
|
|
}
|
|
|
|
hipError_t hipStreamCreate(hipStream_t *stream) {
|
|
HIP_INIT_API(stream);
|
|
|
|
HIP_RETURN(ihipStreamCreateWithFlags(stream, hipStreamDefault));
|
|
}
|
|
|
|
hipError_t hipStreamGetFlags(hipStream_t stream, unsigned int *flags) {
|
|
HIP_INIT_API(stream, flags);
|
|
|
|
amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
|
|
auto it = streamSet.find(hostQueue);
|
|
|
|
if(flags != nullptr) {
|
|
*flags = (it == streamSet.end()) ? hipStreamNonBlocking : hipStreamDefault;
|
|
} else {
|
|
HIP_RETURN(hipErrorInvalidValue);
|
|
}
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamSynchronize(hipStream_t stream) {
|
|
HIP_INIT_API(stream);
|
|
|
|
amd::HostQueue* hostQueue;
|
|
|
|
if (stream == nullptr) {
|
|
hip::syncStreams();
|
|
|
|
hostQueue = hip::getNullStream();
|
|
} else {
|
|
hip::getNullStream()->finish();
|
|
|
|
hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
|
|
}
|
|
|
|
if (hostQueue == nullptr) {
|
|
HIP_RETURN(hipErrorUnknown);
|
|
}
|
|
|
|
hostQueue->finish();
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamDestroy(hipStream_t stream) {
|
|
HIP_INIT_API(stream);
|
|
|
|
if (stream == nullptr) {
|
|
HIP_RETURN(hipErrorInvalidResourceHandle);
|
|
}
|
|
|
|
amd::ScopedLock lock(streamSetLock);
|
|
|
|
amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
|
|
|
|
// Release last tracked command
|
|
hostQueue->setLastQueuedCommand(nullptr);
|
|
|
|
hostQueue->release();
|
|
streamSet.erase(hostQueue);
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamWaitEvent(hipStream_t stream, hipEvent_t event, unsigned int flags) {
|
|
HIP_INIT_API(stream, event, flags);
|
|
|
|
if (stream == nullptr || event == nullptr) {
|
|
HIP_RETURN(hipErrorInvalidResourceHandle);
|
|
}
|
|
|
|
amd::HostQueue* hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
|
|
hip::Event* e = reinterpret_cast<hip::Event*>(event);
|
|
cl_event clEvent = as_cl(e->event_);
|
|
|
|
amd::Command::EventWaitList eventWaitList;
|
|
cl_int err = amd::clSetEventWaitList(eventWaitList, *hostQueue, 1, &clEvent);
|
|
if (err != CL_SUCCESS) {
|
|
HIP_RETURN(hipErrorUnknown);
|
|
}
|
|
|
|
amd::Command* command = new amd::Marker(*hostQueue, true, eventWaitList);
|
|
if (command == NULL) {
|
|
HIP_RETURN(hipErrorOutOfMemory);
|
|
}
|
|
command->enqueue();
|
|
command->release();
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamQuery(hipStream_t stream) {
|
|
HIP_INIT_API(stream);
|
|
|
|
amd::HostQueue* hostQueue;
|
|
if (stream == nullptr) {
|
|
hostQueue = hip::getNullStream();
|
|
} else {
|
|
hostQueue = as_amd(reinterpret_cast<cl_command_queue>(stream))->asHostQueue();
|
|
}
|
|
HIP_RETURN(hostQueue->isEmpty() ? hipSuccess : hipErrorNotReady);
|
|
}
|
|
|
|
hipError_t hipStreamAddCallback(hipStream_t stream, hipStreamCallback_t callback, void* userData,
|
|
unsigned int flags) {
|
|
HIP_INIT_API(stream, callback, userData, flags);
|
|
|
|
std::thread (ihipStreamCallback, stream, callback, userData).detach();
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
|