diff --git a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl index 7c09475ee7..63f0b999f5 100644 --- a/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl +++ b/opencl/source/helpers/hardware_commands_helper_bdw_and_later.inl @@ -122,7 +122,7 @@ size_t HardwareCommandsHelper::sendCrossThreadData( auto ptrToPatchImplicitArgs = indirectHeap.getSpace(sizeForImplicitArgsProgramming); ImplicitArgsHelper::patchImplicitArgs(ptrToPatchImplicitArgs, *pImplicitArgs, kernelDescriptor, hwInfo, {}); - auto implicitArgsCrossThreadPtr = ptrOffset(reinterpret_cast(kernel.getCrossThreadData()), kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + auto implicitArgsCrossThreadPtr = ptrOffset(reinterpret_cast(kernel.getCrossThreadData()), kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); *implicitArgsCrossThreadPtr = implicitArgsGpuVA; } auto offsetCrossThreadData = indirectHeap.getUsed(); diff --git a/shared/source/command_container/command_encoder_bdw_and_later.inl b/shared/source/command_container/command_encoder_bdw_and_later.inl index 65602e0b1d..cad7d96953 100644 --- a/shared/source/command_container/command_encoder_bdw_and_later.inl +++ b/shared/source/command_container/command_encoder_bdw_and_later.inl @@ -144,7 +144,7 @@ void EncodeDispatchKernel::encode(CommandContainer &container, uint64_t implicitArgsGpuVA = 0u; if (pImplicitArgs) { implicitArgsGpuVA = heapIndirect->getGraphicsAllocation()->getGpuAddress() + static_cast(heapIndirect->getUsed() - iohRequiredSize); - auto implicitArgsCrossThreadPtr = ptrOffset(const_cast(reinterpret_cast(args.dispatchInterface->getCrossThreadData())), kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + auto implicitArgsCrossThreadPtr = ptrOffset(const_cast(reinterpret_cast(args.dispatchInterface->getCrossThreadData())), kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); *implicitArgsCrossThreadPtr = implicitArgsGpuVA; ptr = NEO::ImplicitArgsHelper::patchImplicitArgs(ptr, *pImplicitArgs, kernelDescriptor, hwInfo, {}); diff --git a/shared/source/device_binary_format/zebin_decoder.cpp b/shared/source/device_binary_format/zebin_decoder.cpp index 3d0c82f1ed..df67b2dfe1 100644 --- a/shared/source/device_binary_format/zebin_decoder.cpp +++ b/shared/source/device_binary_format/zebin_decoder.cpp @@ -907,7 +907,7 @@ NEO::DecodeError populateArgDescriptor(const NEO::Elf::ZebinKernelMetadata::Type break; } case NEO::Elf::ZebinKernelMetadata::Types::Kernel::ArgTypeImplicitArgBuffer: { - dst.payloadMappings.implicitArgs.implcitArgsBuffer = src.offset; + dst.payloadMappings.implicitArgs.implicitArgsBuffer = src.offset; dst.kernelAttributes.flags.requiresImplicitArgs = true; break; } diff --git a/shared/source/kernel/implicit_args_helper.cpp b/shared/source/kernel/implicit_args_helper.cpp index 6ba9baae1a..d39a098811 100644 --- a/shared/source/kernel/implicit_args_helper.cpp +++ b/shared/source/kernel/implicit_args_helper.cpp @@ -45,7 +45,7 @@ uint32_t getSizeForImplicitArgsPatching(const ImplicitArgs *pImplicitArgs, const return 0; } auto implicitArgsSize = static_cast(sizeof(NEO::ImplicitArgs)); - auto patchImplicitArgsBufferInCrossThread = NEO::isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + auto patchImplicitArgsBufferInCrossThread = NEO::isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); if (patchImplicitArgsBufferInCrossThread) { return alignUp(implicitArgsSize, MemoryConstants::cacheLineSize); } else { @@ -66,7 +66,7 @@ void *patchImplicitArgs(void *ptrToPatch, const ImplicitArgs &implicitArgs, cons auto totalSizeToProgram = getSizeForImplicitArgsPatching(&implicitArgs, kernelDescriptor, hardwareInfo); auto retVal = ptrOffset(ptrToPatch, totalSizeToProgram); - auto patchImplicitArgsBufferInCrossThread = NEO::isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + auto patchImplicitArgsBufferInCrossThread = NEO::isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); if (!patchImplicitArgsBufferInCrossThread) { auto simdSize = implicitArgs.simdWidth; auto grfSize = getGrfSize(simdSize, hardwareInfo.capabilityTable.grfSize); diff --git a/shared/source/kernel/kernel_descriptor.h b/shared/source/kernel/kernel_descriptor.h index fd474da980..4664f367ca 100644 --- a/shared/source/kernel/kernel_descriptor.h +++ b/shared/source/kernel/kernel_descriptor.h @@ -266,7 +266,7 @@ struct KernelDescriptor { CrossThreadDataOffset preferredWkgMultiple = undefined; CrossThreadDataOffset localMemoryStatelessWindowSize = undefined; CrossThreadDataOffset localMemoryStatelessWindowStartAddres = undefined; - CrossThreadDataOffset implcitArgsBuffer = undefined; + CrossThreadDataOffset implicitArgsBuffer = undefined; } implicitArgs; std::vector> explicitArgsExtendedDescriptors; diff --git a/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp b/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp index 0abe5d60f2..28df76a8f5 100644 --- a/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp +++ b/shared/source/kernel/kernel_descriptor_from_patchtokens.cpp @@ -510,7 +510,7 @@ void populateKernelDescriptor(KernelDescriptor &dst, const PatchTokenBinary::Ker dst.payloadMappings.implicitArgs.privateMemorySize = getOffset(src.tokens.crossThreadPayloadArgs.privateMemoryStatelessSize); dst.payloadMappings.implicitArgs.localMemoryStatelessWindowSize = getOffset(src.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowSize); dst.payloadMappings.implicitArgs.localMemoryStatelessWindowStartAddres = getOffset(src.tokens.crossThreadPayloadArgs.localMemoryStatelessWindowStartAddress); - dst.payloadMappings.implicitArgs.implcitArgsBuffer = getOffset(src.tokens.crossThreadPayloadArgs.implicitArgsBufferOffset); + dst.payloadMappings.implicitArgs.implicitArgsBuffer = getOffset(src.tokens.crossThreadPayloadArgs.implicitArgsBufferOffset); if (src.tokens.gtpinInfo) { dst.external.igcInfoForGtpin = (src.tokens.gtpinInfo + 1); diff --git a/shared/test/common/helpers/unit_test_helper_bdw_and_later.inl b/shared/test/common/helpers/unit_test_helper_bdw_and_later.inl index 82260f7295..3963bc5476 100644 --- a/shared/test/common/helpers/unit_test_helper_bdw_and_later.inl +++ b/shared/test/common/helpers/unit_test_helper_bdw_and_later.inl @@ -64,6 +64,6 @@ inline void UnitTestHelper::setPipeControlHdcPipelineFlush(typename G template inline void UnitTestHelper::adjustKernelDescriptorForImplicitArgs(KernelDescriptor &kernelDescriptor) { kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs = true; - kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer = 0u; + kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer = 0u; } } // namespace NEO diff --git a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp index 0ba76ddbd7..c7cea75a93 100644 --- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp @@ -4919,7 +4919,7 @@ kernels: EXPECT_EQ(NEO::DecodeError::Success, err); EXPECT_TRUE(errors.empty()) << errors; EXPECT_TRUE(warnings.empty()) << warnings; - EXPECT_EQ(4u, programInfo.kernelInfos[0]->kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + EXPECT_EQ(4u, programInfo.kernelInfos[0]->kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); EXPECT_TRUE(programInfo.kernelInfos[0]->kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs); } diff --git a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp index e60fa7925f..0c33bc9c1e 100644 --- a/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp +++ b/shared/test/unit_test/kernel/implicit_args_helper_tests.cpp @@ -65,7 +65,7 @@ TEST(ImplicitArgsHelperTest, givenImplicitArgsWithoutImplicitArgsBufferOffsetInP KernelDescriptor kernelDescriptor{}; - EXPECT_TRUE(isUndefinedOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer)); + EXPECT_TRUE(isUndefinedOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer)); const auto &hwInfo = *defaultHwInfo; implicitArgs.simdWidth = 32; @@ -83,8 +83,8 @@ TEST(ImplicitArgsHelperTest, givenImplicitArgsWithImplicitArgsBufferOffsetInPayl ImplicitArgs implicitArgs{sizeof(ImplicitArgs)}; KernelDescriptor kernelDescriptor{}; - kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer = 0x10; - EXPECT_TRUE(isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer)); + kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer = 0x10; + EXPECT_TRUE(isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer)); const auto &hwInfo = *defaultHwInfo; implicitArgs.simdWidth = 32; @@ -103,7 +103,7 @@ TEST(ImplicitArgsHelperTest, givenImplicitArgsWithoutImplicitArgsBufferOffsetInP kernelDescriptor.kernelAttributes.workgroupDimensionsOrder[1] = 1; kernelDescriptor.kernelAttributes.workgroupDimensionsOrder[2] = 2; - EXPECT_TRUE(isUndefinedOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer)); + EXPECT_TRUE(isUndefinedOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer)); const auto &hwInfo = *defaultHwInfo; implicitArgs.simdWidth = 1; @@ -145,8 +145,8 @@ TEST(ImplicitArgsHelperTest, givenImplicitArgsWithImplicitArgsBufferOffsetInPayl ImplicitArgs implicitArgs{sizeof(ImplicitArgs)}; KernelDescriptor kernelDescriptor{}; - kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer = 0x10; - EXPECT_TRUE(isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer)); + kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer = 0x10; + EXPECT_TRUE(isValidOffset<>(kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer)); const auto &hwInfo = *defaultHwInfo; implicitArgs.simdWidth = 32; diff --git a/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp b/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp index 7d79dd03db..0ae38dd3b7 100644 --- a/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp +++ b/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp @@ -1595,6 +1595,6 @@ TEST(KernelDescriptorFromPatchtokens, givenDataParameterImplArgBufferTokenWhenPo NEO::populateKernelDescriptor(kernelDescriptor, kernelTokens, 8); - EXPECT_EQ(offset, kernelDescriptor.payloadMappings.implicitArgs.implcitArgsBuffer); + EXPECT_EQ(offset, kernelDescriptor.payloadMappings.implicitArgs.implicitArgsBuffer); EXPECT_TRUE(kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs); } \ No newline at end of file