Merge pull request #82 from r-devulap/ci-opt

CI: Do not install google benchmarks and use different compiler versions

Author: Raghuveer Devulapalli

.github/workflows/c-cpp.yml

@@ -7,7 +7,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  SKL:
+  SKL-gcc9:
 
     runs-on: intel-ubuntu-latest
 
@@ -17,15 +17,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt -y install g++-13 libgtest-dev meson curl git cmake
-
-    - name: Install google benchmarks
-      run: |
-        git clone https://github.com/google/benchmark.git
-        cd benchmark
-        cmake -E make_directory "build"
-        cmake -E chdir "build" cmake -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_BUILD_TYPE=Release ../
-        sudo cmake --build "build" --config Release --target install
+        sudo apt -y install g++-9 libgtest-dev meson curl git cmake
 
     - name: Install Intel SDE
       run: |
@@ -35,7 +27,7 @@ jobs:
 
     - name: Build
       env:
-        CXX: g++-13
+        CXX: g++-9
       run: |
         make clean
         meson setup --warnlevel 2 --werror --buildtype release builddir
@@ -45,7 +37,7 @@ jobs:
     - name: Run test suite on SKL
       run: sde -skl -- ./builddir/testexe
 
-  SKX:
+  SKX-gcc10:
 
     runs-on: intel-ubuntu-latest
 
@@ -55,15 +47,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt -y install g++-13 libgtest-dev meson curl git cmake
-
-    - name: Install google benchmarks
-      run: |
-        git clone https://github.com/google/benchmark.git
-        cd benchmark
-        cmake -E make_directory "build"
-        cmake -E chdir "build" cmake -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_BUILD_TYPE=Release ../
-        sudo cmake --build "build" --config Release --target install
+        sudo apt -y install g++-10 libgtest-dev meson curl git cmake
 
     - name: Install Intel SDE
       run: |
@@ -73,7 +57,7 @@ jobs:
 
     - name: Build
       env:
-        CXX: g++-13
+        CXX: g++-10
       run: |
         make clean
         meson setup --warnlevel 2 --werror --buildtype release builddir
@@ -83,7 +67,7 @@ jobs:
     - name: Run test suite on SKX
       run: sde -skx -- ./builddir/testexe
 
-  TGL:
+  TGL-gcc11:
 
     runs-on: intel-ubuntu-latest
 
@@ -93,15 +77,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt -y install g++-13 libgtest-dev meson curl git cmake
-
-    - name: Install google benchmarks
-      run: |
-        git clone https://github.com/google/benchmark.git
-        cd benchmark
-        cmake -E make_directory "build"
-        cmake -E chdir "build" cmake -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_BUILD_TYPE=Release ../
-        sudo cmake --build "build" --config Release --target install
+        sudo apt -y install g++-11 libgtest-dev meson curl git cmake
 
     - name: Install Intel SDE
       run: |
@@ -111,7 +87,7 @@ jobs:
 
     - name: Build
       env:
-        CXX: g++-13
+        CXX: g++-11
       run: |
         make clean
         meson setup --warnlevel 2 --werror --buildtype release builddir
@@ -120,7 +96,7 @@ jobs:
     - name: Run test suite on TGL
       run: sde -tgl -- ./builddir/testexe
 
-  SPR:
+  SPR-gcc13:
 
     runs-on: intel-ubuntu-latest
 
@@ -132,14 +108,6 @@ jobs:
         sudo apt update
         sudo apt -y install g++-13 libgtest-dev meson curl git cmake
 
-    - name: Install google benchmarks
-      run: |
-        git clone https://github.com/google/benchmark.git
-        cd benchmark
-        cmake -E make_directory "build"
-        cmake -E chdir "build" cmake -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_BUILD_TYPE=Release ../
-        sudo cmake --build "build" --config Release --target install
-
     - name: Install Intel SDE
       run: |
         curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/784319/sde-external-9.24.0-2023-07-13-lin.tar.xz

lib/x86simdsort.h

@@ -2,6 +2,7 @@
 #define X86_SIMD_SORT
 #include <stdint.h>
 #include <vector>
+#include <cstddef>
 
 #define XSS_EXPORT_SYMBOL __attribute__((visibility("default")))
 #define XSS_HIDE_SYMBOL __attribute__((visibility("hidden")))

src/avx512-common-qsort.h

@@ -68,6 +68,7 @@
 #define SHUFFLE_MASK(a, b, c, d) (a << 6) | (b << 4) | (c << 2) | d
 
 #define PRAGMA(x) _Pragma(#x)
+#define UNUSED(x) (void)(x)
 
 /* Compiler specific macros specific */
 #ifdef _MSC_VER
@@ -929,6 +930,7 @@ avx512_qselect(T *arr, arrsize_t k, arrsize_t arrsize, bool hasnan = false)
             indx_last_elem = move_nans_to_end_of_array(arr, arrsize);
         }
     }
+    UNUSED(hasnan);
     if (indx_last_elem >= k) {
         qselect_<zmm_vector<T>, T>(
                 arr, k, 0, indx_last_elem, 2 * (arrsize_t)log2(indx_last_elem));

src/xss-network-qsort.hpp

@@ -54,8 +54,10 @@ template <typename vtype,
           typename reg_t = typename vtype::reg_t>
 X86_SIMD_SORT_INLINE void bitonic_fullmerge_n_vec(reg_t *regs)
 {
-    if constexpr (numPer > numVecs)
+    if constexpr (numPer > numVecs) {
+        UNUSED(regs);
         return;
+    }
     else {
         X86_SIMD_SORT_UNROLL_LOOP(64)
         for (int i = 0; i < numVecs / numPer; i++) {