Update test matrix, etc. (#1661)

omalyshe · web-flow · commit 6e78ddb76c41 · 2025-03-05T15:01:51.000+01:00
* Update test matrix
* Update ubuntu runner for non-testing jobs as well
* Use common version of clang-format
* Fix typos found by codespell
* Configure codespell
* Disable formatting on a piece of code
diff --git a/.github/scripts/codespell.sh b/.github/scripts/codespell.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2021 Intel Corporation
+# Copyright (c) 2021-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 SCAN_TARGET=$1
 
-SKIP_PATTERN='*/.github/*'
+SKIP_PATTERN='*/.github/*,*/test/common/doctest.*'
+IGNORE_WORDS='parms,affinitized'
 
 # Ignored cases
 IGNORE_COMMAND="sed -e /.*\\sOd\\s*=.*/d \
@@ -49,9 +50,11 @@ IGNORE_COMMAND="sed -e /.*\\sOd\\s*=.*/d \
 -e /.*count_strings.cpp.*ths\\s*=.*/d \
 -e /.*polygon_overlay\/README.md.*ist\\s*=.*/d \
 -e /.*_pipeline_filters.h.*nd\\s*=.*/d \
--e /.*sub_string_finder\/README.md.*ba\\s*=.*/d"
+-e /.*sub_string_finder\/README.md.*ba\\s*=.*/d
+-e /.*frontend.cpp.*SEH\\s*=.*/d
+-e /.*assert_impl.h.*statics\\s*=.*/d"
 
-SCAN_RESULT=`codespell --quiet-level=2 --skip "${SKIP_PATTERN}" ${SCAN_TARGET}`
+SCAN_RESULT=`codespell --quiet-level=2 --skip "${SKIP_PATTERN}" -L "${IGNORE_WORDS}" ${SCAN_TARGET}`
 SCAN_RESULT=`echo -e "${SCAN_RESULT}" | ${IGNORE_COMMAND}`
 echo "${SCAN_RESULT}"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ env:
 
 jobs:
   codespell:
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-22.04]
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
@@ -44,15 +44,15 @@ jobs:
           ${GITHUB_WORKSPACE}/.github/scripts/codespell.sh `pwd`
 
   examples_clang-format:
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-22.04]
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Run scan
         run: |
-          command -v clang-format-10
+          command -v clang-format
           cp -r examples examples_formatted
-          find examples_formatted -regex '.*\.\(cpp\|hpp\)' -exec clang-format-10 -style=file -i {} \;
+          find examples_formatted -regex '.*\.\(cpp\|hpp\)' -exec clang-format -style=file -i {} \;
           diff -r examples examples_formatted
 
   documentation:
@@ -115,7 +115,7 @@ jobs:
 
   copyright_check:
     if: ${{ github.ref != 'refs/heads/master' }}
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-latest]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -159,21 +159,21 @@ jobs:
             std: 14
             build_type: relwithdebinfo
             preview: 'OFF'
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             c_compiler: gcc
             cxx_compiler: g++
             std: 17
             build_type: release
             preview: 'ON'
-          - os: ubuntu-20.04
-            c_compiler: gcc-10
-            cxx_compiler: g++-10
+          - os: ubuntu-24.04-arm
+            c_compiler: gcc-14
+            cxx_compiler: g++-14
             std: 20
             build_type: debug
             preview: 'ON'
-          - os: ubuntu-22.04
-            c_compiler: gcc-11
-            cxx_compiler: g++-11
+          - os: ubuntu-22.04-arm
+            c_compiler: gcc
+            cxx_compiler: g++
             std: 20
             build_type: release
             preview: 'ON'
@@ -198,6 +198,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: macos-15
+            c_compiler: clang
+            cxx_compiler: clang++
+            std: 17
+            build_type: debug
+            preview: 'ON'
           - os: macos-14
             c_compiler: clang
             cxx_compiler: clang++
