Skip to content

Commit 3091e2d

Browse files
jkeiserjkeiser
committed
Add fallback, westmere and unthreaded checkperf
1 parent fc50a36 commit 3091e2d

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ executors:
88
environment:
99
CXX: g++
1010
BUILD_FLAGS: -j
11-
CTEST_FLAGS: -j --output-on-failure
11+
CTEST_FLAGS: -j4 --output-on-failure
1212

1313
gcc8:
1414
docker:
1515
- image: gcc:8
1616
environment:
1717
CXX: g++
1818
BUILD_FLAGS: -j
19-
CTEST_FLAGS: -j --output-on-failure
19+
CTEST_FLAGS: -j4 --output-on-failure
2020

2121
gcc9:
2222
docker:
2323
- image: gcc:9
2424
environment:
2525
CXX: g++
2626
BUILD_FLAGS: -j
27-
CTEST_FLAGS: -j --output-on-failure
27+
CTEST_FLAGS: -j4 --output-on-failure
2828

2929
clang6:
3030
docker:
3131
- image: ubuntu:18.04
3232
environment:
3333
CXX: clang++-6.0
3434
BUILD_FLAGS: -j
35-
CTEST_FLAGS: -j --output-on-failure
35+
CTEST_FLAGS: -j4 --output-on-failure
3636

3737
# Reusable test commands (and initializer for clang 6)
3838
commands:

‎.drone.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ steps:
231231
- mkdir build && cd build
232232
- cmake $CMAKE_FLAGS ..
233233
- make -j
234-
- ctest -j --output-on-failure -E checkperf
234+
- ctest -j4 --output-on-failure -E checkperf
235235
---
236236
kind: pipeline
237237
name: amd64_clang_cmake_no_exceptions
@@ -254,7 +254,7 @@ steps:
254254
- mkdir build && cd build
255255
- cmake $CMAKE_FLAGS ..
256256
- make -j
257-
- ctest -j --output-on-failure -E checkperf
257+
- ctest -j4 --output-on-failure -E checkperf
258258
---
259259
kind: pipeline
260260
name: amd64_clang_cmake_static
@@ -277,7 +277,7 @@ steps:
277277
- mkdir build && cd build
278278
- cmake $CMAKE_FLAGS ..
279279
- make -j
280-
- ctest -j --output-on-failure -E checkperf
280+
- ctest -j4 --output-on-failure -E checkperf
281281
---
282282
kind: pipeline
283283
name: amd64_gcc_cmake_static
@@ -300,7 +300,7 @@ steps:
300300
- mkdir build && cd build
301301
- cmake $CMAKE_FLAGS ..
302302
- make -j
303-
- ctest -j --output-on-failure -E checkperf
303+
- ctest -j4 --output-on-failure -E checkperf
304304
---
305305
kind: pipeline
306306
name: amd64_gcc_cmake_dynamic
@@ -323,7 +323,7 @@ steps:
323323
- mkdir build && cd build
324324
- cmake $CMAKE_FLAGS ..
325325
- make -j
326-
- ctest -j --output-on-failure -E checkperf
326+
- ctest -j4 --output-on-failure -E checkperf
327327
---
328328
kind: pipeline
329329
name: arm64_clang_cmake_dynamic
@@ -346,7 +346,7 @@ steps:
346346
- mkdir build && cd build
347347
- cmake $CMAKE_FLAGS ..
348348
- make -j
349-
- ctest -j --output-on-failure -E checkperf
349+
- ctest -j4 --output-on-failure -E checkperf
350350
---
351351
kind: pipeline
352352
name: arm64_gcc_cmake_dynamic
@@ -369,7 +369,7 @@ steps:
369369
- mkdir build && cd build
370370
- cmake $CMAKE_FLAGS ..
371371
- make -j
372-
- ctest -j --output-on-failure -E checkperf
372+
- ctest -j4 --output-on-failure -E checkperf
373373
---
374374
kind: pipeline
375375
name: arm64_clang_cmake_static
@@ -392,7 +392,7 @@ steps:
392392
- mkdir build && cd build
393393
- cmake $CMAKE_FLAGS ..
394394
- make -j
395-
- ctest -j --output-on-failure -E checkperf
395+
- ctest -j4 --output-on-failure -E checkperf
396396
---
397397
kind: pipeline
398398
name: arm64_gcc_cmake_static
@@ -415,7 +415,7 @@ steps:
415415
- mkdir build && cd build
416416
- cmake $CMAKE_FLAGS ..
417417
- make -j
418-
- ctest -j --output-on-failure -E checkperf
418+
- ctest -j4 --output-on-failure -E checkperf
419419

420420
---
421421
kind: pipeline
@@ -439,7 +439,7 @@ steps:
439439
- mkdir build && cd build
440440
- cmake $CMAKE_FLAGS ..
441441
- make -j
442-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
442+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
443443
---
444444
kind: pipeline
445445
name: arm64_gcc_cmake_sanitize
@@ -462,7 +462,7 @@ steps:
462462
- mkdir build && cd build
463463
- cmake $CMAKE_FLAGS ..
464464
- make -j
465-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
465+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
466466

467467
---
468468
kind: pipeline
@@ -486,7 +486,7 @@ steps:
486486
- mkdir build && cd build
487487
- cmake $CMAKE_FLAGS ..
488488
- make -j
489-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
489+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
490490
---
491491
kind: pipeline
492492
name: amd64_gcc_cmake_sanitize
@@ -509,7 +509,7 @@ steps:
509509
- mkdir build && cd build
510510
- cmake $CMAKE_FLAGS ..
511511
- make -j
512-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
512+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
513513

514514
---
515515
kind: pipeline
@@ -533,7 +533,7 @@ steps:
533533
- mkdir build && cd build
534534
- cmake $CMAKE_FLAGS ..
535535
- make -j
536-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
536+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf
537537
---
538538
kind: pipeline
539539
name: amd64_gcc_cmake_sanitize_noavx
@@ -556,4 +556,4 @@ steps:
556556
- mkdir build && cd build
557557
- cmake $CMAKE_FLAGS ..
558558
- make -j
559-
- ASAN_OPTIONS="detect_leaks=0" ctest -j --output-on-failure -E checkperf
559+
- ASAN_OPTIONS="detect_leaks=0" ctest -j4 --output-on-failure -E checkperf

‎benchmark/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ if (NOT MSVC)
4343
CHECKPERF_DIR=${CMAKE_CURRENT_BINARY_DIR}/simdjson-master
4444
CHECKPERF_CMAKECACHE=${SIMDJSON_USER_CMAKECACHE}
4545
bash ${CMAKE_CURRENT_SOURCE_DIR}/checkperf.sh ${PROJECT_SOURCE_DIR}/jsonexamples/twitter.json)
46+
set_property(TEST checkperf APPEND PROPERTY LABELS per_implementation)
4647
set_property(TEST checkperf APPEND PROPERTY DEPENDS parse perfdiff ${SIMDJSON_USER_CMAKECACHE})
48+
set_property(TEST checkperf PROPERTY RUN_SERIAL TRUE)
4749
endif()

0 commit comments

Comments
 (0)