007687bf53
SWDEV-198863 - Options for hip-clang-vdi path to provide the chicken bits, or functional equivalents to HCC_DB (phase 1) 1. The log macros is turned off for release build. So log functions has zero impact to release build. 2. The log macros have level, mask, condition control. So we can have more control to avoid log flooding. I also adjusted some existing log to use new log functions. 1. To excercise and test the new log functions. 2. To improve performance slightly. 3. The change is mainly for HIP-ROCM, we can move more in next phases for PAL or ORCA. 4. I make these log feature unavailable for release build. We can revert to old log functions for release build in a case by case method. Tests: 1. http://ocltc.amd.com:8111/viewModification.html?modId=128289&personal=true&tab=vcsModificationBuilds http://ocltc.amd.com:8111/viewModification.html?modId=128358&personal=true&tab=vcsModificationBuilds 2. release build, run hip program, there is no log 3. fastdebug build, run hip program, export LOG_LEVEL=3 export GPU_LOG_MASK=4294967295 There was a lot of logs. 4. fastdebug build, run hip program, export LOG_LEVEL=2 export GPU_LOG_MASK=4294967295 There was no logs. 5. fastdebug build, run hip program, export LOG_LEVEL=3 export GPU_LOG_MASK=4294967294 There was much less logs. 6. fastdebug build, run hip program, export LOG_LEVEL=3 export GPU_LOG_MASK=47102 There was even much less logs. The logs was expected according to the mask. 7. Tested step 2 to 6 similarily in Windows and Linux ReviewBoard: http://ocltc.amd.com/reviews/r/18215 Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#46 edit ... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#82 edit ... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#26 edit ... //depot/stg/opencl/drivers/opencl/api/hip/hiprtc_internal.hpp#2 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#68 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#137 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#91 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#100 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.cpp#32 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/runtime.cpp#40 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.hpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#323 edit
264 wiersze
7.7 KiB
C++
264 wiersze
7.7 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<hip::Stream*> streamSet;
|
|
|
|
// Internal structure for stream callback handler
|
|
class StreamCallback {
|
|
public:
|
|
StreamCallback(hipStream_t stream, hipStreamCallback_t callback, void* userData,
|
|
amd::Command* command)
|
|
: stream_(stream), callBack_(callback),
|
|
userData_(userData), command_(command) {
|
|
};
|
|
hipStream_t stream_;
|
|
hipStreamCallback_t callBack_;
|
|
void* userData_;
|
|
amd::Command* command_;
|
|
};
|
|
|
|
namespace hip {
|
|
|
|
void syncStreams() {
|
|
amd::ScopedLock lock(streamSetLock);
|
|
|
|
for (const auto& it : streamSet) {
|
|
it->finish();
|
|
}
|
|
}
|
|
|
|
Stream::Stream(amd::Device* dev, amd::Context* ctx, amd::CommandQueue::Priority p, unsigned int f) :
|
|
queue(nullptr), device(dev), context(ctx), priority(p), flags(f) {}
|
|
|
|
void Stream::create() {
|
|
cl_command_queue_properties properties = CL_QUEUE_PROFILING_ENABLE;
|
|
queue = new amd::HostQueue(*context, *device, properties,
|
|
amd::CommandQueue::RealTimeDisabled, priority);
|
|
assert(queue != nullptr);
|
|
queue->create();
|
|
}
|
|
|
|
amd::HostQueue* Stream::asHostQueue() {
|
|
if (queue == nullptr) {
|
|
create();
|
|
}
|
|
return queue;
|
|
}
|
|
|
|
void Stream::destroy() {
|
|
if (queue != nullptr) {
|
|
queue->release();
|
|
queue = nullptr;
|
|
}
|
|
}
|
|
|
|
void Stream::finish() {
|
|
if (queue != nullptr) {
|
|
queue->finish();
|
|
}
|
|
}
|
|
|
|
};
|
|
|
|
void CL_CALLBACK ihipStreamCallback(cl_event event, cl_int command_exec_status, void* user_data) {
|
|
|
|
hipError_t status = hipSuccess;
|
|
StreamCallback* cbo = reinterpret_cast<StreamCallback*>(user_data);
|
|
cbo->callBack_(cbo->stream_, status, cbo->userData_);
|
|
cbo->command_->release();
|
|
delete cbo;
|
|
}
|
|
|
|
static hipError_t ihipStreamCreate(hipStream_t *stream, unsigned int flags, amd::CommandQueue::Priority priority) {
|
|
amd::Device* device = hip::getCurrentContext()->devices()[0];
|
|
|
|
hip::Stream* hStream = new hip::Stream(device, hip::getCurrentContext(), priority, flags);
|
|
|
|
if (hStream == nullptr) {
|
|
return hipErrorOutOfMemory;
|
|
}
|
|
|
|
if (!(flags & hipStreamNonBlocking)) {
|
|
hip::syncStreams();
|
|
|
|
{
|
|
amd::ScopedLock lock(streamSetLock);
|
|
streamSet.insert(hStream);
|
|
}
|
|
}
|
|
|
|
*stream = reinterpret_cast<hipStream_t>(hStream);
|
|
|
|
ClPrint(amd::LOG_INFO, amd::LOG_API, "ihipStreamCreate: %zx", hStream);
|
|
|
|
return hipSuccess;
|
|
}
|
|
|
|
hipError_t hipStreamCreateWithFlags(hipStream_t *stream, unsigned int flags) {
|
|
HIP_INIT_API(hipStreamCreateWithFlags, stream, flags);
|
|
|
|
HIP_RETURN(ihipStreamCreate(stream, flags, amd::CommandQueue::Priority::Normal));
|
|
}
|
|
|
|
hipError_t hipStreamCreate(hipStream_t *stream) {
|
|
HIP_INIT_API(hipStreamCreate, stream);
|
|
|
|
HIP_RETURN(ihipStreamCreate(stream, hipStreamDefault, amd::CommandQueue::Priority::Normal));
|
|
}
|
|
|
|
hipError_t hipStreamCreateWithPriority(hipStream_t* stream, unsigned int flags, int priority) {
|
|
HIP_INIT_API(hipStreamCreateWithPriority, stream, flags, priority);
|
|
|
|
if (priority > static_cast<int>(amd::CommandQueue::Priority::High)) {
|
|
priority = static_cast<int>(amd::CommandQueue::Priority::High);
|
|
} else if (priority < static_cast<int>(amd::CommandQueue::Priority::Normal)) {
|
|
priority = static_cast<int>(amd::CommandQueue::Priority::Normal);
|
|
}
|
|
|
|
return HIP_RETURN(ihipStreamCreate(stream, flags, static_cast<amd::CommandQueue::Priority>(priority)));
|
|
}
|
|
|
|
hipError_t hipDeviceGetStreamPriorityRange(int* leastPriority, int* greatestPriority) {
|
|
HIP_INIT_API(hipDeviceGetStreamPriorityRange, leastPriority, greatestPriority);
|
|
|
|
if (leastPriority != nullptr) {
|
|
*leastPriority = static_cast<int>(amd::CommandQueue::Priority::Normal);
|
|
}
|
|
if (greatestPriority != nullptr) {
|
|
// Only report one kind of priority for now.
|
|
*greatestPriority = static_cast<int>(amd::CommandQueue::Priority::Normal);
|
|
}
|
|
return HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamGetFlags(hipStream_t stream, unsigned int *flags) {
|
|
HIP_INIT_API(hipStreamGetFlags, stream, flags);
|
|
|
|
hip::Stream* hStream = reinterpret_cast<hip::Stream*>(stream);
|
|
|
|
if(flags != nullptr && hStream != nullptr) {
|
|
*flags = hStream->flags;
|
|
} else {
|
|
HIP_RETURN(hipErrorInvalidValue);
|
|
}
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamSynchronize(hipStream_t stream) {
|
|
HIP_INIT_API(hipStreamSynchronize, stream);
|
|
|
|
amd::HostQueue* hostQueue = hip::getQueue(stream);
|
|
hostQueue->finish();
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamDestroy(hipStream_t stream) {
|
|
HIP_INIT_API(hipStreamDestroy, stream);
|
|
|
|
if (stream == nullptr) {
|
|
HIP_RETURN(hipErrorInvalidResourceHandle);
|
|
}
|
|
|
|
amd::ScopedLock lock(streamSetLock);
|
|
|
|
hip::Stream* hStream = reinterpret_cast<hip::Stream*>(stream);
|
|
|
|
hStream->destroy();
|
|
streamSet.erase(hStream);
|
|
|
|
delete hStream;
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
hipError_t hipStreamWaitEvent(hipStream_t stream, hipEvent_t event, unsigned int flags) {
|
|
HIP_INIT_API(hipStreamWaitEvent, stream, event, flags);
|
|
|
|
amd::HostQueue* queue;
|
|
|
|
if (stream == nullptr) {
|
|
queue = hip::getNullStream();
|
|
} else {
|
|
queue = reinterpret_cast<hip::Stream*>(stream)->asHostQueue();
|
|
}
|
|
|
|
if (event == nullptr) {
|
|
HIP_RETURN(hipErrorInvalidResourceHandle);
|
|
}
|
|
|
|
hip::Event* e = reinterpret_cast<hip::Event*>(event);
|
|
|
|
return HIP_RETURN(e->streamWait(queue, flags));
|
|
}
|
|
|
|
hipError_t hipStreamQuery(hipStream_t stream) {
|
|
HIP_INIT_API(hipStreamQuery, stream);
|
|
|
|
amd::HostQueue* hostQueue;
|
|
if (stream == nullptr) {
|
|
hostQueue = hip::getNullStream();
|
|
} else {
|
|
hostQueue = reinterpret_cast<hip::Stream*>(stream)->asHostQueue();
|
|
}
|
|
|
|
amd::Command* command = hostQueue->getLastQueuedCommand(false);
|
|
if (command == nullptr) {
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
amd::Event& event = command->event();
|
|
if (command->type() != 0) {
|
|
event.notifyCmdQueue();
|
|
}
|
|
HIP_RETURN((command->status() == CL_COMPLETE) ? hipSuccess : hipErrorNotReady);
|
|
}
|
|
|
|
hipError_t hipStreamAddCallback(hipStream_t stream, hipStreamCallback_t callback, void* userData,
|
|
unsigned int flags) {
|
|
HIP_INIT_API(hipStreamAddCallback, stream, callback, userData, flags);
|
|
|
|
amd::HostQueue* hostQueue = reinterpret_cast<hip::Stream*>
|
|
(stream)->asHostQueue();
|
|
amd::Command* command = hostQueue->getLastQueuedCommand(true);
|
|
amd::Event& event = command->event();
|
|
StreamCallback* cbo = new StreamCallback(stream, callback, userData, command);
|
|
|
|
if(!event.setCallback(CL_COMPLETE, ihipStreamCallback, reinterpret_cast<void*>(cbo))) {
|
|
command->release();
|
|
return hipErrorInvalidResourceHandle;
|
|
}
|
|
|
|
event.notifyCmdQueue();
|
|
|
|
HIP_RETURN(hipSuccess);
|
|
}
|
|
|
|
|