From 656428bc4fd082760d84c156c801e5f3305fa85a Mon Sep 17 00:00:00 2001 From: Roman Lyamin Date: Thu, 13 Apr 2023 15:55:05 +0400 Subject: [PATCH] [GPU] Skip kernel logic for Concat fix (#16885) --- .../kernels/concatenation/concatenation_kernel_base.cpp | 8 ++------ .../kernels/concatenation/concatenation_kernel_base.h | 1 - .../concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp | 2 +- src/plugins/intel_gpu/tests/test_cases/lstm_gpu_test.cpp | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.cpp index 12aebd30109..e67856c67c0 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.cpp +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.cpp @@ -109,10 +109,6 @@ ConcatenationKernelBase::DispatchData ConcatenationKernelBase::SetDefault(const return dispatchData; } -bool ConcatenationKernelBase::SkipKernelExecution(const concatenation_params& params, size_t kernel_id) const { - return params.inputs[kernel_id].LogicalSize() == 0; -} - KernelsData ConcatenationKernelBase::GetCommonKernelsData(const Params& params, const optional_params& options) const { if (!Validate(params, options)) { return {}; @@ -140,7 +136,7 @@ KernelsData ConcatenationKernelBase::GetCommonKernelsData(const Params& params, DispatchData dispatchData = SetDefault(newParams); kernel.params.workGroups.global = dispatchData.gws; kernel.params.workGroups.local = dispatchData.lws; - kernel.skip_execution = SkipKernelExecution(prim_params, i); + kernel.skip_execution = KernelData::SkipKernelExecution(newParams); ScalarDescriptor s; s.t = ScalarDescriptor::Types::UINT32; @@ -178,7 +174,7 @@ KernelsData ConcatenationKernelBase::GetCommonKernelsData(const Params& params, kernel.code.kernelString = GetKernelString(kernelName, jit, entryPoint, params.engineInfo); kernel.params.workGroups.global = dispatchData.gws; kernel.params.workGroups.local = dispatchData.lws; - kernel.skip_execution = SkipKernelExecution(newParams, i); + kernel.skip_execution = KernelData::SkipKernelExecution(newParams); if (is_dynamic) { kernel.params.arguments.push_back({ArgumentDescriptor::Types::SHAPE_INFO, 0}); } diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.h b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.h index 5274047a024..77511ea135f 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.h +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_base.h @@ -68,6 +68,5 @@ protected: virtual size_t GetAlignment(const concatenation_params& /*params*/) const { return 1; } - bool SkipKernelExecution(const concatenation_params& params, size_t kernel_id) const; }; } // namespace kernel_selector diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp index 3fb0fd01b35..b6e02828c3f 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp @@ -114,7 +114,7 @@ KernelsData ConcatenationKernel_fs_b_yx_fsv32::GetKernelsData(const Params& para kernel.params.workGroups.local = dispatchData.lws; kernel.params.arguments.push_back({ArgumentDescriptor::Types::INPUT, (uint32_t)i}); kernel.params.arguments.push_back({ArgumentDescriptor::Types::OUTPUT, 0}); - kernel.skip_execution = SkipKernelExecution(newParams, i); + kernel.skip_execution = KernelData::SkipKernelExecution(newParams); ScalarDescriptor s; s.t = ScalarDescriptor::Types::UINT32; diff --git a/src/plugins/intel_gpu/tests/test_cases/lstm_gpu_test.cpp b/src/plugins/intel_gpu/tests/test_cases/lstm_gpu_test.cpp index bb2a963370e..e96922a8213 100644 --- a/src/plugins/intel_gpu/tests/test_cases/lstm_gpu_test.cpp +++ b/src/plugins/intel_gpu/tests/test_cases/lstm_gpu_test.cpp @@ -459,7 +459,6 @@ template void generic_lstm_gpu_test(int layers, int sequence_len, int direction, int batch_size, int input_size, int hidden_size, bool hasBias, bool hasInitialHidden, bool hasInitialCell, T clip_threshold, bool input_forget, bool is_caching_test = false) { - GTEST_SKIP(); // Issue: 107984 std::cout << "Layers = " << layers << " Input Size = " << input_size << " Hidden Size = " << hidden_size << " Sequence Len = " << sequence_len << " Direction = " << direction << " Batch Size = " << batch_size << std::endl; int min_random = -2, max_random = 2; @@ -639,7 +638,6 @@ void generic_lstm_gpu_test(int layers, int sequence_len, int direction, int batc // ------------------------------------------------------- template void lstm_gpu_output_test(const lstm_output_selection& output_selection, int directions, bool is_caching_test = false) { - GTEST_SKIP(); // Issue: 107984 int layers = 1; int sequence_len = 4; int batch_size = 3;