diff options
| author | Geir Storli <geirst@yahooinc.com> | 2022-10-25 16:01:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 16:01:35 +0200 |
| commit | bf4fe98d6c1594081e8f052e9311eca2745c6ec8 (patch) | |
| tree | dddefcb5e736045a836bf9c660cb9a6bc4479aa2 /searchlib | |
| parent | 4bb717cad6b0c9bcc69f5344081a0980fa3c9370 (diff) | |
| parent | f2314b1f389bb1e31c77129e7b836f87241a56f0 (diff) | |
Merge pull request #24563 from vespa-engine/toregge/disable-aggressive-loop-optimisations-warnings-when-compiling-with-lto
Disable agressive loop optimizations warnings when compiling with lto.
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/tests/sort/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/sort.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/searchlib/src/tests/sort/CMakeLists.txt b/searchlib/src/tests/sort/CMakeLists.txt index e342237adf0..def7c0681c3 100644 --- a/searchlib/src/tests/sort/CMakeLists.txt +++ b/searchlib/src/tests/sort/CMakeLists.txt @@ -12,6 +12,9 @@ vespa_add_executable(searchlib_sort_test_app DEPENDS searchlib ) +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND VESPA_USE_LTO) + target_link_options(searchlib_sort_test_app PRIVATE "-Wno-aggressive-loop-optimizations") +endif() #vespa_add_test(NAME searchlib_sort_test_app COMMAND searchlib_sort_test_app) vespa_add_executable(searchlib_uca_stress_app SOURCES diff --git a/searchlib/src/vespa/searchlib/common/sort.h b/searchlib/src/vespa/searchlib/common/sort.h index b90bda698a0..4f0d285f1c7 100644 --- a/searchlib/src/vespa/searchlib/common/sort.h +++ b/searchlib/src/vespa/searchlib/common/sort.h @@ -233,7 +233,12 @@ void ShiftBasedRadixSorterBase<GR, T, SHIFT>::radix_fetch(GR R, size_t cnt[256], } } for(; p < n; p++) { +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Waggressive-loop-optimizations" +#endif cnt[(R(a[p]) >> SHIFT) & 0xFF]++; +#pragma GCC diagnostic pop } } |