@@ -231,14 +237,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2019
-            generator: Visual Studio 16 2019
+          - os: windows-2025
+            generator: Visual Studio 17 2022
             c_compiler: cl
             cxx_compiler: cl
             std: 14
             build_type: relwithdebinfo
             preview: 'ON'
-            job_name: windows_cl2019_cxx14_relwithdebinfo_preview=ON
+            job_name: windows_cl2022_cxx14_relwithdebinfo_preview=ON
           - os: windows-2019
             generator: Visual Studio 16 2019
             c_compiler: cl
@@ -282,15 +288,15 @@ jobs:
             std: 14
             build_type: relwithdebinfo
             preview: 'OFF'
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             c_compiler: gcc
             cxx_compiler: g++
             std: 17
             build_type: release
             preview: 'ON'
-          - os: ubuntu-20.04
-            c_compiler: gcc-10
-            cxx_compiler: g++-10
+          - os: ubuntu-24.04
+            c_compiler: gcc
+            cxx_compiler: g++
             std: 20
             build_type: debug
             preview: 'ON'
diff --git a/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst b/doc/main/tbb_userguide/Working_on_the_Assembly_Line_pipeline.rst
@@ -281,7 +281,7 @@ crossing into the next slice, it copies the partial numeral to the next
 slice. Furthermore, it has to indicate when the end of input is reached.
 It does this by invoking method ``stop()`` on a special argument of type
 ``flow_control``. This idiom is required for any functor used for the
-first filter of a pipline.
+first filter of a pipeline.
 
 ::
 
diff --git a/examples/graph/fgbzip2/bzlib.cpp b/examples/graph/fgbzip2/bzlib.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -309,14 +309,14 @@ static void flush_RL(EState* s) {
         }                                                             \
         else /*-- general, uncommon cases --*/                        \
             if (zchh != zs->state_in_ch || zs->state_in_len == 255) { \
-            if (zs->state_in_ch < 256)                                \
-                add_pair_to_block(zs);                                \
-            zs->state_in_ch = zchh;                                   \
-            zs->state_in_len = 1;                                     \
-        }                                                             \
-        else {                                                        \
-            zs->state_in_len++;                                       \
-        }                                                             \
+                if (zs->state_in_ch < 256)                            \
+                    add_pair_to_block(zs);                            \
+                zs->state_in_ch = zchh;                               \
+                zs->state_in_len = 1;                                 \
+            }                                                         \
+            else {                                                    \
+                zs->state_in_len++;                                   \
+            }                                                         \
     }
 
 /*---------------------------------------------------*/
