intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Wait on timestamps in Event::wait"

Browse Source 
This reverts commit 5d4aca361f.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-09-02 02:11:53 +02:00
committed by Compute-Runtime-Automation
parent b04c226767
commit 572fc24cf5
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opencl/source/event/event.cpp
View File

@@ -428,8 +428,7 @@ inline WaitStatus Event::wait(bool blocking, bool useQuickKmdSleep) {
} }
Range<CopyEngineState> states{&bcsState, bcsState.isValid() ? 1u : 0u}; Range<CopyEngineState> states{&bcsState, bcsState.isValid() ? 1u : 0u};
auto waitedOnTimestamps = cmdQueue->waitForTimestamps(states, taskCount.load()); const auto waitStatus = cmdQueue->waitUntilComplete(taskCount.load(), states, flushStamp->peekStamp(), useQuickKmdSleep);
const auto waitStatus = cmdQueue->waitUntilComplete(taskCount.load(), states, flushStamp->peekStamp(), useQuickKmdSleep, true, waitedOnTimestamps);
if (waitStatus == WaitStatus::GpuHang) { if (waitStatus == WaitStatus::GpuHang) {
return WaitStatus::GpuHang; return WaitStatus::GpuHang;
} }

10
opencl/test/unit_test/event/event_tests.cpp
View File

@@ -909,16 +909,6 @@ TEST_F(InternalsEventTest, givenPassingEventWhenWaitingForEventsThenWaititingIsS
EXPECT_NE(Event::executionAbortedDueToGpuHang, passingEvent.peekExecutionStatus()); EXPECT_NE(Event::executionAbortedDueToGpuHang, passingEvent.peekExecutionStatus());
} }
TEST_F(InternalsEventTest, givenEventWhenWaitThenWaitForTimestampsCalled) {
MockCommandQueue cmdQ(mockContext, pClDevice, nullptr, false);
MockEvent<Event> event(&cmdQ, CL_COMMAND_NDRANGE_KERNEL, 0, 0);
EXPECT_FALSE(cmdQ.waitForTimestampsCalled);
event.wait(false, false);
EXPECT_TRUE(cmdQ.waitForTimestampsCalled);
}
TEST_F(InternalsEventTest, GivenProfilingWHENMapOperationTHENTimesSet) { TEST_F(InternalsEventTest, GivenProfilingWHENMapOperationTHENTimesSet) {
const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_PROFILING_ENABLE, 0}; const cl_queue_properties props[3] = {CL_QUEUE_PROPERTIES, CL_QUEUE_PROFILING_ENABLE, 0};
MockCommandQueue *pCmdQ = new MockCommandQueue(mockContext, pClDevice, props, false); MockCommandQueue *pCmdQ = new MockCommandQueue(mockContext, pClDevice, props, false);

7
opencl/test/unit_test/mocks/mock_command_queue.h
View File

@@ -212,13 +212,10 @@ class MockCommandQueue : public CommandQueue {
bool obtainTimestampPacketForCacheFlush(bool isCacheFlushRequired) const override { return isCacheFlushRequired; } bool obtainTimestampPacketForCacheFlush(bool isCacheFlushRequired) const override { return isCacheFlushRequired; }
bool waitForTimestamps(Range<CopyEngineState> copyEnginesToWait, uint32_t taskCount) override { bool waitForTimestamps(Range<CopyEngineState> copyEnginesToWait, uint32_t taskCount) override { return false; };
waitForTimestampsCalled = true;
return false;
};
bool releaseIndirectHeapCalled = false; bool releaseIndirectHeapCalled = false;
bool waitForTimestampsCalled = false;
cl_int writeBufferRetValue = CL_SUCCESS; cl_int writeBufferRetValue = CL_SUCCESS;
uint32_t writeBufferCounter = 0; uint32_t writeBufferCounter = 0;
bool writeBufferBlocking = false; bool writeBufferBlocking = false;