diff --git a/benchmarks/probes_per_technique.cu b/benchmarks/probes_per_technique.cu index 8816af8..6dee6be 100644 --- a/benchmarks/probes_per_technique.cu +++ b/benchmarks/probes_per_technique.cu @@ -286,20 +286,21 @@ void bench_bcht(std::vector& keys, // 8 { - auto bcht_8_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 8); + auto bcht_8_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 8); output << bcht_8_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < bcht_8_result.find_probes.size(); i++) { output << bcht_8_result.find_probes[i] / float(num_keys) << ","; @@ -308,20 +309,21 @@ void bench_bcht(std::vector& keys, // 16 { - auto bcht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto bcht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << bcht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < bcht_16_result.find_probes.size(); i++) { output << bcht_16_result.find_probes[i] / float(num_keys) << ","; @@ -330,20 +332,21 @@ void bench_bcht(std::vector& keys, // 32 { - auto bcht_32_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto bcht_32_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << bcht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < bcht_32_result.find_probes.size(); i++) { output << bcht_32_result.find_probes[i] / float(num_keys) << ","; @@ -403,20 +406,21 @@ void bench_iht(std::vector& keys, // 16 0.2 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << iht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_16_result.find_probes.size(); i++) { output << iht_16_result.find_probes[i] / float(num_keys) << ","; @@ -425,20 +429,21 @@ void bench_iht(std::vector& keys, // 16 0.4 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << iht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_16_result.find_probes.size(); i++) { output << iht_16_result.find_probes[i] / float(num_keys) << ","; @@ -447,20 +452,21 @@ void bench_iht(std::vector& keys, // 16 0.6 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << iht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_16_result.find_probes.size(); i++) { output << iht_16_result.find_probes[i] / float(num_keys) << ","; @@ -470,20 +476,20 @@ void bench_iht(std::vector& keys, // 16 0.8 { auto iht_16_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << iht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_16_result.find_probes.size(); i++) { output << iht_16_result.find_probes[i] / float(num_keys) << ","; @@ -492,20 +498,21 @@ void bench_iht(std::vector& keys, // 32 0.2 { - auto iht_32_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto iht_32_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << iht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_32_result.find_probes.size(); i++) { output << iht_32_result.find_probes[i] / float(num_keys) << ","; @@ -515,20 +522,20 @@ void bench_iht(std::vector& keys, // 32 0.4 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << iht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_32_result.find_probes.size(); i++) { output << iht_32_result.find_probes[i] / float(num_keys) << ","; @@ -538,20 +545,20 @@ void bench_iht(std::vector& keys, // 32 0.6 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << iht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_32_result.find_probes.size(); i++) { output << iht_32_result.find_probes[i] / float(num_keys) << ","; @@ -561,20 +568,20 @@ void bench_iht(std::vector& keys, // 32 0.8 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << iht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < iht_32_result.find_probes.size(); i++) { output << iht_32_result.find_probes[i] / float(num_keys) << ","; @@ -629,20 +636,20 @@ void bench_p2bht(std::vector& keys, // 16 { auto p2cht_16_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << p2cht_16_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < p2cht_16_result.find_probes.size(); i++) { output << p2cht_16_result.find_probes[i] / float(num_keys) << ","; @@ -652,20 +659,20 @@ void bench_p2bht(std::vector& keys, // 32 { auto p2cht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << p2cht_32_result.insert_probes[0] / float(num_keys) << ","; for (size_t i = 0; i < p2cht_32_result.find_probes.size(); i++) { output << p2cht_32_result.find_probes[i] / float(num_keys) << ","; diff --git a/benchmarks/rates_per_technique.cu b/benchmarks/rates_per_technique.cu index e04d6f2..7bf9f87 100644 --- a/benchmarks/rates_per_technique.cu +++ b/benchmarks/rates_per_technique.cu @@ -269,20 +269,21 @@ void bench_bcht(std::vector& keys, // 8 { - auto bcht_8_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 8); + auto bcht_8_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 8); output << float(num_keys) / 1.0e6 / bcht_8_result.insert_time << ","; for (size_t i = 0; i < bcht_8_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_8_result.find_times[i] << ","; @@ -291,20 +292,21 @@ void bench_bcht(std::vector& keys, // 16 { - auto bcht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto bcht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / bcht_16_result.insert_time << ","; for (size_t i = 0; i < bcht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_16_result.find_times[i] << ","; @@ -313,20 +315,21 @@ void bench_bcht(std::vector& keys, // 32 { - auto bcht_32_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto bcht_32_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / bcht_32_result.insert_time << ","; for (size_t i = 0; i < bcht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_32_result.find_times[i] << ","; @@ -386,20 +389,21 @@ void bench_iht(std::vector& keys, // 16 0.2 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -408,20 +412,21 @@ void bench_iht(std::vector& keys, // 16 0.4 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -430,20 +435,21 @@ void bench_iht(std::vector& keys, // 16 0.6 { - auto iht_16_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -453,20 +459,20 @@ void bench_iht(std::vector& keys, // 16 0.8 { auto iht_16_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -475,20 +481,21 @@ void bench_iht(std::vector& keys, // 32 0.2 { - auto iht_32_result = bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto iht_32_result = + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -498,20 +505,20 @@ void bench_iht(std::vector& keys, // 32 0.4 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -521,20 +528,20 @@ void bench_iht(std::vector& keys, // 32 0.6 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -544,20 +551,20 @@ void bench_iht(std::vector& keys, // 32 0.8 { auto iht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -612,20 +619,20 @@ void bench_p2bht(std::vector& keys, // 16 { auto p2cht_16_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / p2cht_16_result.insert_time << ","; for (size_t i = 0; i < p2cht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / p2cht_16_result.find_times[i] << ","; @@ -635,20 +642,20 @@ void bench_p2bht(std::vector& keys, // 32 { auto p2cht_32_result = - bench_insert_find>(keys, - d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(keys, + d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / p2cht_32_result.insert_time << ","; for (size_t i = 0; i < p2cht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / p2cht_32_result.find_times[i] << ","; diff --git a/benchmarks/rates_per_technique_fixed_lf.cu b/benchmarks/rates_per_technique_fixed_lf.cu index 9543ec9..e49f2f1 100644 --- a/benchmarks/rates_per_technique_fixed_lf.cu +++ b/benchmarks/rates_per_technique_fixed_lf.cu @@ -266,19 +266,20 @@ void bench_bcht(std::vector& keys, // 8 { - auto bcht_8_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 8); + auto bcht_8_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 8); output << float(num_keys) / 1.0e6 / bcht_8_result.insert_time << ","; for (size_t i = 0; i < bcht_8_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_8_result.find_times[i] << ","; @@ -287,19 +288,20 @@ void bench_bcht(std::vector& keys, // 16 { - auto bcht_16_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto bcht_16_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / bcht_16_result.insert_time << ","; for (size_t i = 0; i < bcht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_16_result.find_times[i] << ","; @@ -308,19 +310,20 @@ void bench_bcht(std::vector& keys, // 32 { - auto bcht_32_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto bcht_32_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / bcht_32_result.insert_time << ","; for (size_t i = 0; i < bcht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / bcht_32_result.find_times[i] << ","; @@ -381,19 +384,20 @@ void bench_iht(std::vector& keys, // 16 0.2 { - auto iht_16_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -402,19 +406,20 @@ void bench_iht(std::vector& keys, // 16 0.4 { - auto iht_16_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -423,19 +428,20 @@ void bench_iht(std::vector& keys, // 16 0.6 { - auto iht_16_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + auto iht_16_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -445,19 +451,19 @@ void bench_iht(std::vector& keys, // 16 0.8 { auto iht_16_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / iht_16_result.insert_time << ","; for (size_t i = 0; i < iht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_16_result.find_times[i] << ","; @@ -466,19 +472,20 @@ void bench_iht(std::vector& keys, // 32 0.2 { - auto iht_32_result = bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + auto iht_32_result = + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -488,19 +495,19 @@ void bench_iht(std::vector& keys, // 32 0.4 { auto iht_32_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -510,19 +517,19 @@ void bench_iht(std::vector& keys, // 32 0.6 { auto iht_32_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -532,19 +539,19 @@ void bench_iht(std::vector& keys, // 32 0.8 { auto iht_32_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 32); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 32); output << float(num_keys) / 1.0e6 / iht_32_result.insert_time << ","; for (size_t i = 0; i < iht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / iht_32_result.find_times[i] << ","; @@ -600,19 +607,19 @@ void bench_p2bht(std::vector& keys, // 16 { auto p2cht_16_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / p2cht_16_result.insert_time << ","; for (size_t i = 0; i < p2cht_16_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / p2cht_16_result.find_times[i] << ","; @@ -622,19 +629,19 @@ void bench_p2bht(std::vector& keys, // 32 { auto p2cht_32_result = - bench_insert_find>(d_keys, - d_pairs, - d_find_keys, - d_find_results, - find_keys, - find_results, - cpu_ref_set, - validate, - num_keys, - load_factor, - exist_ratios, - to_value, - 16); + bench_insert_find>(d_keys, + d_pairs, + d_find_keys, + d_find_results, + find_keys, + find_results, + cpu_ref_set, + validate, + num_keys, + load_factor, + exist_ratios, + to_value, + 16); output << float(num_keys) / 1.0e6 / p2cht_32_result.insert_time << ","; for (size_t i = 0; i < p2cht_32_result.find_times.size(); i++) { output << float(num_keys) / 1.0e6 / p2cht_32_result.find_times[i] << ","; diff --git a/examples/cpm/CMakeLists.txt b/examples/cpm/CMakeLists.txt index fed0c03..413bb9a 100644 --- a/examples/cpm/CMakeLists.txt +++ b/examples/cpm/CMakeLists.txt @@ -12,6 +12,7 @@ CPMAddPackage( OPTIONS "build_tests OFF" "build_benchmarks OFF" + "build_examples OFF" ) set(CUDA_ARCHS 70) diff --git a/examples/custom_types_example.cu b/examples/custom_types_example.cu index 4b88cf1..48886f7 100644 --- a/examples/custom_types_example.cu +++ b/examples/custom_types_example.cu @@ -31,10 +31,10 @@ #include template -using iht16_80 = iht16; +using iht16_80 = bght::iht16; template -using iht32_80 = iht32; +using iht32_80 = bght::iht32; template void CHECK(T1 t1, T2 t2) { @@ -441,22 +441,22 @@ int main() { test_custom_type(); std::cout << "Testing vec3-like type\n"; test_vec3_like(); - std::cout << "Testing bcht8\n"; - test_scheme(); - std::cout << "Testing bcht16\n"; - test_scheme(); - std::cout << "Testing bcht32\n"; - test_scheme(); - - std::cout << "Testing iht16_80\n"; + std::cout << "Testing bght::bcht8\n"; + test_scheme(); + std::cout << "Testing bght::bcht16\n"; + test_scheme(); + std::cout << "Testing bght::bcht32\n"; + test_scheme(); + + std::cout << "Testing bght::iht16_80\n"; test_scheme(); - std::cout << "Testing iht32_80\n"; + std::cout << "Testing bght::iht32_80\n"; test_scheme(); - std::cout << "Testing p2bht16\n"; - test_scheme(); - std::cout << "Testing p2bht32\n"; - test_scheme(); + std::cout << "Testing bght::p2bht16\n"; + test_scheme(); + std::cout << "Testing bght::p2bht32\n"; + test_scheme(); std::cout << "Success\n"; diff --git a/examples/iht_example.cu b/examples/iht_example.cu index 86e8a4c..4177ddd 100644 --- a/examples/iht_example.cu +++ b/examples/iht_example.cu @@ -126,21 +126,21 @@ int main(int argc, char** argv) { if (threshold == 0) { if (bucket_size == 8) { - do_test(argc, argv); + do_test(argc, argv); } else if (bucket_size == 16) { - do_test(argc, argv); + do_test(argc, argv); } else if (bucket_size == 32) { - do_test(argc, argv); + do_test(argc, argv); } else { std::cout << "Not supported bucket size\n"; } } else { if (bucket_size == 8) { - do_test(argc, argv); + do_test(argc, argv); } else if (bucket_size == 16) { - do_test(argc, argv); + do_test(argc, argv); } else if (bucket_size == 32) { - do_test(argc, argv); + do_test(argc, argv); } else { std::cout << "Not supported bucket size\n"; } diff --git a/include/bght/bcht.hpp b/include/bght/bcht.hpp index 374b7be..8c20fc4 100644 --- a/include/bght/bcht.hpp +++ b/include/bght/bcht.hpp @@ -17,8 +17,8 @@ #pragma once #include #include -#include #include +#include #include #include #include @@ -218,8 +218,6 @@ struct bcht { std::size_t num_buckets_; }; -} // namespace bght - template using bcht8 = typename bght::bcht, 32>; +} // namespace bght + #include diff --git a/include/bght/cht.hpp b/include/bght/cht.hpp index 7c5b5b0..7dcde2e 100644 --- a/include/bght/cht.hpp +++ b/include/bght/cht.hpp @@ -17,8 +17,8 @@ #pragma once #include #include -#include #include +#include #include #include #include diff --git a/include/bght/detail/hash_functions.cuh b/include/bght/hash_functions.hpp similarity index 100% rename from include/bght/detail/hash_functions.cuh rename to include/bght/hash_functions.hpp diff --git a/include/bght/iht.hpp b/include/bght/iht.hpp index c141ed1..f3fc211 100644 --- a/include/bght/iht.hpp +++ b/include/bght/iht.hpp @@ -17,9 +17,9 @@ #pragma once #include #include -#include #include #include +#include #include #include #include @@ -270,7 +270,6 @@ struct iht { std::size_t num_buckets_; }; -} // namespace bght template using iht8 = typename bght::iht; +} // namespace bght + #include diff --git a/include/bght/p2bht.hpp b/include/bght/p2bht.hpp index 954957f..bc121a4 100644 --- a/include/bght/p2bht.hpp +++ b/include/bght/p2bht.hpp @@ -17,8 +17,8 @@ #pragma once #include #include -#include #include +#include #include #include #include @@ -214,8 +214,6 @@ struct p2bht { std::size_t num_buckets_; }; -} // namespace bght - template using p2bht8 = typename bght::p2bht, 32>; +} // namespace bght + #include diff --git a/test/gtest_map.cu b/test/gtest_map.cu index c47224e..08056e2 100644 --- a/test/gtest_map.cu +++ b/test/gtest_map.cu @@ -15,11 +15,14 @@ */ #include -#include + +#include + +#include +#include +#include #include -#include #include -#include #include // Based on sample6_unittest