From 0abf2b20af868758eee16c9b94d244b59e83f866 Mon Sep 17 00:00:00 2001 From: Maciej Plewka Date: Tue, 4 Aug 2020 14:18:31 +0200 Subject: [PATCH] Update mock dispatch kernel encoder Releated-To: NEO-4568 Change-Id: I0e0c5308d7cc73a0295ec094001d75bb08f4ac0f Signed-off-by: Maciej Plewka --- level_zero/core/source/kernel/kernel_imp.h | 2 +- .../mocks/mock_dispatch_kernel_encoder_interface.cpp | 1 - .../unit_test/mocks/mock_dispatch_kernel_encoder_interface.h | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/level_zero/core/source/kernel/kernel_imp.h b/level_zero/core/source/kernel/kernel_imp.h index f3bb60cfe5..b5b1dfaaf4 100644 --- a/level_zero/core/source/kernel/kernel_imp.h +++ b/level_zero/core/source/kernel/kernel_imp.h @@ -127,7 +127,7 @@ struct KernelImp : Kernel { NEO::GraphicsAllocation *printfBuffer = nullptr; uint32_t groupSize[3] = {0u, 0u, 0u}; - uint32_t numThreadsPerThreadGroup = 0u; + uint32_t numThreadsPerThreadGroup = 1u; uint32_t threadExecutionMask = 0u; std::unique_ptr crossThreadData = 0; diff --git a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp index 32cdea0dc9..d024c43bbe 100644 --- a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp +++ b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp @@ -34,7 +34,6 @@ void MockDispatchKernelEncoder::expectAnyMockFunctionCall() { EXPECT_CALL(*this, getSlmTotalSize()).Times(::testing::AnyNumber()); EXPECT_CALL(*this, getThreadExecutionMask()).Times(::testing::AnyNumber()); - EXPECT_CALL(*this, getNumThreadsPerThreadGroup()).Times(::testing::AnyNumber()); EXPECT_CALL(*this, getPerThreadDataSizeForWholeThreadGroup()).Times(::testing::AnyNumber()); EXPECT_CALL(*this, getSurfaceStateHeapData()).Times(::testing::AnyNumber()); diff --git a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h index d506ec0f75..d13795365b 100644 --- a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h +++ b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h @@ -31,7 +31,6 @@ struct MockDispatchKernelEncoder : public DispatchKernelEncoderI { MOCK_METHOD(uint32_t, getCrossThreadDataSize, (), (const, override)); MOCK_METHOD(uint32_t, getThreadExecutionMask, (), (const, override)); - MOCK_METHOD(uint32_t, getNumThreadsPerThreadGroup, (), (const, override)); MOCK_METHOD(const uint8_t *, getPerThreadData, (), (const, override)); MOCK_METHOD(uint32_t, getPerThreadDataSize, (), (const, override)); @@ -49,6 +48,9 @@ struct MockDispatchKernelEncoder : public DispatchKernelEncoderI { uint32_t getRequiredWorkgroupOrder() const override { return requiredWalkGroupOrder; } + uint32_t getNumThreadsPerThreadGroup() const override { + return 1; + } void expectAnyMockFunctionCall();