diff --git a/src/cpu/ref_fused_convolution.hpp b/src/cpu/ref_fused_convolution.hpp index 0fddedd5628..2f297e8b601 100644 --- a/src/cpu/ref_fused_convolution.hpp +++ b/src/cpu/ref_fused_convolution.hpp @@ -196,7 +196,7 @@ struct ref_fused_convolution_fwd_t : public primitive_t { arg_cache.append_inout_arg( DNNL_ARG_FROM, sp_begin, from_md, true); arg_cache.append_inout_arg(DNNL_ARG_TO, sp_end, to_md, false); - args_.push_back(arg_cache); + args_.push_back(std::move(arg_cache)); // Increment scratchpad offsets sp_begin = sp_end; @@ -340,7 +340,7 @@ struct ref_fused_convolution_fwd_t : public primitive_t { | DNNL_ARG_SRC_1)); } - args_.push_back(arg_cache); + args_.push_back(std::move(arg_cache)); while (++po_op_iter < end) { if (utils::one_of(po.entry_[po_op_iter].kind, diff --git a/src/cpu/sycl/stream.hpp b/src/cpu/sycl/stream.hpp index 5d3bcd57bd7..fed45ab680e 100644 --- a/src/cpu/sycl/stream.hpp +++ b/src/cpu/sycl/stream.hpp @@ -68,7 +68,7 @@ struct stream_t : public cpu::cpu_stream_t { register_deps(cgh); submit_cpu_primitive(this, prim_iface, exec_ctx, cgh); }); - sycl_ctx().set_deps({event}); + sycl_ctx().set_deps({std::move(event)}); return status::success; } diff --git a/src/cpu/sycl/stream_submit_cpu_primitive.cpp b/src/cpu/sycl/stream_submit_cpu_primitive.cpp index f2df6ca2d92..f4244d12004 100644 --- a/src/cpu/sycl/stream_submit_cpu_primitive.cpp +++ b/src/cpu/sycl/stream_submit_cpu_primitive.cpp @@ -43,7 +43,7 @@ void init_thunk_params( thunk_params_t *p, accessor_t acc, accessor_types... accessors) { p->native_pointers[N - sizeof...(accessor_types) - 1] = reinterpret_cast(&acc[0]); - init_thunk_params(p, accessors...); + init_thunk_params(p, std::move(accessors)...); } template @@ -57,7 +57,7 @@ status_t submit_cpu_primitive_with_params_impl( constexpr size_t nparams = sizeof...(param_types); // Extract pointers from params - init_thunk_params(&thunk_params, params...); + init_thunk_params(&thunk_params, std::move(params)...); dnnl_impl_sycl_cpu_thunk(&thunk_params); }); diff --git a/src/cpu/x64/brgemm/brgemm_containers.cpp b/src/cpu/x64/brgemm/brgemm_containers.cpp index b0a3d047d43..8703d357adc 100644 --- a/src/cpu/x64/brgemm/brgemm_containers.cpp +++ b/src/cpu/x64/brgemm/brgemm_containers.cpp @@ -110,7 +110,7 @@ status_t brgemm_kernel_container_t::insert(int idx, const brgemm_desc_t *brg) { CHECK(brgemm_kernel_create(&brg_kernel, *brg)); std::shared_ptr sptr(brg_kernel); lock_write(); - const auto kernel_ret = get_set().insert(sptr); + const auto kernel_ret = get_set().insert(std::move(sptr)); refs_[idx] = kernel_ret.first->get(); unlock_write(); const auto brgemm_ret = brgemm_map_.insert({brg, refs_[idx]}); diff --git a/src/cpu/x64/jit_avx2_1x1_convolution.cpp b/src/cpu/x64/jit_avx2_1x1_convolution.cpp index 9aa8a335698..fdd981452b3 100644 --- a/src/cpu/x64/jit_avx2_1x1_convolution.cpp +++ b/src/cpu/x64/jit_avx2_1x1_convolution.cpp @@ -50,7 +50,7 @@ void jit_avx2_1x1_convolution_fwd_t::execute_forward( const data_t *, DNNL_ARG_ATTR_POST_OP_DW | DNNL_ARG_BIAS); const auto post_ops_binary_rhs_arg_vec = binary_injector::prepare_binary_args(pd()->jcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ ? binary_injector::prepare_binary_args(pd()->jcp_dw_->post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) : std::vector {}; diff --git a/src/cpu/x64/jit_avx512_common_1x1_convolution.cpp b/src/cpu/x64/jit_avx512_common_1x1_convolution.cpp index c803cd539cb..b785fb67a58 100644 --- a/src/cpu/x64/jit_avx512_common_1x1_convolution.cpp +++ b/src/cpu/x64/jit_avx512_common_1x1_convolution.cpp @@ -52,7 +52,7 @@ void jit_avx512_common_1x1_convolution_fwd_tjcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->dw_conv_pd_ + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->dw_conv_pd_ ? binary_injector::prepare_binary_args( pd()->dw_conv_pd_->jcp_.post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) diff --git a/src/cpu/x64/jit_avx512_core_bf16_1x1_convolution.cpp b/src/cpu/x64/jit_avx512_core_bf16_1x1_convolution.cpp index 71dd8fb7190..ce78e1ede06 100644 --- a/src/cpu/x64/jit_avx512_core_bf16_1x1_convolution.cpp +++ b/src/cpu/x64/jit_avx512_core_bf16_1x1_convolution.cpp @@ -75,7 +75,7 @@ void jit_avx512_core_bf16_1x1_convolution_fwd_t::execute_forward( const dw_wei_data_t *, DNNL_ARG_ATTR_POST_OP_DW | DNNL_ARG_WEIGHTS); const auto post_ops_binary_rhs_arg_vec = binary_injector::prepare_binary_args(pd()->jcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ != nullptr + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ != nullptr ? binary_injector::prepare_binary_args(pd()->jcp_dw_->post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) : std::vector {}; diff --git a/src/cpu/x64/jit_avx512_core_x8s8s32x_1x1_convolution.cpp b/src/cpu/x64/jit_avx512_core_x8s8s32x_1x1_convolution.cpp index c1b0c07dfe3..e3ef709989c 100644 --- a/src/cpu/x64/jit_avx512_core_x8s8s32x_1x1_convolution.cpp +++ b/src/cpu/x64/jit_avx512_core_x8s8s32x_1x1_convolution.cpp @@ -47,7 +47,7 @@ status_t jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t::execute_forward( const char *, DNNL_ARG_ATTR_POST_OP_DW | DNNL_ARG_BIAS); const auto post_ops_binary_rhs_arg_vec = binary_injector::prepare_binary_args(pd()->jcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ ? binary_injector::prepare_binary_args(pd()->jcp_dw_->post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) : std::vector {}; diff --git a/src/cpu/x64/jit_brgemm_conv.cpp b/src/cpu/x64/jit_brgemm_conv.cpp index 7004349d09c..c778e45f63c 100644 --- a/src/cpu/x64/jit_brgemm_conv.cpp +++ b/src/cpu/x64/jit_brgemm_conv.cpp @@ -556,7 +556,7 @@ status_t brgemm_convolution_fwd_t::pd_t::init(engine_t *engine) { || (jcp_.dst_dt != jcp_.acc_dt) || jcp_.with_sum || jcp_.use_M_mask || jcp_.src_zero_point || jcp_.dst_zero_point; - const auto Mv = (jcp_.M_tail > 0 && jcp_.M_tail != jcp_.M) + const auto& Mv = (jcp_.M_tail > 0 && jcp_.M_tail != jcp_.M) ? std::vector {jcp_.M, jcp_.M_tail} : std::vector {jcp_.M}; diff --git a/src/cpu/x64/jit_sse41_1x1_convolution.cpp b/src/cpu/x64/jit_sse41_1x1_convolution.cpp index a7d7244cdea..b0fd5b32ea6 100644 --- a/src/cpu/x64/jit_sse41_1x1_convolution.cpp +++ b/src/cpu/x64/jit_sse41_1x1_convolution.cpp @@ -45,7 +45,7 @@ void jit_sse41_1x1_convolution_fwd_t::execute_forward( const data_t *, DNNL_ARG_ATTR_POST_OP_DW | DNNL_ARG_BIAS); const auto post_ops_binary_rhs_arg_vec = binary_injector::prepare_binary_args(pd()->jcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->dw_conv_pd_ != nullptr + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->dw_conv_pd_ != nullptr ? binary_injector::prepare_binary_args( pd()->dw_conv_pd_->jcp_.post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) diff --git a/src/cpu/x64/jit_uni_x8s8s32x_1x1_convolution.cpp b/src/cpu/x64/jit_uni_x8s8s32x_1x1_convolution.cpp index 8dadfd91d06..f526f48dbfa 100644 --- a/src/cpu/x64/jit_uni_x8s8s32x_1x1_convolution.cpp +++ b/src/cpu/x64/jit_uni_x8s8s32x_1x1_convolution.cpp @@ -52,7 +52,7 @@ status_t jit_uni_x8s8s32x_1x1_convolution_fwd_t::execute_forward( const char *, DNNL_ARG_ATTR_POST_OP_DW | DNNL_ARG_BIAS); const auto post_ops_binary_rhs_arg_vec = binary_injector::prepare_binary_args(pd()->jcp_.post_ops, ctx); - const auto post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ + const auto& post_ops_binary_rhs_arg_vec_dw = pd()->jcp_dw_ ? binary_injector::prepare_binary_args(pd()->jcp_dw_->post_ops, ctx, pd()->jcp_.post_ops.entry_.size() + 1) : std::vector {};