From 659bbd7f9fb7a32c9bd65eaa1bcb8a9881054640 Mon Sep 17 00:00:00 2001 From: Andrei Gorbachev Date: Thu, 18 Apr 2024 07:03:55 +0100 Subject: [PATCH] [Coverity] fix coverity (#24065) ### Details: - *fix coverity* ### Tickets: - *CVS-136537, CVS-136539,CVS-136540, CVS-136542* --- .../intel_gpu/include/intel_gpu/primitives/swiglu.hpp | 4 ++-- .../kernels/concatenation/concatenation_kernel_base.cpp | 3 ++- .../concatenation/concatenation_kernel_fs_b_yx_fsv32.cpp | 3 ++- .../kernels/permute/permute_kernel_f_y_axes.cpp | 5 ++++- .../scatter_update/scatter_elements_update_kernel_ref.cpp | 2 +- .../kernels/scatter_update/scatter_update_kernel_ref.cpp | 3 ++- .../intel_gpu/src/plugin/transformations/op/convolution.cpp | 1 - 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/swiglu.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/swiglu.hpp index 6602f9ddd18..975f6677a84 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/swiglu.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/swiglu.hpp @@ -31,8 +31,8 @@ struct swiglu : public primitive_base { split_lengths(split_lengths), output_size(output_size) {} - int64_t axis; - int64_t split_lengths; + int64_t axis = 0; + int64_t split_lengths = 0; tensor output_size; size_t hash() const override { 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 a5f59940ec2..6eeeb80637c 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 @@ -128,7 +128,8 @@ void ConcatenationKernelBase::GetUpdateDispatchDataFunc(KernelData& kd) const { kernel.params.scalars.resize(1); kernel.params.scalars[0] = s; - size_t concatChannelIndex = (size_t)DataTensor::Channelndex(input.GetLayout(), GetConcatChannel(prim_params)); + auto concatChannelIndex = DataTensor::Channelndex(input.GetLayout(), GetConcatChannel(prim_params)); + OPENVINO_ASSERT(concatChannelIndex >= 0, "concatChannelIndex shouldn't be negative"); lastOffset += (uint32_t)input.GetDims()[concatChannelIndex].v; } }; 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 82313b53146..5b9dc31d89d 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 @@ -122,7 +122,8 @@ KernelsData ConcatenationKernel_fs_b_yx_fsv32::GetKernelsData(const Params& para kernel.params.scalars.push_back(s); kernel.params.arguments.push_back({ArgumentDescriptor::Types::SCALAR, 0}); - size_t concatChannelIndex = (size_t)DataTensor::Channelndex(orgParams.inputs[i].GetLayout(), GetConcatChannel(orgParams)); + auto concatChannelIndex = DataTensor::Channelndex(orgParams.inputs[i].GetLayout(), GetConcatChannel(orgParams)); + OPENVINO_ASSERT(concatChannelIndex >= 0, "concatChannelIndex shouldn't be negative"); lastOffset += (uint32_t)input.GetDims()[concatChannelIndex].v; } diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/permute/permute_kernel_f_y_axes.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernels/permute/permute_kernel_f_y_axes.cpp index 60692ea9d5d..e602985ae6d 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/permute/permute_kernel_f_y_axes.cpp +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/permute/permute_kernel_f_y_axes.cpp @@ -24,7 +24,10 @@ size_t GetDivisor(const size_t input_size) { return input_size % i == 0; }; auto result = std::find_if(begin(v), end(v), is_divided); - return *result; + if (result != end(v)) { + return *result; + } + return 1; } bool IsSimpleMemCopyOperation(const permute_params& params) { diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_elements_update_kernel_ref.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_elements_update_kernel_ref.cpp index 39c6b644776..d1bf425a84b 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_elements_update_kernel_ref.cpp +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_elements_update_kernel_ref.cpp @@ -131,7 +131,7 @@ CommonDispatchData ScatterElementsUpdateKernelRef::SetDefault(const scatter_elem JitConstants ScatterElementsUpdateKernelRef::GetJitConstants(const scatter_elements_update_params& params) const { JitConstants jit = MakeBaseParamsJitConstants(params); - jit.AddConstant(MakeJitConstant("AXIS_VALUE", GetScatterElementsUpdateChannelIndex(params))); + jit.AddConstant(MakeJitConstant("AXIS_VALUE", static_cast(GetScatterElementsUpdateChannelIndex(params)))); if (params.mode != ScatterUpdateReduction::NONE) { jit.AddConstant(MakeJitConstant("REDUCE_MODE", static_cast(params.mode))); diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_update_kernel_ref.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_update_kernel_ref.cpp index fb6ef268fc1..4637c9cac73 100644 --- a/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_update_kernel_ref.cpp +++ b/src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_update_kernel_ref.cpp @@ -220,7 +220,8 @@ JitConstants ScatterUpdateKernelRef::GetJitConstants(const scatter_update_params } jit.AddConstant(MakeJitConstant("UPDATES_INDEX_ORDER", GetUpdatesIndexOrder(params))); - jit.AddConstant(MakeJitConstant("SECOND_ITER_OUTPUT_INDEX_ORDER", GetSecondIterOutputIndexOrder(params, GetScatterUpdateChannelIndex(params)))); + jit.AddConstant(MakeJitConstant("SECOND_ITER_OUTPUT_INDEX_ORDER", + GetSecondIterOutputIndexOrder(params, static_cast(GetScatterUpdateChannelIndex(params))))); jit.AddConstant(MakeJitConstant("OUTPUT_INDEX_ON_AXIS", GetOutputIndexOnAxis(params, GetScatterUpdateChannelIndex(params)))); jit.AddConstant(MakeJitConstant("AXIS_VALUE", axis_value)); diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp index 443458a3671..c822707c09d 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp @@ -70,7 +70,6 @@ void Convolution::validate_and_infer_types() { if (m_output_type != ov::element::undefined) { result_et = m_output_type; } else if (data_batch_et.compatible(filters_et)) { - ov::element::Type::merge(result_et, data_batch_et, filters_et); NODE_VALIDATION_CHECK(this, element::Type::merge(result_et, data_batch_et, filters_et), "Element types for data batch and filters do not match (data batch element type: ",