diff --git a/examples/parallel_for/tachyon/src/pthread.cpp b/examples/parallel_for/tachyon/src/pthread.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -113,8 +113,10 @@ int pthread_join(pthread_t th, void **thread_return) {
 void pthread_exit(void *retval) {
     /*  specific to PTHREAD_TO_WINTHREAD  */
 
+    /* clang-format off */
     ExitThread((DWORD)(
         (std::size_t)retval)); /* thread becomes signalled so its death can be waited upon */
+    /* clang-format on */
     /*NOTREACHED*/
     assert(0);
     return; /* void fnc; can't return an error code */
diff --git a/integration/cmake/generate_vars.cmake b/integration/cmake/generate_vars.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2021 Intel Corporation
+# Copyright (c) 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Reuired parameters:
+# Required parameters:
 #     SOURCE_DIR       - incoming path to oneTBB source directory.
 #     BINARY_DIR       - incoming path to oneTBB build directory.
 #     BIN_PATH         - incoming path to oneTBB binaries directory.
diff --git a/rfcs/experimental/parallel_phase_for_task_arena/README.md b/rfcs/experimental/parallel_phase_for_task_arena/README.md
@@ -128,8 +128,8 @@ and the `this_task_arena` namespace.
 ```cpp
 class task_arena {
     enum class leave_policy : /* unspecified type */ {
-        automatic = /* unspecifed */,
-        fast = /* unspecifed */,
+        automatic = /* unspecified */,
+        fast = /* unspecified */,
     };
 
     task_arena(int max_concurrency = automatic, unsigned reserved_for_masters = 1,
diff --git a/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org b/rfcs/proposed/numa_support/tbbbind-link-static-hwloc.org
@@ -51,7 +51,7 @@ developer's code, this is achieved either by:
    release.
 
 However, the requirement to fulfill one of the above steps for the NUMA API to
-start paying off may be considered as an incovenience and, what is more
+start paying off may be considered as an inconvenience and, what is more
 important, it is not always obvious that one of these steps is needed.
 Especially, due to silent behavior in case HWLOC library cannot be found in the
 environment.
diff --git a/test/tbb/test_concurrent_set.cpp b/test/tbb/test_concurrent_set.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2021 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -147,7 +147,7 @@ TEST_CASE("multithreading support in concurrent_multiset with greater compare")
 }
 
 //! \brief \ref resource_usage
-TEST_CASE("multithreding support in concurrent_set with elements ctor and dtor check") {
+TEST_CASE("multithreading support in concurrent_set with elements ctor and dtor check") {
     Checker<checked_set_type::value_type> checker;
     test_concurrent<checked_set_type>();
 }
diff --git a/test/tbb/test_split_node.cpp b/test/tbb/test_split_node.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2024 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -453,7 +453,7 @@ void test_try_put_and_wait() {
         // Hence {f1 - wait_message} task would be processed first and it would spawn tasks for new_work_items in the same order
         // Since new_work_items tasks would processed first and {f2 - 10} would be still in queue
         // it is expected that during the try_put_and_wait {f1 - 10} would be processed first, then new_work_items would be processed
-        // and only when {f2 - 10} would be taken and executed, try_put_and_wait would be exitted
+        // and only when {f2 - 10} would be taken and executed, try_put_and_wait would be exited
         // All of the other tasks for start_work_items would be processed during wait_for_all()
         CHECK_MESSAGE(processed_items1[check_index1++] == wait_message, "Unexpected items processing");
 
diff --git a/test/tbb/test_task_group.cpp b/test/tbb/test_task_group.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2024 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -255,7 +255,7 @@ void TestThreadSafety() {
     // Test and warm up allocator.
     tests();
 
-    // Ensure that cosumption is stabilized.
+    // Ensure that consumption is stabilized.
     std::size_t initial = utils::GetMemoryUsage();
     for (;;) {
         tests();
diff --git a/test/tbbmalloc/test_malloc_whitebox.cpp b/test/tbbmalloc/test_malloc_whitebox.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2024 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -1599,7 +1599,7 @@ void TestHugeSizeThresholdImpl(LargeObjectCache* loc, size_t hugeSize, bool full
         test.clean(/*all*/false);
         test.check(HOThresholdTester::REGULAR_CLEANUP);
     }
-    // Check that all objects dropped from cache after hard cleanup (ignore huge obects threshold)
+    // Check that all objects dropped from cache after hard cleanup (ignore huge objects threshold)
     test.clean(/*all*/true);
     test.check(HOThresholdTester::HARD_CLEANUP);
     // Restore previous settings

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- Copyright (c) 2005-2021 Intel Corporation`
	`2`	`+ Copyright (c) 2005-2025 Intel Corporation`
`3`	`3`
`4`	`4`	`Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`you may not use this file except in compliance with the License.`
`@@ -147,7 +147,7 @@ TEST_CASE("multithreading support in concurrent_multiset with greater compare")`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`//! \brief \ref resource_usage`
`150`		`-TEST_CASE("multithreding support in concurrent_set with elements ctor and dtor check") {`
	`150`	`+TEST_CASE("multithreading support in concurrent_set with elements ctor and dtor check") {`
`151`	`151`	`Checker<checked_set_type::value_type> checker;`
`152`	`152`	`test_concurrent<checked_set_type>();`
`153`	`153`	`}`