Skip to content

Commit dd2580f

Browse files
authored
[CPU] Apply 'modernize-*' clang-tidy remarks (openvinotoolkit#28804)
### Details: - Fix "modernize-*" remarks reported by clang-tidy - Enable "modernize-*" clang-tidy checks on CI by default - Disable "modernize-avoid-c-arrays" due to big scope of changes (to be enabled separately) - Disable C++20 specific checks: "modernize-use-constraints", "modernize-use-std-numbers" ### Tickets: - N/A
1 parent aad0b5f commit dd2580f

File tree

317 files changed

+1973
-1930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+1973
-1930
lines changed

src/plugins/intel_cpu/src/.clang-tidy

+10-2
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@
2727
# -google-default-arguments,
2828
# -google-explicit-constructor,
2929
# -google-readability-casting,
30+
# -modernize-avoid-c-arrays,
3031
# -readability-implicit-bool-conversion,
3132
# -readability-magic-numbers, cppcoreguidelines-avoid-magic-numbers
3233
# -readability-function-cognitive-complexity. Reasonable way to enforce splitting complex code into simple functions
34+
# Remove warning disablement after CI pipeline migrates to C++17 from C++20 for:
35+
# -modernize-use-constraints,
36+
# -modernize-use-std-numbers
3337

3438
Checks: >
3539
-*,
3640
performance-*,
3741
google-*,
38-
modernize-loop-convert,
39-
modernize-pass-by-value,
42+
modernize-*,
4043
cppcoreguidelines-prefer-member-initializer,
4144
readability-else-after-return,
4245
-bugprone-easily-swappable-parameters,
@@ -49,6 +52,9 @@ Checks: >
4952
-google-readability-casting,
5053
-google-readability-todo,
5154
-readability-braces-around-statements,
55+
-modernize-avoid-c-arrays,
56+
-modernize-use-constraints,
57+
-modernize-use-std-numbers,
5258
-modernize-use-trailing-return-type,
5359
-readability-identifier-length,
5460
-readability-implicit-bool-conversion,
@@ -74,6 +80,8 @@ CheckOptions:
7480
value: reasonable
7581
- key: modernize-pass-by-value.IncludeStyle
7682
value: google
83+
- key: modernize-use-auto.MinTypeNameLength
84+
value: "3"
7785
### To be considered to enable:
7886
# # Unifies the usage of the statements
7987
# - key: readability-braces-around-statements.ShortStatementLines

src/plugins/intel_cpu/src/cpu_memory.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ BlockedMemoryDescPtr IMemory::getDescWithType<BlockedMemoryDesc, 0, 0>() const {
3232

3333
namespace {
3434
inline void setSubnormalsToZeroAndbf16Saturation(float* data, size_t size, bool ftz, bool bf16saturation) {
35-
uint32_t* u32data = reinterpret_cast<uint32_t*>(data);
36-
float* floatdata = reinterpret_cast<float*>(data);
35+
auto* u32data = reinterpret_cast<uint32_t*>(data);
36+
auto* floatdata = reinterpret_cast<float*>(data);
3737
if (ftz && bf16saturation) {
3838
for (size_t i = 0; i < size; ++i) {
3939
if ((u32data[i] & (0xFF << 23)) == 0) {
@@ -583,7 +583,7 @@ bool mbind_move(void* data, size_t size, int targetNode) {
583583
int realNode = ov::get_org_numa_id(targetNode);
584584
auto pagesize = getpagesize();
585585
auto page_count = (size + pagesize - 1) / pagesize;
586-
char* pages = reinterpret_cast<char*>( // NOLINT(performance-no-int-to-ptr)
586+
auto* pages = reinterpret_cast<char*>( // NOLINT(performance-no-int-to-ptr)
587587
((reinterpret_cast<uintptr_t>(data)) & ~(static_cast<uintptr_t>(pagesize - 1))));
588588
uint64_t mask = 0;
589589
unsigned flags = 0;
@@ -663,7 +663,7 @@ MemoryPtr split_horizontal(const dnnl::engine& eng,
663663
VectorDims stride_dims = dims;
664664
stride_dims[dim] = splited_dim_vec[0];
665665
size_t stride =
666-
std::accumulate(stride_dims.begin(), stride_dims.end(), static_cast<size_t>(1), std::multiplies<size_t>()) *
666+
std::accumulate(stride_dims.begin(), stride_dims.end(), static_cast<size_t>(1), std::multiplies<>()) *
667667
prec.size();
668668

669669
// create new shape for target memory

src/plugins/intel_cpu/src/cpu_streams_calculation.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
using namespace ov;
2525
using namespace ov::threading;
2626

27-
#define INIT_VAL -100
28-
#define TP_CPU_LIMIT 32
27+
constexpr int INIT_VAL = -100;
28+
constexpr int TP_CPU_LIMIT = 32;
2929

3030
namespace ov::intel_cpu {
3131

@@ -165,7 +165,7 @@ std::vector<std::vector<int>> get_streams_info_table(
165165

166166
auto check_threads_per_stream = [&]() {
167167
int count = 0;
168-
while (1) {
168+
while (true) {
169169
for (int n_type = MAIN_CORE_PROC; n_type <= HYPER_THREADING_PROC; n_type++) {
170170
count += static_cast<int>(proc_type_table[0][n_type] / n_threads_per_stream);
171171
}

src/plugins/intel_cpu/src/dnnl_extension_utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ VectorDims DnnlExtensionUtils::convertToVectorDims(const memory::dims& dims) {
148148
}
149149

150150
VectorDims DnnlExtensionUtils::convertToVectorDims(const dnnl::impl::dims_t dims, const int ndims) {
151-
return VectorDims(dims, dims + ndims);
151+
return {dims, dims + ndims};
152152
}
153153

154154
memory::dims DnnlExtensionUtils::convertToDnnlDims(const VectorDims& dims) {
@@ -227,7 +227,7 @@ std::string DnnlExtensionUtils::query_impl_info_str(const const_dnnl_primitive_d
227227
if (status != dnnl_success) {
228228
OPENVINO_THROW("query_impl_info_str failed.");
229229
}
230-
return std::string(res);
230+
return res;
231231
}
232232

233233
bool DnnlExtensionUtils::find_implementation(dnnl::primitive_desc& desc, impl_desc_type impl_type) {

src/plugins/intel_cpu/src/emitters/plugin/aarch64/jit_conversion_emitters.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ template <cpu_isa_t isa>
242242
void jit_convert_truncation_emitter::emit_isa(const std::vector<size_t>& in_idxs,
243243
const std::vector<size_t>& out_idxs) const {
244244
using TReg = typename dnnl::impl::cpu::aarch64::cpu_isa_traits<isa>::TReg;
245-
TReg src = TReg(in_idxs[0]);
246-
TReg dst = TReg(out_idxs[0]);
245+
auto src = TReg(in_idxs[0]);
246+
auto dst = TReg(out_idxs[0]);
247247
jit_convert_process<TReg>(src, dst, input_type, output_type, false);
248248
}
249249

@@ -267,8 +267,8 @@ template <cpu_isa_t isa>
267267
void jit_convert_saturation_emitter::emit_isa(const std::vector<size_t>& in_idxs,
268268
const std::vector<size_t>& out_idxs) const {
269269
using TReg = typename dnnl::impl::cpu::aarch64::cpu_isa_traits<isa>::TReg;
270-
TReg src = TReg(in_idxs[0]);
271-
TReg dst = TReg(out_idxs[0]);
270+
auto src = TReg(in_idxs[0]);
271+
auto dst = TReg(out_idxs[0]);
272272
jit_convert_process<TReg>(src, dst, input_type, output_type, true);
273273
}
274274

0 commit comments

Comments
 (0)