Skip to content

Commit 55d52c9

Browse files
lemirelemire
committed
This PR cleans up several schemes that we would not want people to look at, use or benchmark.
They were temporary experiments.
1 parent b0ca9b6 commit 55d52c9

17 files changed

+2
-4184
lines changed

‎benchmarks/bulk-insert-and-query.cc‎

Lines changed: 2 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,8 @@ int main(int argc, char * argv[]) {
343343
std::map<int,std::string> names = {
344344
// Xor
345345
{1000, "Xor8naive"}, {1002, "Xor16naive"},
346-
{2000, "Xor8prefetch"}, {2002, "Xor16prefetch"},
347346
{0, "Xor8"}, {1, "Xor12"}, {2, "Xor16"},
348347
{3, "Xor+8"}, {4, "Xor+16"},
349-
{5, "Xor10"}, {6, "Xor10.666"},
350-
{7, "Xor10 (NBitArray)"}, {8, "Xor14 (NBitArray)"}, {9, "Xor8-2^n"},
351348
// Cuckooo
352349
{10,"Cuckoo8"}, {11,"Cuckoo12"}, {12,"Cuckoo16"},
353350
{13,"CuckooSemiSort13"},
@@ -393,24 +390,8 @@ int main(int argc, char * argv[]) {
393390

394391
{80, "Morton"},
395392

396-
{96, "XorBinaryFuse8"},
397-
{97, "XorBinaryFuse16"},
398-
{98, "XorBinaryFuse8-4Wise-Prefetch"},
399-
{99, "XorBinaryFuse16-4Wise-Prefetch"},
400-
{100, "XorBinaryFuse8-Prefetched"},
401-
{101, "XorBinaryFuse16-Prefetched"},
402-
{102, "XorBinaryFuse8-4Wise"},
403-
{103, "XorBinaryFuse16-4Wise"},
404-
{106, "XorBinaryFuse8-Sorted"},
405-
{107, "XorBinaryFuse16-Sorted"},
406-
{108, "XorBinaryFuse8-PSorted"},
407-
{109, "XorBinaryFuse16-PSorted"},
408-
{110, "XorBinaryFuse8-FSorted"},
409-
{111, "XorBinaryFuse16-FSorted"},
410-
{112, "XorBinaryFuse8-4Wise-PSorted"},
411-
{113, "XorBinaryFuse16-4Wise-PSorted"},
412-
{114, "XorBinaryFuse8-OneHash"},
413-
{115, "XorBinaryFuse16-OneHash"},
393+
{96, "XorBinaryFuse8 (Naive)"},
394+
{97, "XorBinaryFuse16 (Naive)"},
414395
{116, "XorBinaryFuse8-LowMem"},
415396
{117, "XorBinaryFuse16-LowMem"},
416397
{118, "XorBinaryFuse8-4Wise-LowMem"},
@@ -607,13 +588,6 @@ int main(int argc, char * argv[]) {
607588
add_count, to_add, intersectionsize, mixed_sets, true);
608589
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
609590
}
610-
a = 1;
611-
if (algorithmId == a || (algos.find(a) != algos.end())) {
612-
auto cf = FilterBenchmark<
613-
XorFilter2<uint64_t, uint32_t, UInt12Array, SimpleMixSplit>>(
614-
add_count, to_add, intersectionsize, mixed_sets, true);
615-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
616-
}
617591
a = 2;
618592
if (algorithmId == a || algorithmId < 0 || (algos.find(a) != algos.end())) {
619593
auto cf = FilterBenchmark<
@@ -665,41 +639,6 @@ int main(int argc, char * argv[]) {
665639
add_count, to_add, intersectionsize, mixed_sets, true);
666640
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
667641
}
668-
a = 5;
669-
if (algorithmId == a || (algos.find(a) != algos.end())) {
670-
auto cf = FilterBenchmark<
671-
XorFilter10<uint64_t, SimpleMixSplit>>(
672-
add_count, to_add, intersectionsize, mixed_sets, true);
673-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
674-
}
675-
a = 6;
676-
if (algorithmId == a || (algos.find(a) != algos.end())) {
677-
auto cf = FilterBenchmark<
678-
XorFilter10_666<uint64_t, SimpleMixSplit>>(
679-
add_count, to_add, intersectionsize, mixed_sets, true);
680-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
681-
}
682-
a = 7;
683-
if (algorithmId == a || (algos.find(a) != algos.end())) {
684-
auto cf = FilterBenchmark<
685-
XorFilter2<uint64_t, uint16_t, NBitArray<uint16_t, 10>, SimpleMixSplit>>(
686-
add_count, to_add, intersectionsize, mixed_sets, true);
687-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
688-
}
689-
a = 8;
690-
if (algorithmId == a || (algos.find(a) != algos.end())) {
691-
auto cf = FilterBenchmark<
692-
XorFilter2<uint64_t, uint16_t, NBitArray<uint16_t, 14>, SimpleMixSplit>>(
693-
add_count, to_add, intersectionsize, mixed_sets, true);
694-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
695-
}
696-
a = 9;
697-
if (algorithmId == a || (algos.find(a) != algos.end())) {
698-
auto cf = FilterBenchmark<
699-
XorFilter2n<uint64_t, uint8_t, UIntArray<uint8_t>, SimpleMixSplit>>(
700-
add_count, to_add, intersectionsize, mixed_sets, true);
701-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
702-
}
703642

704643
// Cuckoo ----------------------------------------------------------
705644
a = 10;
@@ -954,14 +893,6 @@ int main(int argc, char * argv[]) {
954893
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
955894
}
956895

957-
a = 71;
958-
if (algorithmId == a || (algos.find(a) != algos.end())) {
959-
auto cf = FilterBenchmark<
960-
FuseSingle>(
961-
add_count, to_add, intersectionsize, mixed_sets, true);
962-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
963-
}
964-
965896
a = 72;
966897
if (algorithmId == a || (algos.find(a) != algos.end())) {
967898
auto cf = FilterBenchmark<
@@ -993,34 +924,6 @@ int main(int argc, char * argv[]) {
993924
add_count, to_add, intersectionsize, mixed_sets, true);
994925
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
995926
}
996-
a = 98;
997-
if (algorithmId == a || (algos.find(a) != algos.end())) {
998-
auto cf = FilterBenchmark<
999-
xorbinaryfusefilter_4wise_prefetched::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1000-
add_count, to_add, intersectionsize, mixed_sets, true);
1001-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1002-
}
1003-
a = 99;
1004-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1005-
auto cf = FilterBenchmark<
1006-
xorbinaryfusefilter_4wise_prefetched::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1007-
add_count, to_add, intersectionsize, mixed_sets, true);
1008-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1009-
}
1010-
a = 100;
1011-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1012-
auto cf = FilterBenchmark<
1013-
xorbinaryfusefilter_prefetched::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1014-
add_count, to_add, intersectionsize, mixed_sets, true);
1015-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1016-
}
1017-
a = 101;
1018-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1019-
auto cf = FilterBenchmark<
1020-
xorbinaryfusefilter_prefetched::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1021-
add_count, to_add, intersectionsize, mixed_sets, true);
1022-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1023-
}
1024927
a = 102;
1025928
if (algorithmId == a || (algos.find(a) != algos.end())) {
1026929
auto cf = FilterBenchmark<
@@ -1036,76 +939,6 @@ int main(int argc, char * argv[]) {
1036939
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1037940
}
1038941
// Xor Binary Fuse Filter ----------------------------------------------------------
1039-
a = 106;
1040-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1041-
auto cf = FilterBenchmark<
1042-
xorbinaryfusefilter_sorted::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1043-
add_count, to_add, intersectionsize, mixed_sets, true);
1044-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1045-
}
1046-
a = 107;
1047-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1048-
auto cf = FilterBenchmark<
1049-
xorbinaryfusefilter_sorted::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1050-
add_count, to_add, intersectionsize, mixed_sets, true);
1051-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1052-
}
1053-
a = 108;
1054-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1055-
auto cf = FilterBenchmark<
1056-
xorbinaryfusefilter_partiallysorted::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1057-
add_count, to_add, intersectionsize, mixed_sets, true);
1058-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1059-
}
1060-
a = 109;
1061-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1062-
auto cf = FilterBenchmark<
1063-
xorbinaryfusefilter_partiallysorted::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1064-
add_count, to_add, intersectionsize, mixed_sets, true);
1065-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1066-
}
1067-
a = 110;
1068-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1069-
auto cf = FilterBenchmark<
1070-
xorbinaryfusefilter_fixedsorted::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1071-
add_count, to_add, intersectionsize, mixed_sets, true);
1072-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1073-
}
1074-
a = 111;
1075-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1076-
auto cf = FilterBenchmark<
1077-
xorbinaryfusefilter_fixedsorted::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1078-
add_count, to_add, intersectionsize, mixed_sets, true);
1079-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1080-
}
1081-
a = 112;
1082-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1083-
auto cf = FilterBenchmark<
1084-
xorbinaryfusefilter_partiallysorted4wise::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1085-
add_count, to_add, intersectionsize, mixed_sets, true);
1086-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1087-
}
1088-
a = 113;
1089-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1090-
auto cf = FilterBenchmark<
1091-
xorbinaryfusefilter_partiallysorted4wise::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1092-
add_count, to_add, intersectionsize, mixed_sets, true);
1093-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1094-
}
1095-
a = 114;
1096-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1097-
auto cf = FilterBenchmark<
1098-
xorbinaryfusefilter_onehash::XorBinaryFuseFilter<uint64_t, uint8_t>>(
1099-
add_count, to_add, intersectionsize, mixed_sets, true);
1100-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1101-
}
1102-
a = 115;
1103-
if (algorithmId == a || (algos.find(a) != algos.end())) {
1104-
auto cf = FilterBenchmark<
1105-
xorbinaryfusefilter_onehash::XorBinaryFuseFilter<uint64_t, uint16_t>>(
1106-
add_count, to_add, intersectionsize, mixed_sets, true);
1107-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
1108-
}
1109942
a = 116;
1110943
if (algorithmId == a || algorithmId < 0 || (algos.find(a) != algos.end())) {
1111944
auto cf = FilterBenchmark<

0 commit comments

Comments
 (0)