From c419c98f02b76101d68a800f8ea228689e80deba Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:02:22 +0900 Subject: [PATCH 1/8] Typo fix --- src/program.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program.cpp b/src/program.cpp index 7e65afc2..5ce51cf8 100644 --- a/src/program.cpp +++ b/src/program.cpp @@ -708,7 +708,7 @@ std::string program_impl::get_memory_dependencies_string() const itr++; mem_dep = mem_dep.append("primitive: ").append(node->id()).append(" restricted list: "); for (auto it : node->get_memory_dependencies()) - mem_dep == mem_dep.append(it).append(", "); + mem_dep = mem_dep.append(it).append(", "); mem_dep = mem_dep.append("\n"); } return mem_dep; From 0691a66fabd8ce6e2f380e924fee5b520442c707 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:04:41 +0900 Subject: [PATCH 2/8] Fix build --- src/include/generic_layer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/generic_layer.hpp b/src/include/generic_layer.hpp index f9478fd1..852d1cc7 100644 --- a/src/include/generic_layer.hpp +++ b/src/include/generic_layer.hpp @@ -61,7 +61,7 @@ struct generic_layer : public primitive_baseoutput_layout) - , generic_params(*static_cast(dto->generic_params)) + , generic_params(*static_cast(dto->generic_params)) { } From be92e0ab2cd674353ef89c7badbdddcd1f53057d Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:05:10 +0900 Subject: [PATCH 3/8] Fix includes --- kernel_selector/core/common/primitive_db.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel_selector/core/common/primitive_db.cpp b/kernel_selector/core/common/primitive_db.cpp index 26c8b4fd..080270f0 100644 --- a/kernel_selector/core/common/primitive_db.cpp +++ b/kernel_selector/core/common/primitive_db.cpp @@ -14,8 +14,9 @@ // limitations under the License. */ #include "primitive_db.h" -#include +#include #include +#include #ifndef NDEBUG #include From 033ded762104fb66c8a4ffd4d8544aebfb029872 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:05:57 +0900 Subject: [PATCH 4/8] Includle stdexcept --- kernel_selector/common/tensor_type.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel_selector/common/tensor_type.h b/kernel_selector/common/tensor_type.h index ff1c2f2e..8ac37199 100644 --- a/kernel_selector/common/tensor_type.h +++ b/kernel_selector/common/tensor_type.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -541,4 +542,4 @@ namespace kernel_selector static std::array, WeightsLayout::WeightsLayoutCount> weightsChannelArray; }; } -} \ No newline at end of file +} From 0823179f6d040d49de3f0e4ad39c2d44ebd6ee12 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:07:19 +0900 Subject: [PATCH 5/8] Include limits for max --- api/CPP/tensor.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/api/CPP/tensor.hpp b/api/CPP/tensor.hpp index 3c7b328d..d453f402 100644 --- a/api/CPP/tensor.hpp +++ b/api/CPP/tensor.hpp @@ -26,6 +26,7 @@ #include #include #include +#include #include namespace cldnn From ccdad68ca132265303d8b566598640e924526d55 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:08:30 +0900 Subject: [PATCH 6/8] Do not use user-own assign operator --- common/khronos_ocl_clhpp/cl2.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/khronos_ocl_clhpp/cl2.hpp b/common/khronos_ocl_clhpp/cl2.hpp index faec1536..41f44d90 100644 --- a/common/khronos_ocl_clhpp/cl2.hpp +++ b/common/khronos_ocl_clhpp/cl2.hpp @@ -1896,6 +1896,7 @@ struct ImageFormat : public cl_image_format image_channel_data_type = type; } +#if 0 //! \brief Assignment operator. ImageFormat& operator = (const ImageFormat& rhs) { @@ -1905,6 +1906,7 @@ struct ImageFormat : public cl_image_format } return *this; } +#endif }; /*! \brief Class interface for cl_device_id. @@ -2700,7 +2702,7 @@ class Context error = platforms[i].getDevices(type, &devices); #if defined(CL_HPP_ENABLE_EXCEPTIONS) - } catch (Error) {} + } catch (Error&) {} // Catch if exceptions are enabled as we don't want to exit if first platform has no devices of type // We do error checking next anyway, and can throw there if needed #endif From 1e77ffae97a8de63a2afd624440c92ab8f693327 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:14:32 +0900 Subject: [PATCH 7/8] Use Error& --- common/khronos_ocl_clhpp/cl2.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/khronos_ocl_clhpp/cl2.hpp b/common/khronos_ocl_clhpp/cl2.hpp index 41f44d90..cbc769ee 100644 --- a/common/khronos_ocl_clhpp/cl2.hpp +++ b/common/khronos_ocl_clhpp/cl2.hpp @@ -2702,7 +2702,7 @@ class Context error = platforms[i].getDevices(type, &devices); #if defined(CL_HPP_ENABLE_EXCEPTIONS) - } catch (Error&) {} + } catch (Error) {} // Catch if exceptions are enabled as we don't want to exit if first platform has no devices of type // We do error checking next anyway, and can throw there if needed #endif From de76349a58a6317243dfd4ca56bba98a00588df9 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sat, 29 Jan 2022 14:09:32 +0900 Subject: [PATCH 8/8] Do not use std::move for local scoped values --- .../fully_connected/fully_connected_kernel_MMAD.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_base.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_bf_io_gemm.cpp | 2 +- .../fully_connected_kernel_bf_io_input_spatial.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_bfyx_ref.cpp | 4 ++-- .../fully_connected_kernel_bs_f_bsv16_af8.cpp | 4 ++-- .../fully_connected_kernel_bs_f_bsv16_b1.cpp | 4 ++-- .../fully_connected_kernel_bs_f_bsv8_af8.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_fb_io_b8_f8.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_fb_io_block.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_fb_oi_b8_ref.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_fs_byx_fsv32.cpp | 2 +- .../fully_connected/fully_connected_kernel_imad.cpp | 4 ++-- .../fully_connected_kernel_image_tutorial.cpp | 4 ++-- .../fully_connected/fully_connected_kernel_mmad_batched.cpp | 4 ++-- src/gpu/kernels_cache.cpp | 6 +++--- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_MMAD.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_MMAD.cpp index ff50d01d..21bd871f 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_MMAD.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_MMAD.cpp @@ -54,7 +54,7 @@ namespace kernel_selector runInfo->lws1 = 1; runInfo->lws2 = sub_group_size; - return std::move(runInfo); + return runInfo; } JitConstants FullyConnectedKernelMMAD::GetJitConstants(const fully_connected_params& params, const DispatchData& runInfo) const @@ -86,4 +86,4 @@ namespace kernel_selector } return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_base.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_base.cpp index 47c9f11b..bfeca6db 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_base.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_base.cpp @@ -64,7 +64,7 @@ namespace kernel_selector } dispatchData->lws1 = dispatchData->lws2 = 1; - return std::move(dispatchData); + return dispatchData; } KernelsData FullyConnectedKernelBase::GetCommonKernelsData(const Params& params, const optional_params& options, DataLayout dl, std::vector wl, float estimated_time, const std::string exeMode, int autoTuneIndex) const @@ -144,4 +144,4 @@ namespace kernel_selector return GetCommonKernelsData(params, options, dl, wl, estimated_time, GetAutoTuneOptions(autoTuneIndex), autoTuneIndex); } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_gemm.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_gemm.cpp index e99a106a..87adf0a6 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_gemm.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_gemm.cpp @@ -57,7 +57,7 @@ namespace kernel_selector { runInfo->effiency = FORCE_PRIORITY_6; - return std::move(runInfo); + return runInfo; } JitConstants FullyConnected_bf_io_GEMM::GetJitConstants(const fully_connected_params& params, const DispatchData& kd) const diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_input_spatial.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_input_spatial.cpp index 26633732..45d54206 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_input_spatial.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bf_io_input_spatial.cpp @@ -59,7 +59,7 @@ namespace kernel_selector } } - return std::move(kd); + return kd; } bool FullyConnected_bf_io_input_spatial::Validate(const Params& p, const optional_params& o) const @@ -122,4 +122,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bfyx_ref.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bfyx_ref.cpp index bf4ad10f..9e43dce7 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bfyx_ref.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bfyx_ref.cpp @@ -61,7 +61,7 @@ namespace kernel_selector runInfo->lws1 = local[1]; runInfo->lws2 = 1; - return std::move(runInfo); + return runInfo; } KernelsData FullyConnected_bfyx_Ref::GetKernelsData(const Params& params, const optional_params& options) const @@ -80,4 +80,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_af8.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_af8.cpp index d2d030d7..e7a9e5c3 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_af8.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_af8.cpp @@ -45,7 +45,7 @@ namespace kernel_selector kd->lws0 = 16; kd->lws1 = 1; - return std::move(kd); + return kd; } static bool check_input_layout(const DataTensor& t) @@ -97,4 +97,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_b1.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_b1.cpp index 28482a14..29d971e2 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_b1.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv16_b1.cpp @@ -92,7 +92,7 @@ namespace kernel_selector kd->in_chunk_prefetch_size = 2; kd->filter_chunk_prefetch_size = responses_per_sg_exec; - return std::move(run_info); + return run_info; } KernelsData FullyConnected_bs_f_bsv16_b1::GetKernelsData(const Params& params, const optional_params& optParams) const @@ -109,4 +109,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv8_af8.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv8_af8.cpp index 5361ab23..3403d09d 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv8_af8.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_bs_f_bsv8_af8.cpp @@ -47,7 +47,7 @@ namespace kernel_selector kd->lws0 = 8; kd->lws1 = 1; - return std::move(kd); + return kd; } static bool check_input_layout(const DataTensor& t) @@ -113,4 +113,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_b8_f8.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_b8_f8.cpp index 8b360686..02de0c1c 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_b8_f8.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_b8_f8.cpp @@ -48,7 +48,7 @@ namespace kernel_selector kd->lws0 = 8; kd->lws1 = 1; - return std::move(kd); + return kd; } bool FullyConnected_fb_io_b8_f8::Validate(const Params& p, const optional_params& o) const @@ -97,4 +97,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_block.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_block.cpp index 94179a7d..70923369 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_block.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_io_block.cpp @@ -70,7 +70,7 @@ namespace kernel_selector kd->units_per_sg_read = units_per_sg_read; kd->rg_count = (uint32_t)rg_count; kd->last_rg_size = response_size % units_per_sg_read; - return std::move(kd); + return kd; } JitConstants FullyConnected_fb_io_block::GetJitConstants(const fully_connected_params& params, const FullyConnectedKernelBase::DispatchData& run_info) const @@ -159,4 +159,4 @@ namespace kernel_selector return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_oi_b8_ref.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_oi_b8_ref.cpp index ad59b8bd..bcb0b162 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_oi_b8_ref.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fb_oi_b8_ref.cpp @@ -44,7 +44,7 @@ namespace kernel_selector kd->lws0 = 8; kd->lws1 = 1; - return std::move(kd); + return kd; } bool FullyConnected_fb_oi_b8_ref::Validate(const Params& p, const optional_params& o) const @@ -77,4 +77,4 @@ namespace kernel_selector } return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fs_byx_fsv32.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fs_byx_fsv32.cpp index 23cc1ce5..65cbdb47 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fs_byx_fsv32.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_fs_byx_fsv32.cpp @@ -56,7 +56,7 @@ namespace kernel_selector { runInfo->effiency = FORCE_PRIORITY_5; - return std::move(runInfo); + return runInfo; } JitConstants FullyConnected_fs_byx_fsv32::GetJitConstants(const fully_connected_params& params, const DispatchData& kd) const diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_imad.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_imad.cpp index 1b2a9980..7f6cd735 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_imad.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_imad.cpp @@ -59,7 +59,7 @@ namespace kernel_selector runInfo->lws1 = 1; runInfo->lws2 = 1; - return std::move(runInfo); + return runInfo; } // SetDefault bool FullyConnectedKernelIMAD::Validate(const Params& params, const optional_params& options) const @@ -113,4 +113,4 @@ namespace kernel_selector } return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_image_tutorial.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_image_tutorial.cpp index 72e9bd55..005d3f8e 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_image_tutorial.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_image_tutorial.cpp @@ -57,7 +57,7 @@ namespace kernel_selector runInfo->effiency = TUTORIAL_PRIORITY; - return std::move(runInfo); + return runInfo; } KernelsData FullyConnected_image_tutorial::GetKernelsData(const Params& params, const optional_params& options) const @@ -74,4 +74,4 @@ namespace kernel_selector } return res; } -} \ No newline at end of file +} diff --git a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_mmad_batched.cpp b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_mmad_batched.cpp index 1fbd98f5..28a6dc1a 100644 --- a/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_mmad_batched.cpp +++ b/kernel_selector/core/actual_kernels/fully_connected/fully_connected_kernel_mmad_batched.cpp @@ -105,7 +105,7 @@ namespace kernel_selector runInfo->lws2 = 1; runInfo->effiency = FORCE_PRIORITY_1; - return std::move(runInfo); + return runInfo; } KernelsData FullyConnected_mmad_batched::GetKernelsData(const Params& params, const optional_params& options) const @@ -122,4 +122,4 @@ namespace kernel_selector } return res; } -} \ No newline at end of file +} diff --git a/src/gpu/kernels_cache.cpp b/src/gpu/kernels_cache.cpp index dd49e9a4..6be7e7b2 100644 --- a/src/gpu/kernels_cache.cpp +++ b/src/gpu/kernels_cache.cpp @@ -79,7 +79,7 @@ namespace { undefs += "#endif\n"; } - return std::move(undefs); + return undefs; } std::string reorder_options(const std::string& org_options) @@ -181,7 +181,7 @@ kernels_cache::sorted_code kernels_cache::get_program_source(const kernels_code& current_bucket.kernels_counter++; } - return std::move(scode); + return scode; } kernels_cache::kernels_cache(gpu_toolkit& context): _context(context) {} @@ -354,4 +354,4 @@ void kernels_cache::build_all() } }} - \ No newline at end of file +