Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use dedicated using type for TaskCount

Browse Source 
Related-To: NEO-7155

Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
This commit is contained in:
Maciej Plewka
2022-11-22 13:53:59 +00:00
committed by Compute-Runtime-Automation
parent 3f962bf3e8
commit 4b42b066f8
146 changed files with 568 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/test/unit_test/event/async_events_handler_tests.cpp
View File

@ -26,7 +26,7 @@ class AsyncEventsHandlerTests : public ::testing::Test {
public:
class MyEvent : public Event {
public:
MyEvent(Context *ctx, CommandQueue *cmdQueue, cl_command_type cmdType, uint32_t taskLevel, uint32_t taskCount)
MyEvent(Context *ctx, CommandQueue *cmdQueue, cl_command_type cmdType, TaskCountType taskLevel, TaskCountType taskCount)
: Event(ctx, cmdQueue, cmdType, taskLevel, taskCount) {
handler.reset(new MockHandler());
}
@ -34,7 +34,7 @@ class AsyncEventsHandlerTests : public ::testing::Test {
//return execution status without updating
return executionStatus.load();
}
void setTaskStamp(uint32_t taskLevel, uint32_t taskCount) {
void setTaskStamp(TaskCountType taskLevel, TaskCountType taskCount) {
this->taskLevel.store(taskLevel);
this->updateTaskCount(taskCount, 0);
}

4
opencl/test/unit_test/event/event_fixture.h
View File

@ -69,13 +69,13 @@ struct MyUserEvent : public VirtualEvent {
WaitStatus wait(bool blocking, bool quickKmdSleep) override {
return VirtualEvent::wait(blocking, quickKmdSleep);
};
uint32_t getTaskLevel() override {
TaskCountType getTaskLevel() override {
return VirtualEvent::getTaskLevel();
};
};
struct MyEvent : public Event {
MyEvent(CommandQueue *cmdQueue, cl_command_type cmdType, uint32_t taskLevel, uint32_t taskCount)
MyEvent(CommandQueue *cmdQueue, cl_command_type cmdType, TaskCountType taskLevel, TaskCountType taskCount)
: Event(cmdQueue, cmdType, taskLevel, taskCount) {
}
TimeStampData getQueueTimeStamp() {

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

@ -102,7 +102,7 @@ TEST(Event, WhenGettingTaskLevelThenCorrectTaskLevelIsReturned) {
public:
TempEvent() : Event(nullptr, CL_COMMAND_NDRANGE_KERNEL, 5, 7){};
uint32_t getTaskLevel() override {
TaskCountType getTaskLevel() override {
return Event::getTaskLevel();
}
};
@ -272,7 +272,7 @@ TEST_F(EventTest, WhenGettingClEventCommandExecutionStatusThenCorrectSizeIsRetur
TEST_F(EventTest, GivenTagCsLessThanTaskCountWhenGettingClEventCommandExecutionStatusThenClSubmittedIsReturned) {
uint32_t tagHW = 4;
uint32_t taskCount = 5;
TaskCountType taskCount = 5;
*pTagMemory = tagHW;
Event event(pCmdQ, CL_COMMAND_NDRANGE_KERNEL, 3, taskCount);
@ -288,7 +288,7 @@ TEST_F(EventTest, GivenTagCsLessThanTaskCountWhenGettingClEventCommandExecutionS
TEST_F(EventTest, GivenTagCsEqualTaskCountWhenGettingClEventCommandExecutionStatusThenClCompleteIsReturned) {
uint32_t tagHW = 5;
uint32_t taskCount = 5;
TaskCountType taskCount = 5;
*pTagMemory = tagHW;
Event event(pCmdQ, CL_COMMAND_NDRANGE_KERNEL, 3, taskCount);
@ -304,7 +304,7 @@ TEST_F(EventTest, GivenTagCsEqualTaskCountWhenGettingClEventCommandExecutionStat
TEST_F(EventTest, GivenTagCsGreaterThanTaskCountWhenGettingClEventCommandExecutionStatusThenClCompleteIsReturned) {
uint32_t tagHW = 6;
uint32_t taskCount = 5;
TaskCountType taskCount = 5;
*pTagMemory = tagHW;
Event event(pCmdQ, CL_COMMAND_NDRANGE_KERNEL, 3, taskCount);
@ -1032,7 +1032,7 @@ class MockCommand : public Command {
public:
using Command::Command;
CompletionStamp &submit(uint32_t taskLevel, bool terminated) override {
CompletionStamp &submit(TaskCountType taskLevel, bool terminated) override {
return completionStamp;
}
};
@ -1173,8 +1173,8 @@ HWTEST_F(EventTest, givenVirtualEventWhenCommandSubmittedThenLockCsrOccurs) {
public:
using Event::submitCommand;
MockEvent(CommandQueue *cmdQueue, cl_command_type cmdType,
uint32_t taskLevel, uint32_t taskCount) : Event(cmdQueue, cmdType,
taskLevel, taskCount) {}
TaskCountType taskLevel, TaskCountType taskCount) : Event(cmdQueue, cmdType,
taskLevel, taskCount) {}
};
MockKernelWithInternals kernel(*pClDevice);
@ -1207,8 +1207,8 @@ HWTEST_F(EventTest, givenVirtualEventWhenSubmitCommandEventNotReadyAndEventWitho
public:
using Event::submitCommand;
MockEvent(CommandQueue *cmdQueue, cl_command_type cmdType,
uint32_t taskLevel, uint32_t taskCount) : Event(cmdQueue, cmdType,
taskLevel, taskCount) {}
TaskCountType taskLevel, TaskCountType taskCount) : Event(cmdQueue, cmdType,
taskLevel, taskCount) {}
};
auto virtualEvent = makeReleaseable<MockEvent>(pCmdQ, CL_COMMAND_NDRANGE_KERNEL, CompletionStamp::notReady, CompletionStamp::notReady);
@ -1642,7 +1642,7 @@ struct TestEventCsr : public UltCommandStreamReceiver<GfxFamily> {
TestEventCsr(const ExecutionEnvironment &executionEnvironment, const DeviceBitfield deviceBitfield)
: UltCommandStreamReceiver<GfxFamily>(const_cast<ExecutionEnvironment &>(executionEnvironment), 0, deviceBitfield) {}
WaitStatus waitForCompletionWithTimeout(const WaitParams &params, uint32_t taskCountToWait) override {
WaitStatus waitForCompletionWithTimeout(const WaitParams &params, TaskCountType taskCountToWait) override {
waitForCompletionWithTimeoutCalled++;
waitForCompletionWithTimeoutParamsPassed.push_back({params.enableTimeout, params.waitTimeout, taskCountToWait});
return waitForCompletionWithTimeoutResult;
@ -1651,7 +1651,7 @@ struct TestEventCsr : public UltCommandStreamReceiver<GfxFamily> {
struct WaitForCompletionWithTimeoutParams {
bool enableTimeout = false;
int64_t timeoutMs{};
uint32_t taskCountToWait{};
TaskCountType taskCountToWait{};
};
uint32_t waitForCompletionWithTimeoutCalled = 0u;