From dc9b2351d5bc2f2e1c1b5223eaa88a72ac8b73ab Mon Sep 17 00:00:00 2001 From: Dominik Dabek Date: Mon, 5 Jul 2021 16:11:12 +0000 Subject: [PATCH] Change patchGlobalOffset in l0 kernel to void Signed-off-by: Dominik Dabek --- level_zero/core/source/kernel/kernel.h | 2 +- level_zero/core/source/kernel/kernel_imp.cpp | 4 ++-- level_zero/core/source/kernel/kernel_imp.h | 2 +- .../core/test/unit_tests/sources/kernel/test_kernel.cpp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/level_zero/core/source/kernel/kernel.h b/level_zero/core/source/kernel/kernel.h index 12de30870e..aff4c9b83a 100644 --- a/level_zero/core/source/kernel/kernel.h +++ b/level_zero/core/source/kernel/kernel.h @@ -114,7 +114,7 @@ struct Kernel : _ze_kernel_handle_t, virtual NEO::DispatchKernelEncoderI { virtual uint32_t *getGlobalOffsets() = 0; virtual ze_result_t setGlobalOffsetExp(uint32_t offsetX, uint32_t offsetY, uint32_t offsetZ) = 0; - virtual uint32_t patchGlobalOffset() = 0; + virtual void patchGlobalOffset() = 0; virtual void patchWorkDim(uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) = 0; diff --git a/level_zero/core/source/kernel/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp index eba6c1c99d..40e44b730f 100644 --- a/level_zero/core/source/kernel/kernel_imp.cpp +++ b/level_zero/core/source/kernel/kernel_imp.cpp @@ -883,10 +883,10 @@ ze_result_t KernelImp::setGlobalOffsetExp(uint32_t offsetX, return ZE_RESULT_SUCCESS; } -uint32_t KernelImp::patchGlobalOffset() { +void KernelImp::patchGlobalOffset() { const NEO::KernelDescriptor &desc = kernelImmData->getDescriptor(); auto dst = ArrayRef(crossThreadData.get(), crossThreadDataSize); - return NEO::patchVecNonPointer(dst, desc.payloadMappings.dispatchTraits.globalWorkOffset, this->globalOffsets); + NEO::patchVecNonPointer(dst, desc.payloadMappings.dispatchTraits.globalWorkOffset, this->globalOffsets); } void KernelImp::patchWorkDim(uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) { diff --git a/level_zero/core/source/kernel/kernel_imp.h b/level_zero/core/source/kernel/kernel_imp.h index d1a5c6bfcc..a2786d7f0c 100644 --- a/level_zero/core/source/kernel/kernel_imp.h +++ b/level_zero/core/source/kernel/kernel_imp.h @@ -124,7 +124,7 @@ struct KernelImp : Kernel { return this->globalOffsets; } ze_result_t setGlobalOffsetExp(uint32_t offsetX, uint32_t offsetY, uint32_t offsetZ) override; - uint32_t patchGlobalOffset() override; + void patchGlobalOffset() override; void patchWorkDim(uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) override; diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index 2577c3b1f6..afa50ca7df 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -1814,8 +1814,7 @@ HWTEST_F(KernelGlobalWorkOffsetTests, whenSettingGlobalOffsetThenCrossThreadData EXPECT_EQ(ZE_RESULT_SUCCESS, res); KernelImp *kernelImp = static_cast(kernel); - uint32_t patchedCount = kernelImp->patchGlobalOffset(); - EXPECT_EQ(patchedCount, 3u); + kernelImp->patchGlobalOffset(); const NEO::KernelDescriptor &desc = kernelImp->getImmutableData()->getDescriptor(); auto dst = ArrayRef(kernelImp->getCrossThreadData(), kernelImp->getCrossThreadDataSize());