Add deserialize + CheckBlock benchmarks, and a full block hex

This commit is contained in:
Matt Corallo 2016-06-01 01:39:56 -07:00
parent 924de0bd75
commit b2e178a2d2
3 changed files with 71 additions and 1 deletions

View File

@ -6,11 +6,15 @@ bin_PROGRAMS += bench/bench_bitcoin
BENCH_SRCDIR = bench BENCH_SRCDIR = bench
BENCH_BINARY = bench/bench_bitcoin$(EXEEXT) BENCH_BINARY = bench/bench_bitcoin$(EXEEXT)
RAW_TEST_FILES = \
bench/data/block413567.raw
GENERATED_TEST_FILES = $(RAW_TEST_FILES:.raw=.raw.h)
bench_bench_bitcoin_SOURCES = \ bench_bench_bitcoin_SOURCES = \
bench/bench_bitcoin.cpp \ bench/bench_bitcoin.cpp \
bench/bench.cpp \ bench/bench.cpp \
bench/bench.h \ bench/bench.h \
bench/checkblock.cpp \
bench/Examples.cpp \ bench/Examples.cpp \
bench/rollingbloom.cpp \ bench/rollingbloom.cpp \
bench/crypto_hash.cpp \ bench/crypto_hash.cpp \
@ -20,6 +24,8 @@ bench_bench_bitcoin_SOURCES = \
bench/base58.cpp \ bench/base58.cpp \
bench/lockedpool.cpp bench/lockedpool.cpp
nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_TEST_FILES)
bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bench_bench_bitcoin_LDADD = \ bench_bench_bitcoin_LDADD = \
@ -45,10 +51,12 @@ endif
bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) bench_bench_bitcoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) bench_bench_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno CLEAN_BITCOIN_BENCH = bench/*.gcda bench/*.gcno $(GENERATED_TEST_FILES)
CLEANFILES += $(CLEAN_BITCOIN_BENCH) CLEANFILES += $(CLEAN_BITCOIN_BENCH)
bench/checkblock.cpp: bench/data/block413567.raw.h
bitcoin_bench: $(BENCH_BINARY) bitcoin_bench: $(BENCH_BINARY)
bench: $(BENCH_BINARY) FORCE bench: $(BENCH_BINARY) FORCE
@ -56,3 +64,10 @@ bench: $(BENCH_BINARY) FORCE
bitcoin_bench_clean : FORCE bitcoin_bench_clean : FORCE
rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY) rm -f $(CLEAN_BITCOIN_BENCH) $(bench_bench_bitcoin_OBJECTS) $(BENCH_BINARY)
%.raw.h: %.raw
@$(MKDIR_P) $(@D)
@echo "static unsigned const char $(*F)[] = {" >> $@
@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' >> $@
@echo "};" >> $@
@echo "Generated $@"

55
src/bench/checkblock.cpp Normal file
View File

@ -0,0 +1,55 @@
// Copyright (c) 2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "bench.h"
#include "chainparams.h"
#include "main.h"
#include "consensus/validation.h"
namespace block_bench {
#include "bench/data/block413567.raw.h"
}
// These are the two major time-sinks which happen after we have fully received
// a block off the wire, but before we can relay the block on to peers using
// compact block relay.
static void DeserializeBlockTest(benchmark::State& state)
{
CDataStream stream((const char*)block_bench::block413567,
(const char*)&block_bench::block413567[sizeof(block_bench::block413567)],
SER_NETWORK, PROTOCOL_VERSION);
char a;
stream.write(&a, 1); // Prevent compaction
while (state.KeepRunning()) {
CBlock block;
stream >> block;
assert(stream.Rewind(sizeof(block_bench::block413567)));
}
}
static void DeserializeAndCheckBlockTest(benchmark::State& state)
{
CDataStream stream((const char*)block_bench::block413567,
(const char*)&block_bench::block413567[sizeof(block_bench::block413567)],
SER_NETWORK, PROTOCOL_VERSION);
char a;
stream.write(&a, 1); // Prevent compaction
Consensus::Params params = Params(CBaseChainParams::MAIN).GetConsensus();
while (state.KeepRunning()) {
CBlock block; // Note that CBlock caches its checked state, so we need to recreate it here
stream >> block;
assert(stream.Rewind(sizeof(block_bench::block413567)));
CValidationState state;
assert(CheckBlock(block, state, params));
}
}
BENCHMARK(DeserializeBlockTest);
BENCHMARK(DeserializeAndCheckBlockTest);

Binary file not shown.