From 914d57bf82a343df345ebb6b0700e368a82d80e8 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Tue, 22 Feb 2022 13:40:30 +1100 Subject: Import wiredtiger: dd462d128df33f64b3448338e5d34bd5d6c86bfc from branch mongodb-5.3 ref: af9f6d8b58..dd462d128d for: 5.3.0-rc1 WT-8482 Use toolchain clang binary for PPC ASAN tests --- .../toolchains/mongodbtoolchain_v4_clang.cmake | 9 ++++ .../cmake/toolchains/mongodbtoolchain_v4_gcc.cmake | 9 ++++ src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/evergreen.yml | 63 +++------------------- 4 files changed, 26 insertions(+), 57 deletions(-) create mode 100644 src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_clang.cmake create mode 100644 src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_gcc.cmake diff --git a/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_clang.cmake b/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_clang.cmake new file mode 100644 index 00000000000..0e20a3e95bd --- /dev/null +++ b/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_clang.cmake @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.10.0) + +if(NOT TOOLCHAIN_ROOT) + set(TOOLCHAIN_ROOT "/opt/mongodbtoolchain/v4") +endif() + +set(CMAKE_C_COMPILER "${TOOLCHAIN_ROOT}/bin/clang") +set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/bin/clang++") +set(CMAKE_ASM_COMPILER "${TOOLCHAIN_ROOT}/bin/clang") diff --git a/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_gcc.cmake b/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_gcc.cmake new file mode 100644 index 00000000000..52374b4e2d4 --- /dev/null +++ b/src/third_party/wiredtiger/cmake/toolchains/mongodbtoolchain_v4_gcc.cmake @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.10.0) + +if(NOT TOOLCHAIN_ROOT) + set(TOOLCHAIN_ROOT "/opt/mongodbtoolchain/v4") +endif() + +set(CMAKE_C_COMPILER "${TOOLCHAIN_ROOT}/bin/gcc") +set(CMAKE_CXX_COMPILER "${TOOLCHAIN_ROOT}/bin/g++") +set(CMAKE_ASM_COMPILER "${TOOLCHAIN_ROOT}/bin/gcc") diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d48c098fa74..958c0c71477 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.3", - "commit": "af9f6d8b5801e8e2ef998f3f6aaabccf6218b343" + "commit": "dd462d128df33f64b3448338e5d34bd5d6c86bfc" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 4ab807e81a9..a1f7098fe2d 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -158,7 +158,7 @@ functions: if [ -d cmake_build ]; then rm -r cmake_build; fi mkdir -p cmake_build cd cmake_build - $CMAKE -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/mongodbtoolchain_v3_clang.cmake -DCMAKE_C_FLAGS="-ggdb" -DWITH_PIC=1 \ + $CMAKE -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/mongodbtoolchain_v4_clang.cmake -DCMAKE_C_FLAGS="-ggdb" -DWITH_PIC=1 \ -DHAVE_DIAGNOSTIC=1 -DCMAKE_BUILD_TYPE=ASan \ -DHAVE_BUILTIN_EXTENSION_LZ4=1 -DHAVE_BUILTIN_EXTENSION_SNAPPY=1 -DHAVE_BUILTIN_EXTENSION_ZLIB=1 ${configure_python_setting|} \ -G "${cmake_generator|Ninja}" ../. @@ -2287,28 +2287,6 @@ tasks: ASAN_SYMBOLIZER_PATH=/opt/mongodbtoolchain/v4/bin/llvm-symbolizer format_test_script_args: -S - # FIXME-WT-8482: Replace this test with format-asan-smoke-test. - - name: format-asan-smoke-ppc-test - commands: - - func: "get project" - - func: "compile wiredtiger" - vars: - # FIXME-WT-8482: CC is set to the system default "clang" binary here as a workaround. - # Change it back to mongodbtoolchain "clang" binary. - posix_configure_flags: - -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/clang.cmake - -DHAVE_DIAGNOSTIC=1 - -DWITH_PIC=1 - -DCMAKE_BUILD_TYPE=ASan - -DHAVE_BUILTIN_EXTENSION_LZ4=1 -DHAVE_BUILTIN_EXTENSION_SNAPPY=1 -DHAVE_BUILTIN_EXTENSION_ZLIB=1 - - func: "format test script" - # Run smoke tests, don't stop at failed tests, use default config - vars: - test_env_vars: - ASAN_OPTIONS="detect_leaks=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1" - ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer - format_test_script_args: -S - - name: format-wtperf-test commands: - func: "get project" @@ -2567,34 +2545,6 @@ tasks: #run for 2 hours ( 2 * 60 = 120 minutes), use default config format_test_script_args: -e "SEGFAULT_SIGNALS=all" -b "catchsegv ./t" -t 120 - # FIXME-WT-8482: Replace this test with format-stress-sanitizer-test. - - name: format-stress-sanitizer-ppc-test - tags: ["stress-test-ppc-1"] - # Set 2.5 hours timeout (60 * 60 * 2.5) - exec_timeout_secs: 9000 - commands: - - func: "get project" - - func: "compile wiredtiger" - vars: - # FIXME-WT-8482: CC is set to the system default "clang" binary here as a workaround. - # Change it back to mongodbtoolchain "clang" binary. - posix_configure_flags: - -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/clang.cmake - -DHAVE_DIAGNOSTIC=1 - -DWITH_PIC=1 - -DHAVE_BUILTIN_EXTENSION_LZ4=1 - -DHAVE_BUILTIN_EXTENSION_SNAPPY=1 - -DHAVE_BUILTIN_EXTENSION_ZLIB=1 - -DCMAKE_BUILD_TYPE=ASan - - func: "format test script" - vars: - test_env_vars: - ASAN_OPTIONS="detect_leaks=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1" - ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer - # Run for 2 hours (2 * 60 = 120 minutes), don't stop at failed tests, use default config - format_test_script_args: -t 120 - - - <<: *format-stress-test name: format-stress-test-1 tags: ["stress-test-1"] @@ -2609,10 +2559,10 @@ tasks: tags: ["stress-test-4"] - <<: *format-stress-sanitizer-test name: format-stress-sanitizer-test-1 - tags: ["stress-test-1"] + tags: ["stress-test-1", "stress-test-ppc-1"] - <<: *format-stress-sanitizer-test name: format-stress-sanitizer-test-2 - tags: ["stress-test-2"] + tags: ["stress-test-2", "stress-test-ppc-2"] - <<: *format-stress-sanitizer-test name: format-stress-sanitizer-test-3 tags: ["stress-test-3"] @@ -4089,7 +4039,7 @@ buildvariants: WT_BUILDDIR=$(git rev-parse --show-toplevel)/cmake_build LD_LIBRARY_PATH=$WT_BUILDDIR posix_configure_flags: - -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/mongodbtoolchain_v3_gcc.cmake + -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/mongodbtoolchain_v4_gcc.cmake -DCMAKE_C_FLAGS="-ggdb" -DHAVE_DIAGNOSTIC=1 -DENABLE_PYTHON=1 @@ -4097,7 +4047,7 @@ buildvariants: -DENABLE_SNAPPY=1 -DENABLE_STRICT=1 -DCMAKE_INSTALL_PREFIX=$(pwd)/LOCAL_INSTALL - python_binary: '/opt/mongodbtoolchain/v3/bin/python3' + python_binary: '/opt/mongodbtoolchain/v4/bin/python3' # Use half number of vCPU to avoid OOM kill failure smp_command: -j $(echo $(grep -c ^processor /proc/cpuinfo) / 2 | bc) cmake_generator: Ninja @@ -4106,9 +4056,10 @@ buildvariants: - name: compile - name: unit-test - name: format-smoke-test - - name: format-asan-smoke-ppc-test + - name: format-asan-smoke-test - name: format-wtperf-test - name: ".stress-test-ppc-1" + - name: ".stress-test-ppc-2" - name: ubuntu1804-zseries display_name: "~ Ubuntu 18.04 zSeries" -- cgit v1.2.1