From 13ea0fdd19e91d0b0ceeb56a29e879fc92764b68 Mon Sep 17 00:00:00 2001 From: Matthew Sterrett Date: Tue, 1 Oct 2024 12:28:47 -0700 Subject: [PATCH 1/3] Added taskwait, fixed task threshold and extended tests --- src/xss-common-keyvaluesort.hpp | 9 +++++++-- tests/test-keyvalue.cpp | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/xss-common-keyvaluesort.hpp b/src/xss-common-keyvaluesort.hpp index e6fecc8..88552ce 100644 --- a/src/xss-common-keyvaluesort.hpp +++ b/src/xss-common-keyvaluesort.hpp @@ -559,9 +559,14 @@ X86_SIMD_SORT_INLINE void xss_qsort_kv( keys, indexes, 0, arrsize - 1, maxiters, task_threshold); } else { - kvsort_( - keys, indexes, 0, arrsize - 1, maxiters, 0); + kvsort_(keys, + indexes, + 0, + arrsize - 1, + maxiters, + std::numeric_limits::max()); } +#pragma omp taskwait #else kvsort_(keys, indexes, 0, arrsize - 1, maxiters, 0); #endif diff --git a/tests/test-keyvalue.cpp b/tests/test-keyvalue.cpp index d3a796f..db1985d 100644 --- a/tests/test-keyvalue.cpp +++ b/tests/test-keyvalue.cpp @@ -15,6 +15,10 @@ class simdkvsort : public ::testing::Test { simdkvsort() { std::iota(arrsize.begin(), arrsize.end(), 1); + arrsize.push_back(10'000); + arrsize.push_back(100'000); + arrsize.push_back(1'000'000); + arrtype = {"random", "constant", "sorted", From dceb53b3126628e8c3e1511baa3c153a5d02a0e4 Mon Sep 17 00:00:00 2001 From: Matthew Sterrett Date: Wed, 2 Oct 2024 10:42:21 -0700 Subject: [PATCH 2/3] Updated SPR-icpx CI workflow --- .github/workflows/c-cpp.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 85b7338..7da14c0 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -226,8 +226,7 @@ jobs: echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo add-apt-repository -y "deb https://apt.repos.intel.com/oneapi all main" sudo apt update --allow-insecure-repositories - sudo apt --allow-unauthenticated -y install intel-oneapi-compiler-dpcpp-cpp libgtest-dev curl git python3-pip - sudo pip3 install meson ninja + sudo apt --allow-unauthenticated -y install intel-oneapi-compiler-dpcpp-cpp libgtest-dev curl git python3-pip meson - name: Install Intel SDE run: | From 5cc921679688cee04ad6806f91476180a0e73ec3 Mon Sep 17 00:00:00 2001 From: Raghuveer Devulapalli Date: Fri, 6 Sep 2024 14:30:04 -0700 Subject: [PATCH 3/3] CI: use intel-ubuntu-24.04 --- .github/workflows/build-numpy.yml | 4 ++-- .github/workflows/c-cpp.yml | 16 ++++++++-------- .github/workflows/linting.yml | 2 +- .github/workflows/scorecard.yml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-numpy.yml b/.github/workflows/build-numpy.yml index 1213ef7..c619c1e 100644 --- a/.github/workflows/build-numpy.yml +++ b/.github/workflows/build-numpy.yml @@ -14,7 +14,7 @@ jobs: np-multiarray-tgl: if: github.repository == 'intel/x86-simd-sort' - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - name: Checkout x86-simd-sort @@ -80,7 +80,7 @@ jobs: np-multiarray-spr: if: github.repository == 'intel/x86-simd-sort' - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - name: Checkout x86-simd-sort diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7da14c0..d40bdfe 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -11,7 +11,7 @@ permissions: read-all jobs: SKL-gcc9: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -41,7 +41,7 @@ jobs: SKX-gcc10: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -71,7 +71,7 @@ jobs: TGL-gcc11: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -100,7 +100,7 @@ jobs: SPR-gcc13: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -137,7 +137,7 @@ jobs: SKX-SKL-openmp: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -169,7 +169,7 @@ jobs: SPR-gcc13-special-cases: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -204,7 +204,7 @@ jobs: manylinux-32bit: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 @@ -216,7 +216,7 @@ jobs: SPR-icpx: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 590a804..4333186 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -11,7 +11,7 @@ permissions: read-all jobs: clang-format: - runs-on: intel-ubuntu-latest + runs-on: intel-ubuntu-24.04 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index dc4ad1f..45b8e2e 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -22,7 +22,7 @@ jobs: name: Scorecard analysis if: github.repository == 'intel/x86-simd-sort' - runs-on: ubuntu-latest + runs-on: intel-ubuntu-24.04 permissions: # Needed to upload the results to code-scanning dashboard. security-events: write