Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

env:
CODSPEED_VERSION: v1.3.0
CODESPEED_MODE: walltime

jobs:
build:
Expand Down Expand Up @@ -130,7 +131,7 @@ jobs:
id: cache-codspeed
with:
path: codspeed-cpp
key: codspeed-cpp-${{ matrix.os }}-${{ env.CODSPEED_VERSION }}
key: codspeed-cpp-${{ matrix.os }}-${{ env.CODSPEED_VERSION }}-${{ env.CODESPEED_MODE }}

- name: Checkout CodSpeed integration library
if: steps.cache-codspeed.outputs.cache-hit != 'true'
Expand All @@ -143,9 +144,10 @@ jobs:

- name: Configure CMake for CodSpeed integration library
if: steps.cache-codspeed.outputs.cache-hit != 'true'
shell: bash
run: |
cd codspeed-cpp/google_benchmark
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DCODSPEED_MODE=instrumentation -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF.
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DCODSPEED_MODE=${CODESPEED_MODE} -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF.

- name: Build CodSpeed integration library
if: steps.cache-codspeed.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -225,7 +227,7 @@ jobs:
- name: Benchmarks
uses: CodSpeedHQ/action@v4
with:
mode: instrumentation
mode: ${{ env.CODESPEED_MODE }}
run: cd benchmarks && make bench

- name: Test Julia
Expand Down
12 changes: 6 additions & 6 deletions benchmarks/bench_nfft_direct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,39 +148,39 @@ BENCH(nfft_forward_direct_1d)
->Args({64, 200})
->Args({128, 400})
->Args({256, 800})
->Args({512, 1600})
//->Args({512, 1600})
->Complexity();

BENCH(nfft_adjoint_direct_1d)
->Args({32, 100})
->Args({64, 200})
->Args({128, 400})
->Args({256, 800})
->Args({512, 1600})
//->Args({512, 1600})
->Complexity();

BENCH(nfft_forward_direct_2d)
->Args({16, 16, 500})
->Args({32, 32, 1000})
->Args({64, 64, 2000})
//->Args({64, 64, 2000})
->Complexity();

BENCH(nfft_adjoint_direct_2d)
->Args({16, 16, 500})
->Args({32, 32, 1000})
->Args({64, 64, 2000})
//->Args({64, 64, 2000})
->Complexity();

BENCH(nfft_forward_direct_3d)
->Args({4, 4, 4, 250})
->Args({8, 8, 8, 500})
->Args({16, 16, 16, 1000})
//->Args({16, 16, 16, 1000})
->Complexity();

BENCH(nfft_adjoint_direct_3d)
->Args({4, 4, 4, 250})
->Args({8, 8, 8, 500})
->Args({16, 16, 16, 1000})
//->Args({16, 16, 16, 1000})
->Complexity();

// Main function.
Expand Down
2 changes: 1 addition & 1 deletion m4/nfft_lib_codspeed.m4
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ AC_DEFUN([NFFT_LIB_CODSPEED],
nfft_codspeed_LDFLAGS=""
fi

nfft_codspeed_CPPFLAGS="-DBENCHMARK_STATIC_DEFINE -DCODSPEED_ENABLED -DCODSPEED_INSTRUMENTATION $nfft_codspeed_CPPFLAGS"
nfft_codspeed_CPPFLAGS="-DBENCHMARK_STATIC_DEFINE -DCODSPEED_ENABLED -DCODSPEED_WALLTIME $nfft_codspeed_CPPFLAGS"
nfft_codspeed_CXXFLAGS=""
nfft_codspeed_LDFLAGS="$nfft_codspeed_LDFLAGS"
nfft_codspeed_LIBS="-lbenchmark -lcodspeed -linstrument_hooks"
Expand Down
Loading