From 2e2abf1b6ecfd24ef308bbeccaffa76a9f1c3bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Zwoli=C5=84ski?= Date: Tue, 3 Jan 2023 13:40:50 +0100 Subject: [PATCH] Revert "Use cached group sizes in zeKernelSetGroupSize" This reverts commit 7ec94c6aaab1021b02689ca578fc01a19cd68965. Signed-off-by: Fabian Zwolinski --- level_zero/core/source/kernel/kernel_imp.cpp | 6 --- .../unit_tests/sources/kernel/test_kernel.cpp | 50 ------------------- 2 files changed, 56 deletions(-) diff --git a/level_zero/core/source/kernel/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp index bfc9540ce0..a67fef2aba 100644 --- a/level_zero/core/source/kernel/kernel_imp.cpp +++ b/level_zero/core/source/kernel/kernel_imp.cpp @@ -271,12 +271,6 @@ ze_result_t KernelImp::setGroupSize(uint32_t groupSizeX, uint32_t groupSizeY, return ZE_RESULT_ERROR_INVALID_ARGUMENT; } - if (this->groupSize[0] == groupSizeX && - this->groupSize[1] == groupSizeY && - this->groupSize[2] == groupSizeZ) { - return ZE_RESULT_SUCCESS; - } - auto numChannels = kernelImmData->getDescriptor().kernelAttributes.numLocalIdChannels; Vec3 groupSize{groupSizeX, groupSizeY, groupSizeZ}; auto itemsInGroup = Math::computeTotalElementsCount(groupSize); 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 98e99bba50..bead9c24ee 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 @@ -136,18 +136,6 @@ struct MockKernelWithCallTracking : Mock<::L0::Kernel> { return KernelImp::setArgBufferWithAlloc(argIndex, argVal, allocation); } size_t setArgBufferWithAllocCalled = 0u; - - ze_result_t setGroupSize(uint32_t groupSizeX, uint32_t groupSizeY, uint32_t groupSizeZ) override { - if (this->groupSize[0] == groupSizeX && - this->groupSize[1] == groupSizeY && - this->groupSize[2] == groupSizeZ) { - setGroupSizeSkipCount++; - } else { - setGroupSizeSkipCount = 0u; - } - return KernelImp::setGroupSize(groupSizeX, groupSizeY, groupSizeZ); - } - size_t setGroupSizeSkipCount = 0u; }; using SetKernelArgCacheTest = Test; @@ -324,44 +312,6 @@ TEST_F(KernelImpSetGroupSizeTest, givenZeroGroupSizeWhenSettingGroupSizeThenInva EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, ret); } -TEST_F(KernelImpSetGroupSizeTest, givenValidGroupSizeWhenSetMultipleTimesThenSetGroupSizeIsOnlyExecutedIfNeeded) { - MockKernelWithCallTracking mockKernel; - Mock mockModule(this->device, nullptr); - mockKernel.module = &mockModule; - - // First call with {2u, 3u, 5u} group size - don't skip setGroupSize execution - auto ret = mockKernel.setGroupSize(2u, 3u, 5u); - EXPECT_EQ(2u, mockKernel.groupSize[0]); - EXPECT_EQ(3u, mockKernel.groupSize[1]); - EXPECT_EQ(5u, mockKernel.groupSize[2]); - EXPECT_EQ(0u, mockKernel.setGroupSizeSkipCount); - EXPECT_EQ(ZE_RESULT_SUCCESS, ret); - - // Second call with {2u, 3u, 5u} group size - skip setGroupSize execution - ret = mockKernel.setGroupSize(2u, 3u, 5u); - EXPECT_EQ(2u, mockKernel.groupSize[0]); - EXPECT_EQ(3u, mockKernel.groupSize[1]); - EXPECT_EQ(5u, mockKernel.groupSize[2]); - EXPECT_EQ(1u, mockKernel.setGroupSizeSkipCount); - EXPECT_EQ(ZE_RESULT_SUCCESS, ret); - - // First call with {1u, 2u, 3u} group size - don't skip setGroupSize execution - ret = mockKernel.setGroupSize(1u, 2u, 3u); - EXPECT_EQ(1u, mockKernel.groupSize[0]); - EXPECT_EQ(2u, mockKernel.groupSize[1]); - EXPECT_EQ(3u, mockKernel.groupSize[2]); - EXPECT_EQ(0u, mockKernel.setGroupSizeSkipCount); - EXPECT_EQ(ZE_RESULT_SUCCESS, ret); - - // Second call with {1u, 2u, 3u} group size - skip setGroupSize execution - ret = mockKernel.setGroupSize(1u, 2u, 3u); - EXPECT_EQ(1u, mockKernel.groupSize[0]); - EXPECT_EQ(2u, mockKernel.groupSize[1]); - EXPECT_EQ(3u, mockKernel.groupSize[2]); - EXPECT_EQ(1u, mockKernel.setGroupSizeSkipCount); - EXPECT_EQ(ZE_RESULT_SUCCESS, ret); -} - using SetKernelArg = Test; using ImageSupport = IsWithinProducts;