Add fallback, westmere and unthreaded checkperf

This commit is contained in:
John Keiser 2020-04-18 14:45:47 -07:00
parent fc50a36cc5
commit 3091e2dc0e
3 changed files with 21 additions and 19 deletions

View File

@ -8,7 +8,7 @@ executors:
environment: environment:
CXX: g++ CXX: g++
BUILD_FLAGS: -j BUILD_FLAGS: -j
CTEST_FLAGS: -j --output-on-failure CTEST_FLAGS: -j4 --output-on-failure
gcc8: gcc8:
docker: docker:
@ -16,7 +16,7 @@ executors:
environment: environment:
CXX: g++ CXX: g++
BUILD_FLAGS: -j BUILD_FLAGS: -j
CTEST_FLAGS: -j --output-on-failure CTEST_FLAGS: -j4 --output-on-failure
gcc9: gcc9:
docker: docker:
@ -24,7 +24,7 @@ executors:
environment: environment:
CXX: g++ CXX: g++
BUILD_FLAGS: -j BUILD_FLAGS: -j
CTEST_FLAGS: -j --output-on-failure CTEST_FLAGS: -j4 --output-on-failure
clang6: clang6:
docker: docker:
@ -32,7 +32,7 @@ executors:
environment: environment:
CXX: clang++-6.0 CXX: clang++-6.0
BUILD_FLAGS: -j BUILD_FLAGS: -j
CTEST_FLAGS: -j --output-on-failure CTEST_FLAGS: -j4 --output-on-failure
# Reusable test commands (and initializer for clang 6) # Reusable test commands (and initializer for clang 6)
commands: commands:

View File

@ -231,7 +231,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_clang_cmake_no_exceptions name: amd64_clang_cmake_no_exceptions
@ -254,7 +254,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_clang_cmake_static name: amd64_clang_cmake_static
@ -277,7 +277,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_gcc_cmake_static name: amd64_gcc_cmake_static
@ -300,7 +300,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_gcc_cmake_dynamic name: amd64_gcc_cmake_dynamic
@ -323,7 +323,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: arm64_clang_cmake_dynamic name: arm64_clang_cmake_dynamic
@ -346,7 +346,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: arm64_gcc_cmake_dynamic name: arm64_gcc_cmake_dynamic
@ -369,7 +369,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: arm64_clang_cmake_static name: arm64_clang_cmake_static
@ -392,7 +392,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: arm64_gcc_cmake_static name: arm64_gcc_cmake_static
@ -415,7 +415,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ctest -j --output-on-failure -E checkperf - ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
@ -439,7 +439,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: arm64_gcc_cmake_sanitize name: arm64_gcc_cmake_sanitize
@ -462,7 +462,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
@ -486,7 +486,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_gcc_cmake_sanitize name: amd64_gcc_cmake_sanitize
@ -509,7 +509,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
@ -533,7 +533,7 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
--- ---
kind: pipeline kind: pipeline
name: amd64_gcc_cmake_sanitize_noavx name: amd64_gcc_cmake_sanitize_noavx
@ -556,4 +556,4 @@ steps:
- mkdir build && cd build - mkdir build && cd build
- cmake $CMAKE_FLAGS .. - cmake $CMAKE_FLAGS ..
- make -j - make -j
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf - ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf

View File

@ -43,5 +43,7 @@ if (NOT MSVC)
CHECKPERF_DIR=${CMAKE_CURRENT_BINARY_DIR}/simdjson-master CHECKPERF_DIR=${CMAKE_CURRENT_BINARY_DIR}/simdjson-master
CHECKPERF_CMAKECACHE=${SIMDJSON_USER_CMAKECACHE} CHECKPERF_CMAKECACHE=${SIMDJSON_USER_CMAKECACHE}
bash ${CMAKE_CURRENT_SOURCE_DIR}/checkperf.sh ${PROJECT_SOURCE_DIR}/jsonexamples/twitter.json) bash ${CMAKE_CURRENT_SOURCE_DIR}/checkperf.sh ${PROJECT_SOURCE_DIR}/jsonexamples/twitter.json)
set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation)
set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE}) set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE})
set_property(TEST checkperf PROPERTY RUN_SERIAL TRUE)
endif() endif()