Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 4, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ca2456
CI: Do not install google benchmarks and use different compiler versions
Oct 4, 2023
3d0f018
Mark UNUSED variables void
Oct 4, 2023
e299b91
Use header file cstddef for size_t
Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 10 additions & 42 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ "main" ]

jobs:
SKL:
SKL-gcc9:

runs-on: intel-ubuntu-latest

Expand All @@ -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: |
Expand All @@ -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
Expand All @@ -45,7 +37,7 @@ jobs:
- name: Run test suite on SKL
run: sde -skl -- ./builddir/testexe

SKX:
SKX-gcc10:

runs-on: intel-ubuntu-latest

Expand All @@ -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: |
Expand All @@ -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
Expand All @@ -83,7 +67,7 @@ jobs:
- name: Run test suite on SKX
run: sde -skx -- ./builddir/testexe

TGL:
TGL-gcc11:

runs-on: intel-ubuntu-latest

Expand All @@ -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: |
Expand All @@ -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
Expand All @@ -120,7 +96,7 @@ jobs:
- name: Run test suite on TGL
run: sde -tgl -- ./builddir/testexe

SPR:
SPR-gcc13:

runs-on: intel-ubuntu-latest

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/x86simdsort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Expand Down
2 changes: 2 additions & 0 deletions src/avx512-common-qsort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 3 additions & 1 deletion src/xss-network-qsort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down