From 0ce0bbbf14bddfc82b2a3a821f8cb4b73ae3a53a Mon Sep 17 00:00:00 2001 From: zhao-lupeng Date: Wed, 14 Jul 2021 14:43:15 +0800 Subject: [PATCH 1/4] fixed coverity warning --- ge/common/fp16_t.cc | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/ge/common/fp16_t.cc b/ge/common/fp16_t.cc index adb55dfb..3ad3c1aa 100755 --- a/ge/common/fp16_t.cc +++ b/ge/common/fp16_t.cc @@ -576,10 +576,12 @@ static uint16_t Fp16Mul(uint16_t v_1, uint16_t v_2) { uint16_t s_a, s_b; int16_t e_a, e_b; uint32_t m_a, m_b; - uint16_t s_ret, m_ret; + uint16_t s_ret; + uint16_t m_ret; int16_t e_ret; uint32_t mul_m; - uint16_t m_a_tmp, m_b_tmp; + uint16_t m_a_tmp; + uint16_t m_b_tmp; // 1.Extract ExtractFp16(v_1, s_a, e_a, m_a_tmp); ExtractFp16(v_2, s_b, e_b, m_b_tmp); @@ -635,7 +637,8 @@ static uint16_t Fp16Div(uint16_t v_1, uint16_t v_2) { uint16_t ret; if (FP16_IS_ZERO(v_2)) { // result is inf // throw "fp16_t division by zero."; - uint16_t s_a, s_b; + uint16_t s_a; + uint16_t s_b; uint16_t s_ret; s_a = FP16_EXTRAC_SIGN(v_1); s_b = FP16_EXTRAC_SIGN(v_2); @@ -644,11 +647,15 @@ static uint16_t Fp16Div(uint16_t v_1, uint16_t v_2) { } else if (FP16_IS_ZERO(v_1)) { ret = 0u; } else { - uint16_t s_a, s_b; - int16_t e_a, e_b; - uint64_t m_a, m_b; + uint16_t s_a; + uint16_t s_b; + int16_t e_a; + int16_t e_b; + uint64_t m_a; + uint64_t m_b; float m_div; - uint16_t m_a_tmp, m_b_tmp; + uint16_t m_a_tmp; + uint16_t m_b_tmp; // 1.Extract ExtractFp16(v_1, s_a, e_a, m_a_tmp); ExtractFp16(v_2, s_b, e_b, m_b_tmp); @@ -742,9 +749,12 @@ bool fp16_t::operator!=(const fp16_t &fp) const { return result; } bool fp16_t::operator>(const fp16_t &fp) const { - uint16_t s_a, s_b; - uint16_t e_a, e_b; - uint16_t m_a, m_b; + uint16_t s_a; + uint16_t s_b; + uint16_t e_a; + uint16_t e_b; + uint16_t m_a; + uint16_t m_b; bool result = true; // 1.Extract @@ -823,9 +833,11 @@ fp16_t &fp16_t::operator=(const fp16_t &fp) { return *this; } fp16_t &fp16_t::operator=(const float &f_val) { - uint16_t s_ret, m_ret; + uint16_t s_ret; + uint16_t m_ret; int16_t e_ret; - uint32_t e_f, m_f; + uint32_t e_f; + uint32_t m_f; const uint32_t ui32_v = *(reinterpret_cast(&f_val)); // 1:8:23bit sign:exp:man uint32_t m_len_delta; @@ -874,7 +886,9 @@ fp16_t &fp16_t::operator=(const float &f_val) { return *this; } fp16_t &fp16_t::operator=(const int8_t &i_val) { - uint16_t s_ret, e_ret, m_ret; + uint16_t s_ret; + uint16_t e_ret; + uint16_t m_ret; s_ret = static_cast(((static_cast(i_val)) & 0x80) >> kDim7); m_ret = static_cast(((static_cast(i_val)) & kInt8Max)); @@ -898,7 +912,9 @@ fp16_t &fp16_t::operator=(const int8_t &i_val) { return *this; } fp16_t &fp16_t::operator=(const uint8_t &ui_val) { - uint16_t s_ret, e_ret, m_ret; + uint16_t s_ret; + uint16_t e_ret; + uint16_t m_ret; s_ret = 0; e_ret = 0; m_ret = ui_val; From 07d561f7c81dfd97e15bd3d458d22fee93db2e27 Mon Sep 17 00:00:00 2001 From: zhao-lupeng Date: Wed, 14 Jul 2021 14:56:12 +0800 Subject: [PATCH 2/4] fixed coverity warning --- ge/host_kernels/strided_slice_kernel.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ge/host_kernels/strided_slice_kernel.cc b/ge/host_kernels/strided_slice_kernel.cc index b8226c49..2e0e4411 100644 --- a/ge/host_kernels/strided_slice_kernel.cc +++ b/ge/host_kernels/strided_slice_kernel.cc @@ -221,7 +221,9 @@ Status StridedSliceKernel::InitParamWithAttrs(const std::vector orig_begin_vec, orig_end_vec, orig_stride_vec; + vector orig_begin_vec; + vector orig_end_vec; + vector orig_stride_vec; GetOriginStrideVec(input, orig_begin_vec, orig_end_vec, orig_stride_vec); // calculate begin_mask & end_mask by ellipsis_mask ExpandStrideWithEllipsisMask(x_dims_num, x_dims, orig_begin_vec, orig_end_vec, orig_stride_vec); From 722b86e6bd53a764fc6b2cf5b4d3fae8d317e75c Mon Sep 17 00:00:00 2001 From: zhao-lupeng Date: Wed, 14 Jul 2021 16:38:20 +0800 Subject: [PATCH 3/4] fixed coverity warning --- ge/common/formats/format_transfers/format_transfer_fractal_nz.cc | 2 ++ ge/common/op/ge_op_utils.cc | 1 + ge/ge_local_engine/engine/host_cpu_engine.cc | 1 + ge/graph/load/model_manager/model_utils.cc | 1 + ge/graph/manager/graph_var_manager.cc | 3 +++ ge/host_kernels/add_kernel.cc | 1 + ge/host_kernels/empty_kernel.cc | 1 + ge/host_kernels/fill_kernel.cc | 1 + ge/host_kernels/floordiv_kernel.cc | 1 + ge/host_kernels/floormod_kernel.cc | 1 + ge/host_kernels/gather_v2_kernel.cc | 2 ++ ge/host_kernels/rsqrt_kernel.cc | 2 ++ ge/hybrid/node_executor/rts/rts_node_task.cc | 1 + 13 files changed, 18 insertions(+) diff --git a/ge/common/formats/format_transfers/format_transfer_fractal_nz.cc b/ge/common/formats/format_transfers/format_transfer_fractal_nz.cc index 4f597e32..df9de604 100755 --- a/ge/common/formats/format_transfers/format_transfer_fractal_nz.cc +++ b/ge/common/formats/format_transfers/format_transfer_fractal_nz.cc @@ -94,6 +94,7 @@ Status TransShapeToFracNz(const ShapeVector &src_shape, DataType data_type, Shap return ACL_ERROR_GE_SHAPE_INVALID; } return SUCCESS; + break; default: auto size = src_shape.size(); int64_t times = 1; @@ -116,6 +117,7 @@ Status TransShapeToFracNz(const ShapeVector &src_shape, DataType data_type, Shap return ACL_ERROR_GE_SHAPE_INVALID; } return SUCCESS; + break; } } diff --git a/ge/common/op/ge_op_utils.cc b/ge/common/op/ge_op_utils.cc index 429ce909..4c2043f2 100644 --- a/ge/common/op/ge_op_utils.cc +++ b/ge/common/op/ge_op_utils.cc @@ -346,6 +346,7 @@ Status OpUtils::SetOutputSliceData(void *data, int64_t data_size, int32_t data_t default: GELOGW("Unsupported data type: %s", TypeUtils::DataTypeToSerialString(static_cast(data_type)).c_str()); return PARAM_INVALID; + break; } return ret; } diff --git a/ge/ge_local_engine/engine/host_cpu_engine.cc b/ge/ge_local_engine/engine/host_cpu_engine.cc index d9b67736..2a17a5bb 100755 --- a/ge/ge_local_engine/engine/host_cpu_engine.cc +++ b/ge/ge_local_engine/engine/host_cpu_engine.cc @@ -198,6 +198,7 @@ Status HostCpuEngine::PrepareOutputs(const ge::ConstOpDescPtr &op_desc, GELOGW("data type %s not support.", TypeUtils::DataTypeToSerialString(out_desc.GetDataType()).c_str()); return NOT_CHANGED; + break; } } diff --git a/ge/graph/load/model_manager/model_utils.cc b/ge/graph/load/model_manager/model_utils.cc index a31837ca..abd9878f 100755 --- a/ge/graph/load/model_manager/model_utils.cc +++ b/ge/graph/load/model_manager/model_utils.cc @@ -423,6 +423,7 @@ Status ModelUtils::GetVarAddr(const RuntimeParam &model_param, const ConstOpDesc GELOGE(PARAM_INVALID, "[Check][Param] Get mem_type:%d for offset:%ld is unsupported, check invalid", mem_type, offset); return PARAM_INVALID; + break; } GE_CHECK_NOTNULL(var_addr); return SUCCESS; diff --git a/ge/graph/manager/graph_var_manager.cc b/ge/graph/manager/graph_var_manager.cc index 89a4e45b..bdb09dd2 100755 --- a/ge/graph/manager/graph_var_manager.cc +++ b/ge/graph/manager/graph_var_manager.cc @@ -246,10 +246,13 @@ MemResource *MemResource::BuildMemResourceFromType(rtMemType_t mem_type) { switch (mem_type) { case RT_MEMORY_HBM: return new (std::nothrow) HbmMemResource(); + break; case RT_MEMORY_RDMA_HBM: return new (std::nothrow) RdmaMemResource(); + break; default: return nullptr; + break; } } diff --git a/ge/host_kernels/add_kernel.cc b/ge/host_kernels/add_kernel.cc index eb0ea86d..34bdd029 100644 --- a/ge/host_kernels/add_kernel.cc +++ b/ge/host_kernels/add_kernel.cc @@ -189,6 +189,7 @@ Status AddKernel::Compute(const OpDescPtr op_desc_ptr, const std::vectorSetData(reinterpret_cast(buf.get()), data_size) != GRAPH_SUCCESS, @@ -136,6 +137,7 @@ Status RsqrtKernel::Compute(const OpDescPtr op_desc_ptr, const std::vector Date: Wed, 28 Jul 2021 09:46:26 +0800 Subject: [PATCH 4/4] fixed coverity warning --- .../format_transfers/format_transfer_fractal_zz.cc | 23 +++++++++++++++------- ge/common/op/ge_op_utils.cc | 2 +- ge/hybrid/executor/worker/execution_engine.cc | 2 +- inc/framework/memory/memory_api.h | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc b/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc index 14315084..03e3e67c 100755 --- a/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc +++ b/ge/common/formats/format_transfers/format_transfer_fractal_zz.cc @@ -49,19 +49,24 @@ const size_t kFZzDimCountBackwardsW0H0W1H1 = 4; bool IsDataTypeSupport(DataType d_type) { return GetSizeByDataType(d_type) > 0; } using ShapeVector = std::vector; +bool ret1 = false; bool CheckShape(Format format, const ShapeVector &shape) { switch (format) { case FORMAT_ND: - return IsShapeValid(shape); + ret1 = IsShapeValid(shape); + break; case FORMAT_NCHW: case FORMAT_NHWC: - return CheckShapeValid(shape, kDimSize4D); + ret1 = CheckShapeValid(shape, kDimSize4D); + break; default: std::string error = "Trans format between " + FmtToStr(TypeUtils::FormatToSerialString(format)) + " and FORMAT_FRACTAL_ZZ is not supported."; GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str()); - return false; + ret1 = false; + break; } + return ret1; } /** @@ -76,6 +81,7 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap hw_shape.clear(); auto w0 = GetCubeSizeByDataType(data_type); auto h0 = GetCubeSizeByDataType(data_type); + auto ret2 = SUCCESS; switch (src_shape.size()) { case kSingleDim: dst_shape.push_back(DIM_DEFAULT_VALUE); @@ -90,9 +96,10 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap ShapeToString(dst_shape).c_str()); REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", ShapeToString(dst_shape).c_str()); - return ACL_ERROR_GE_SHAPE_INVALID; + ret2 = ACL_ERROR_GE_SHAPE_INVALID; } - return SUCCESS; + ret2 = SUCCESS; + break; default: auto size = src_shape.size(); int64_t times = 1; @@ -112,10 +119,12 @@ Status TransShapeToFracZz(const ShapeVector &src_shape, DataType data_type, Shap ShapeToString(dst_shape).c_str()); REPORT_CALL_ERROR("E19999", "Failed to check dst shape %s", ShapeToString(dst_shape).c_str()); - return ACL_ERROR_GE_SHAPE_INVALID; + ret2 = ACL_ERROR_GE_SHAPE_INVALID; } - return SUCCESS; + ret2 = SUCCESS; + break; } + return ret2; } Status CheckShapeRelation(const TransArgs &args, ShapeVector &hw_shape) { diff --git a/ge/common/op/ge_op_utils.cc b/ge/common/op/ge_op_utils.cc index 4c2043f2..9de36573 100644 --- a/ge/common/op/ge_op_utils.cc +++ b/ge/common/op/ge_op_utils.cc @@ -345,7 +345,7 @@ Status OpUtils::SetOutputSliceData(void *data, int64_t data_size, int32_t data_t break; default: GELOGW("Unsupported data type: %s", TypeUtils::DataTypeToSerialString(static_cast(data_type)).c_str()); - return PARAM_INVALID; + ret = PARAM_INVALID; break; } return ret; diff --git a/ge/hybrid/executor/worker/execution_engine.cc b/ge/hybrid/executor/worker/execution_engine.cc index 4bd02193..c914d3d4 100755 --- a/ge/hybrid/executor/worker/execution_engine.cc +++ b/ge/hybrid/executor/worker/execution_engine.cc @@ -18,7 +18,7 @@ #include "graph/runtime_inference_context.h" #include "graph/load/model_manager/model_manager.h" #include "hybrid/node_executor/node_executor.h" -#include "hybrid/executor//worker//shape_inference_engine.h" +#include "hybrid/executor/worker/shape_inference_engine.h" #include "common/profiling/profiling_manager.h" namespace ge { diff --git a/inc/framework/memory/memory_api.h b/inc/framework/memory/memory_api.h index a316fd59..79a4e2df 100644 --- a/inc/framework/memory/memory_api.h +++ b/inc/framework/memory/memory_api.h @@ -21,7 +21,7 @@ #include #include "ge/ge_api_error_codes.h" -#include "graph//types.h" +#include "graph/types.h" #include "runtime/mem.h" namespace ge {