From fae0295a799499268caca9c385ac4d7061543980 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 8 Sep 2021 19:16:23 +0200 Subject: ci: Switch multiprocess to i686 build --- .cirrus.yml | 4 ++-- ci/test/00_setup_env_i686_multiprocess.sh | 17 +++++++++++++++++ ci/test/00_setup_env_native_multiprocess.sh | 16 ---------------- 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100755 ci/test/00_setup_env_i686_multiprocess.sh delete mode 100755 ci/test/00_setup_env_native_multiprocess.sh diff --git a/.cirrus.yml b/.cirrus.yml index 5105e0a490..d72f0565a0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -235,7 +235,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" task: - name: '[multiprocess, DEBUG] [focal]' + name: '[multiprocess, i686, DEBUG] [focal]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal @@ -244,7 +244,7 @@ task: env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV MAKEJOBS: "-j8" - FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh" + FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" task: name: '[no wallet] [bionic]' diff --git a/ci/test/00_setup_env_i686_multiprocess.sh b/ci/test/00_setup_env_i686_multiprocess.sh new file mode 100755 index 0000000000..f7f65f6e3a --- /dev/null +++ b/ci/test/00_setup_env_i686_multiprocess.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2020 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +export LC_ALL=C.UTF-8 + +export HOST=i686-pc-linux-gnu +export CONTAINER_NAME=ci_i686_multiprocess +export DOCKER_NAME_TAG=ubuntu:20.04 +export PACKAGES="cmake python3 python3-pip llvm clang g++-multilib" +export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" +export GOAL="install" +export BITCOIN_CONFIG="--enable-debug CC='clang -m32' CXX='clang++ -m32' LDFLAGS='--rtlib=compiler-rt -lgcc_s'" +export TEST_RUNNER_ENV="BITCOIND=bitcoin-node" +export PIP_PACKAGES="lief" diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh deleted file mode 100755 index 8869b2a083..0000000000 --- a/ci/test/00_setup_env_native_multiprocess.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2020 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -export LC_ALL=C.UTF-8 - -export CONTAINER_NAME=ci_native_multiprocess -export DOCKER_NAME_TAG=ubuntu:20.04 -export PACKAGES="cmake python3 python3-pip llvm clang" -export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" -export GOAL="install" -export BITCOIN_CONFIG="--enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM -export TEST_RUNNER_ENV="BITCOIND=bitcoin-node" -export PIP_PACKAGES="lief" -- cgit v1.2.3 From fa309ee61c09726a8780acaea94502712f817921 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 9 Sep 2021 08:48:03 +0200 Subject: bench: Fix 32-bit compilation failure in addrman bench --- src/bench/addrman.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp index 8fbb68c04c..e5dd571a4c 100644 --- a/src/bench/addrman.cpp +++ b/src/bench/addrman.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -110,7 +111,8 @@ static void AddrManGood(benchmark::Bench& bench) * we want to do the same amount of work in every loop iteration. */ bench.epochs(5).epochIterations(1); - const size_t addrman_count{bench.epochs() * bench.epochIterations()}; + const uint64_t addrman_count{bench.epochs() * bench.epochIterations()}; + Assert(addrman_count == 5U); std::vector> addrmans(addrman_count); for (size_t i{0}; i < addrman_count; ++i) { -- cgit v1.2.3