Skip to content

Commit

Permalink
Merge pull request #33 from reiniscirpons/improve-plots
Browse files Browse the repository at this point in the history 
Improve plots
  • Loading branch information
@reiniscirpons
reiniscirpons authored Nov 2, 2023
2 parents 949e41c + eeb2b41 commit 1871e43
Show file tree
Hide file tree
Showing 28 changed files with 172 additions and 214 deletions.
2 changes: 1 addition & 1 deletion benchmark/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif()
message(STATUS "Building benchmark")

set(benchmark_src
bench_epu8.cpp bench_perm16.cpp bench_bmat8.cpp sort.cpp inverse.cpp)
bench_epu8.cpp bench_perm16.cpp bench_bmat8.cpp)

foreach(f ${benchmark_src})
get_filename_component(benchName ${f} NAME_WE)
Expand Down
102 changes: 33 additions & 69 deletions benchmark/bench_epu8.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ TEST_CASE_METHOD(Fix_epu8, "Permuting", "[Epu8][001]") {
BENCHMARK_FREE_FN_PAIR(HPCombi::permuted, pairs);
}

/*
int Bench_hsum() {
TEST_CASE_METHOD(Fix_epu8, "hsum", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", horiz_sum_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_sum_gen, Fix_epu8::perms);
Expand All @@ -176,90 +174,59 @@ TEST_CASE_METHOD(Fix_epu8, "partial sums", "[Epu8][000]") {
BENCHMARK_LAMBDA("| lambda", partial_sums_gen, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", partial_sums_round, Fix_epu8::perms);
}
/*
//

//
##################################################################################
int Bench_hmax() {
TEST_CASE_METHOD(Fix_epu8, "horiz max", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", horiz_max_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_max_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_max_ref, Fix_epu8::perms);

BENCHMARK_FREE_FN("| no lambda", horiz_max_ref, Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", horiz_max_gen,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", horiz_max4,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", horiz_max3,
Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", horiz_max_gen, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_max4, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_max3, Fix_epu8::perms);

BENCHMARK_LAMBDA("| lambda", horiz_max_ref, Fix_epu8::perms);
// BENCHMARK_LAMBDA("| lambda", horiz_max_gen, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", horiz_max4, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", horiz_max3, Fix_epu8::perms);
return 0;
}
//
##################################################################################
int Bench_pmax() {

TEST_CASE_METHOD(Fix_epu8, "partial max", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", partial_max_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_max_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_max_ref, Fix_epu8::perms);

BENCHMARK_FREE_FN("| no lambda", partial_max_ref, Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", partial_max_gen,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", partial_max_round,
Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", partial_max_gen, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_max_round, Fix_epu8::perms);

BENCHMARK_LAMBDA("| lambda", partial_max_ref, Fix_epu8::perms);
// BENCHMARK_LAMBDA("| lambda", partial_max_gen,
Fix_epu8::perms); BENCHMARK_LAMBDA("| lambda", partial_max_round,
Fix_epu8::perms); return 0;
// BENCHMARK_LAMBDA("| lambda", partial_max_gen, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", partial_max_round, Fix_epu8::perms);
}

//
##################################################################################
int Bench_hmin() {
BENCHMARK_FREE_FN("| no lambda", horiz_min_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_min_ref, Fix_epu8::perms);
TEST_CASE_METHOD(Fix_epu8, "horiz min", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", horiz_min_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_min_ref, Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", horiz_min_gen,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", horiz_min4,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", horiz_min3,
Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", horiz_min_gen, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_min4, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", horiz_min3, Fix_epu8::perms);

BENCHMARK_LAMBDA("| lambda", horiz_min_ref, Fix_epu8::perms);
// BENCHMARK_LAMBDA("| lambda", horiz_min_gen, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", horiz_min4, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", horiz_min3, Fix_epu8::perms);
return 0;
}
//
##################################################################################
int Bench_pmin() {
BENCHMARK_FREE_FN("| no lambda", partial_min_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_min_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_min_ref, Fix_epu8::perms);

TEST_CASE_METHOD(Fix_epu8, "partial min", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", partial_min_ref, Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", partial_min_gen,
Fix_epu8::perms); BENCHMARK_FREE_FN("| no lambda", partial_min_round,
Fix_epu8::perms);
// BENCHMARK_FREE_FN("| no lambda", partial_min_gen, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", partial_min_round, Fix_epu8::perms);
// BENCHMARK_LAMBDA("| lambda", partial_min_gen, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", partial_min_ref, Fix_epu8::perms);
// BENCHMARK_LAMBDA("| lambda", partial_min_gen,
Fix_epu8::perms); BENCHMARK_LAMBDA("| lambda", partial_min_round,
Fix_epu8::perms); return 0;
BENCHMARK_LAMBDA("| lambda", partial_min_round, Fix_epu8::perms);
}

//
##################################################################################
int Bench_eval() {
BENCHMARK_FREE_FN("| no lambda", eval16_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", eval16_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", eval16_ref, Fix_epu8::perms);
TEST_CASE_METHOD(Fix_epu8, "eval16", "[Epu8][000]") {
BENCHMARK_FREE_FN("| no lambda", eval16_ref, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", eval16_gen, Fix_epu8::perms);
BENCHMARK_FREE_FN("| no lambda", eval16_popcount, Fix_epu8::perms);
Expand All @@ -271,24 +238,21 @@ int Bench_eval() {
BENCHMARK_LAMBDA("| lambda", eval16_popcount, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", eval16_arr, Fix_epu8::perms);
BENCHMARK_LAMBDA("| lambda", eval16_cycle, Fix_epu8::perms);
return 0;
}

//
##################################################################################
int Bench_first_diff() {
MYBENCH2("firstDiff_ref_lmbd", first_diff_ref, Fix_epu8::perms);
MYBENCH2("firstDiff_cmpstr_lmbd", first_diff_cmpstr,
Fix_epu8::perms); MYBENCH2("firstDiff_mask_lmbd", first_diff_mask,
Fix_epu8::perms); return 0;
TEST_CASE_METHOD(Fix_epu8, "first diff", "[Epu8][000]") {
BENCHMARK_LAMBDA2("| lambda", first_diff_ref, Fix_epu8::pairs);
#ifdef SIMDE_X86_SSE4_2_NATIVE
BENCHMARK_LAMBDA2("| lambda", first_diff_cmpstr, Fix_epu8::pairs);
#endif
BENCHMARK_LAMBDA2("| lambda", first_diff_mask, Fix_epu8::pairs);
}

//
##################################################################################
int Bench_last_diff() {
MYBENCH2("lastDiff_ref_lmbd", last_diff_ref, Fix_epu8::perms);
MYBENCH2("lastDiff_cmpstr_lmbd", last_diff_cmpstr,
Fix_epu8::perms); MYBENCH2("lastDiff_mask_lmbd", last_diff_mask,
Fix_epu8::perms); return 0;
} */
TEST_CASE_METHOD(Fix_epu8, "last diff", "[Epu8][000]") {
BENCHMARK_LAMBDA2("| lambda", last_diff_ref, Fix_epu8::pairs);
#ifdef SIMDE_X86_SSE4_2_NATIVE
BENCHMARK_LAMBDA2("| lambda", last_diff_cmpstr, Fix_epu8::pairs);
#endif
BENCHMARK_LAMBDA2("| lambda", last_diff_mask, Fix_epu8::pairs);
}
} // namespace HPCombi
11 changes: 4 additions & 7 deletions benchmark/bench_fixture.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,16 @@ std::vector<epu8> rand_transf(int sz) {
std::vector<std::pair<epu8, epu8>> make_pair_sample(size_t sz) {
std::vector<std::pair<epu8, epu8>> res{};
for (size_t i = 0; i < sz; i++) {
res.push_back(std::make_pair(HPCombi::random_epu8(15),
HPCombi::random_epu8(15)));
res.emplace_back(HPCombi::random_epu8(15), HPCombi::random_epu8(15));
}
return res;
}

class Fix_epu8 {
public:
Fix_epu8() : vects(rand_epu8(size)),
transf(rand_transf(size)),
perms(rand_perms(size)),
pairs(make_pair_sample(size))
{}
Fix_epu8()
: vects(rand_epu8(size)), transf(rand_transf(size)),
perms(rand_perms(size)), pairs(make_pair_sample(size)) {}
~Fix_epu8() {}
const std::vector<epu8> vects;
const std::vector<epu8> transf;
Expand Down
25 changes: 22 additions & 3 deletions benchmark/bench_main.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@
return true; \
};

#define BENCHMARK_LAMBDA2(msg, free_fn, sample) \
BENCHMARK(#free_fn " " msg) { \
auto lambda__xxx = [](auto const &x, auto const &y) { \
return free_fn(x, y); \
}; \
for (auto [x, y] : sample) { \
volatile auto dummy = lambda__xxx(x, y); \
} \
return true; \
};

#define BENCHMARK_MEM_FN_PAIR(mem_fn, sample) \
BENCHMARK(#mem_fn) { \
for (auto &pair : sample) { \
volatile auto val = pair.first.mem_fn(pair.second); \
} \
return true; \
};

#define BENCHMARK_MEM_FN_PAIR_EQ(mem_fn, sample) \
BENCHMARK(#mem_fn) { \
for (auto &pair : sample) { \
Expand All @@ -48,10 +67,10 @@
return true; \
};

#define BENCHMARK_FREE_FN_PAIR(free_fn, sample) \
BENCHMARK(#free_fn) { \
#define BENCHMARK_FREE_FN_PAIR(free_fn, sample) \
BENCHMARK(#free_fn) { \
for (auto &pair : sample) { \
volatile auto val = free_fn(pair.first, pair.second); \
volatile auto val = free_fn(pair.first, pair.second); \
} \
return true; \
};
Loading

0 comments on commit 1871e43

Please sign in to comment.