AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1982034 by cpaquot@cpaquot-ocl-lc-lnx on 2019/08/12 19:08:13

Browse Source 
SWDEV-199606 - [HIP] hipStreamQuery issue
	Don't test against CL_COMMAND_MARKER but 0 instead (user visible=false)

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#15 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#22 edit
This commit is contained in:
foreman
2019-08-12 19:16:30 -04:00
parent 7e6c7a9b8a
commit 4e71cb437e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/hip/hip_event.cpp
+2 -2
View File
@@ -115,7 +115,7 @@ hipError_t Event::streamWait(amd::HostQueue* hostQueue, uint flags) {
amd::Command::EventWaitList eventWaitList; amd::Command::EventWaitList eventWaitList;
eventWaitList.push_back(event_); eventWaitList.push_back(event_);
amd::Command* command = new amd::Marker(*hostQueue, true, eventWaitList); amd::Command* command = new amd::Marker(*hostQueue, false, eventWaitList);
if (command == NULL) { if (command == NULL) {
return hipErrorOutOfMemory; return hipErrorOutOfMemory;
} }
@@ -241,7 +241,7 @@ hipError_t hipEventRecord(hipEvent_t event, hipStream_t stream) {
amd::Command* command = queue->getLastQueuedCommand(true); amd::Command* command = queue->getLastQueuedCommand(true);
if (command == nullptr) { if (command == nullptr) {
command = new amd::Marker(*queue, true); command = new amd::Marker(*queue, false);
command->enqueue(); command->enqueue();
} }
api/hip/hip_event.hpp
+1 -1
View File
@@ -30,7 +30,7 @@ namespace hip {
class TimerMarker: public amd::Marker { class TimerMarker: public amd::Marker {
public: public:
TimerMarker(amd::HostQueue& queue) : amd::Marker(queue, true) { TimerMarker(amd::HostQueue& queue) : amd::Marker(queue, false) {
profilingInfo_.enabled_ = true; profilingInfo_.enabled_ = true;
profilingInfo_.callback_ = nullptr; profilingInfo_.callback_ = nullptr;
profilingInfo_.start_ = profilingInfo_.end_ = 0; profilingInfo_.start_ = profilingInfo_.end_ = 0;
api/hip/hip_stream.cpp
+1 -2
View File
@@ -244,8 +244,7 @@ hipError_t hipStreamQuery(hipStream_t stream) {
} }
amd::Event& event = command->event(); amd::Event& event = command->event();
if (command->type() != 0) {
if (command->type() != CL_COMMAND_MARKER) {
event.notifyCmdQueue(); event.notifyCmdQueue();
} }
HIP_RETURN((command->status() == CL_COMPLETE) ? hipSuccess : hipErrorNotReady); HIP_RETURN((command->status() == CL_COMPLETE) ? hipSuccess : hipErrorNotReady);