Skip to content

Commit 4264fbb

Browse files
thomasmuellerthomasmueller
authored
Merge pull request #21 from FastFilter/dlemire/xorcleaning
This PR cleans up several schemes that we would not want people to look at, use or benchmark.
2 parents d74224a + ca58068 commit 4264fbb

17 files changed

+6
-4189
lines changed

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

Lines changed: 6 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,9 @@ void parse_comma_separated(char * c, std::set<int> & answer ) {
343343
int main(int argc, char * argv[]) {
344344
std::map<int,std::string> names = {
345345
// Xor
346-
{1000, "Xor8naive"}, {1002, "Xor16naive"},
347-
{2000, "Xor8prefetch"}, {2002, "Xor16prefetch"},
348-
{0, "Xor8"}, {1, "Xor12"}, {2, "Xor16"},
346+
{1000, "Xor8-naive"}, {1002, "Xor16-naive"},
347+
{0, "Xor8"}, {2, "Xor16"},
349348
{3, "Xor+8"}, {4, "Xor+16"},
350-
{5, "Xor10"}, {6, "Xor10.666"},
351-
{7, "Xor10-NBitArray"}, {8, "Xor14-NBitArray"}, {9, "Xor8-2^n"},
352349
// Cuckooo
353350
{10,"Cuckoo8"}, {11,"Cuckoo12"}, {12,"Cuckoo16"},
354351
{13,"CuckooSemiSort13"},
@@ -389,33 +386,16 @@ int main(int argc, char * argv[]) {
389386
{63, "SuccCountBlockBloomRank10"},
390387

391388
{70, "Xor8-singleheader"},
392-
{71, "Fuse8-singleheader"},
393389
{72, "BinaryFuse8-singleheader"},
394390

395391
{80, "Morton"},
396392

397-
{96, "XorBinaryFuse8-Naive"},
398-
{97, "XorBinaryFuse16-Naive"},
399-
{98, "XorBinaryFuse8-4Wise-Prefetch"},
400-
{99, "XorBinaryFuse16-4Wise-Prefetch"},
401-
{100, "XorBinaryFuse8-Prefetched"},
402-
{101, "XorBinaryFuse16-Prefetched"},
403-
{102, "XorBinaryFuse8-4Wise"},
404-
{103, "XorBinaryFuse16-4Wise"},
405-
{106, "XorBinaryFuse8-Sorted"},
406-
{107, "XorBinaryFuse16-Sorted"},
407-
{108, "XorBinaryFuse8-PSorted"},
408-
{109, "XorBinaryFuse16-PSorted"},
409-
{110, "XorBinaryFuse8-FSorted"},
410-
{111, "XorBinaryFuse16-FSorted"},
411-
{112, "XorBinaryFuse8-4Wise-PSorted"},
412-
{113, "XorBinaryFuse16-4Wise-PSorted"},
413-
{114, "XorBinaryFuse8-OneHash"},
414-
{115, "XorBinaryFuse16-OneHash"},
393+
{96, "XorBinaryFuse8-naive"},
394+
{97, "XorBinaryFuse16-naive"},
415395
{116, "XorBinaryFuse8"},
416396
{117, "XorBinaryFuse16"},
417-
{118, "XorBinaryFuse8-4Wise"},
418-
{119, "XorBinaryFuse16-4Wise"},
397+
{118, "XorBinaryFuse8-4wise"},
398+
{119, "XorBinaryFuse16-4wise"},
419399
{1056, "HomogRibbon64_5"},
420400
{1076, "HomogRibbon64_7"}, // interesting
421401
{1086, "HomogRibbon64_8"},
@@ -608,13 +588,6 @@ int main(int argc, char * argv[]) {
608588
add_count, to_add, intersectionsize, mixed_sets, true);
609589
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
610590
}
611-
a = 1;
612-
if (algorithmId == a || (algos.find(a) != algos.end())) {
613-
auto cf = FilterBenchmark<
614-
XorFilter2<uint64_t, uint32_t, UInt12Array, SimpleMixSplit>>(
615-
add_count, to_add, intersectionsize, mixed_sets, true);
616-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
617-
}
618591
a = 2;
619592
if (algorithmId == a || algorithmId < 0 || (algos.find(a) != algos.end())) {
620593
auto cf = FilterBenchmark<
@@ -666,41 +639,6 @@ int main(int argc, char * argv[]) {
666639
add_count, to_add, intersectionsize, mixed_sets, true);
667640
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
668641
}
669-
a = 5;
670-
if (algorithmId == a || (algos.find(a) != algos.end())) {
671-
auto cf = FilterBenchmark<
672-
XorFilter10<uint64_t, SimpleMixSplit>>(
673-
add_count, to_add, intersectionsize, mixed_sets, true);
674-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
675-
}
676-
a = 6;
677-
if (algorithmId == a || (algos.find(a) != algos.end())) {
678-
auto cf = FilterBenchmark<
679-
XorFilter10_666<uint64_t, SimpleMixSplit>>(
680-
add_count, to_add, intersectionsize, mixed_sets, true);
681-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
682-
}
683-
a = 7;
684-
if (algorithmId == a || (algos.find(a) != algos.end())) {
685-
auto cf = FilterBenchmark<
686-
XorFilter2<uint64_t, uint16_t, NBitArray<uint16_t, 10>, SimpleMixSplit>>(
687-
add_count, to_add, intersectionsize, mixed_sets, true);
688-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
689-
}
690-
a = 8;
691-
if (algorithmId == a || (algos.find(a) != algos.end())) {
692-
auto cf = FilterBenchmark<
693-
XorFilter2<uint64_t, uint16_t, NBitArray<uint16_t, 14>, SimpleMixSplit>>(
694-
add_count, to_add, intersectionsize, mixed_sets, true);
695-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
696-
}
697-
a = 9;
698-
if (algorithmId == a || (algos.find(a) != algos.end())) {
699-
auto cf = FilterBenchmark<
700-
XorFilter2n<uint64_t, uint8_t, UIntArray<uint8_t>, SimpleMixSplit>>(
701-
add_count, to_add, intersectionsize, mixed_sets, true);
702-
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
703-
}
704642

705643
// Cuckoo ----------------------------------------------------------
706644
a = 10;
@@ -955,14 +893,6 @@ int main(int argc, char * argv[]) {
955893
cout << setw(NAME_WIDTH) << names[a] << cf << endl;
956894
}
957895

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

0 commit comments

Comments
 (0)