From 66ee5bd3c46a0896a8d5aac85b11024975a1a176 Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Tue, 3 Aug 2021 18:10:53 +0000 Subject: [PATCH] Correct typo Signed-off-by: Filip Hazubski --- opencl/source/kernel/kernel.cpp | 16 ++++++++-------- opencl/source/kernel/kernel.h | 4 ++-- opencl/test/unit_test/kernel/kernel_tests.cpp | 14 +++++++------- opencl/test/unit_test/mocks/mock_kernel.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index 1f55f71351..45fcc6af34 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -1102,7 +1102,7 @@ void Kernel::performKernelTuning(CommandStreamReceiver &commandStreamReceiver, c } if (performTunning == TunningType::SIMPLE) { - this->singleSubdevicePreferedInCurrentEnqueue = !this->kernelInfo.kernelDescriptor.kernelAttributes.flags.useGlobalAtomics; + this->singleSubdevicePreferredInCurrentEnqueue = !this->kernelInfo.kernelDescriptor.kernelAttributes.flags.useGlobalAtomics; } else if (performTunning == TunningType::FULL) { KernelConfig config{gws, lws, offsets}; @@ -1115,14 +1115,14 @@ void Kernel::performKernelTuning(CommandStreamReceiver &commandStreamReceiver, c submissionData.status = TunningStatus::STANDARD_TUNNING_IN_PROGRESS; submissionData.kernelStandardTimestamps->assignAndIncrementNodesRefCounts(*timestampContainer); this->kernelSubmissionMap[config] = std::move(submissionData); - this->singleSubdevicePreferedInCurrentEnqueue = false; + this->singleSubdevicePreferredInCurrentEnqueue = false; return; } auto &submissionData = submissionDataIt->second; if (submissionData.status == TunningStatus::TUNNING_DONE) { - this->singleSubdevicePreferedInCurrentEnqueue = submissionData.singleSubdevicePrefered; + this->singleSubdevicePreferredInCurrentEnqueue = submissionData.singleSubdevicePreferred; } if (submissionData.status == TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS) { @@ -1130,16 +1130,16 @@ void Kernel::performKernelTuning(CommandStreamReceiver &commandStreamReceiver, c submissionData.status = TunningStatus::TUNNING_DONE; submissionData.kernelStandardTimestamps.reset(); submissionData.kernelSubdeviceTimestamps.reset(); - this->singleSubdevicePreferedInCurrentEnqueue = submissionData.singleSubdevicePrefered; + this->singleSubdevicePreferredInCurrentEnqueue = submissionData.singleSubdevicePreferred; } else { - this->singleSubdevicePreferedInCurrentEnqueue = false; + this->singleSubdevicePreferredInCurrentEnqueue = false; } } if (submissionData.status == TunningStatus::STANDARD_TUNNING_IN_PROGRESS) { submissionData.status = TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS; submissionData.kernelSubdeviceTimestamps->assignAndIncrementNodesRefCounts(*timestampContainer); - this->singleSubdevicePreferedInCurrentEnqueue = true; + this->singleSubdevicePreferredInCurrentEnqueue = true; } } } @@ -1159,7 +1159,7 @@ bool Kernel::hasTunningFinished(KernelSubmissionData &submissionData) { Event::getBoundaryTimestampValues(submissionData.kernelSubdeviceTimestamps.get(), globalStartTS, globalEndTS); auto subdeviceTSDiff = globalEndTS - globalStartTS; - submissionData.singleSubdevicePrefered = standardTSDiff > subdeviceTSDiff; + submissionData.singleSubdevicePreferred = standardTSDiff > subdeviceTSDiff; return true; } @@ -1176,7 +1176,7 @@ bool Kernel::hasRunFinished(TimestampPacketContainer *timestampContainer) { } bool Kernel::isSingleSubdevicePreferred() const { - return this->singleSubdevicePreferedInCurrentEnqueue; + return this->singleSubdevicePreferredInCurrentEnqueue; } void Kernel::makeResident(CommandStreamReceiver &commandStreamReceiver) { diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h index b17961264b..d51b1aec77 100644 --- a/opencl/source/kernel/kernel.h +++ b/opencl/source/kernel/kernel.h @@ -613,14 +613,14 @@ class Kernel : public ReferenceTrackedObject { std::unique_ptr kernelStandardTimestamps; std::unique_ptr kernelSubdeviceTimestamps; TunningStatus status; - bool singleSubdevicePrefered = false; + bool singleSubdevicePreferred = false; }; bool hasTunningFinished(KernelSubmissionData &submissionData); bool hasRunFinished(TimestampPacketContainer *timestampContainer); std::unordered_map kernelSubmissionMap; - bool singleSubdevicePreferedInCurrentEnqueue = false; + bool singleSubdevicePreferredInCurrentEnqueue = false; bool kernelHasIndirectAccess = true; MultiDeviceKernel *pMultiDeviceKernel = nullptr; diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 477cb6eabf..4e7194af92 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -1941,21 +1941,21 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK result = mockKernel.mockKernel->kernelSubmissionMap.find(config); EXPECT_NE(result, mockKernel.mockKernel->kernelSubmissionMap.end()); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::STANDARD_TUNNING_IN_PROGRESS); - EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); mockKernel.mockKernel->performKernelTuning(commandStreamReceiver, lws, gws, offsets, &subdeviceContainer); result = mockKernel.mockKernel->kernelSubmissionMap.find(config); EXPECT_NE(result, mockKernel.mockKernel->kernelSubmissionMap.end()); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS); - EXPECT_TRUE(mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_TRUE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); mockKernel.mockKernel->performKernelTuning(commandStreamReceiver, lws, gws, offsets, &container); result = mockKernel.mockKernel->kernelSubmissionMap.find(config); EXPECT_NE(result, mockKernel.mockKernel->kernelSubmissionMap.end()); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS); - EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); uint32_t data[4] = {static_cast(container.getNode(0u)->getContextStartValue(0)), static_cast(container.getNode(0u)->getGlobalStartValue(0)), @@ -1968,7 +1968,7 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK result = mockKernel.mockKernel->kernelSubmissionMap.find(config); EXPECT_NE(result, mockKernel.mockKernel->kernelSubmissionMap.end()); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS); - EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); data[0] = static_cast(subdeviceContainer.getNode(0u)->getContextStartValue(0)); data[1] = static_cast(subdeviceContainer.getNode(0u)->getGlobalStartValue(0)); @@ -1984,7 +1984,7 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK EXPECT_NE(result->second.kernelStandardTimestamps.get(), nullptr); EXPECT_NE(result->second.kernelSubdeviceTimestamps.get(), nullptr); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::SUBDEVICE_TUNNING_IN_PROGRESS); - EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_FALSE(mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); data[0] = static_cast(subdeviceContainer.getNode(1u)->getContextStartValue(0)); data[1] = static_cast(subdeviceContainer.getNode(1u)->getGlobalStartValue(0)); @@ -2000,13 +2000,13 @@ HWTEST_F(KernelResidencyTest, givenEnableFullKernelTuningWhenPerformTunningThenK EXPECT_EQ(result->second.kernelStandardTimestamps.get(), nullptr); EXPECT_EQ(result->second.kernelSubdeviceTimestamps.get(), nullptr); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::TUNNING_DONE); - EXPECT_EQ(result->second.singleSubdevicePrefered, mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_EQ(result->second.singleSubdevicePreferred, mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); mockKernel.mockKernel->performKernelTuning(commandStreamReceiver, lws, gws, offsets, &container); result = mockKernel.mockKernel->kernelSubmissionMap.find(config); EXPECT_NE(result, mockKernel.mockKernel->kernelSubmissionMap.end()); EXPECT_EQ(result->second.status, MockKernel::TunningStatus::TUNNING_DONE); - EXPECT_EQ(result->second.singleSubdevicePrefered, mockKernel.mockKernel->singleSubdevicePreferedInCurrentEnqueue); + EXPECT_EQ(result->second.singleSubdevicePreferred, mockKernel.mockKernel->singleSubdevicePreferredInCurrentEnqueue); } HWTEST_F(KernelResidencyTest, givenSimpleKernelTunningAndNoAtomicsWhenPerformTunningThenSingleSubdeviceIsPreferred) { diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index 95ba5e861a..fdbec23583 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -125,7 +125,7 @@ class MockKernel : public Kernel { using Kernel::patchWithImplicitSurface; using Kernel::preferredWkgMultipleOffset; using Kernel::privateSurface; - using Kernel::singleSubdevicePreferedInCurrentEnqueue; + using Kernel::singleSubdevicePreferredInCurrentEnqueue; using Kernel::svmAllocationsRequireCacheFlush; using Kernel::threadArbitrationPolicy; using Kernel::unifiedMemoryControls;