Skip to content

Add log/exp table based implementations for fields up to 16 bits #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add log/exp table based implementations for fields up to 16 bits #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
323867b
Separate multiplier and nonzeromultiplier
sipa Dec 22, 2018
bd2906f
Add 'small' log/exp table based field implementations
sipa Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions doc/gen_params.sage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ def conv_tables(F, NF, bits):
return (ret, ret2)

def fmt(i,typ):
if i == 0:
return "0"
if i < 1000000000:
return "%i" % i
else:
return "0x%x" % i

Expand All @@ -147,7 +147,8 @@ def lintranstype(typ, bits, maxtbl):
INT=0
CLMUL=1
CLMUL_TRI=2
MD=3
SMALL=3
MD=4

def print_modulus_md(mod):
ret = ""
Expand All @@ -169,7 +170,7 @@ def pick_modulus(bits, style):
# Choose the lexicographicly-first lowest-weight modulus
# optionally subject to implementation specific constraints.
moduli = compute_moduli(bits)
if style == INT or style == MD:
if style == INT or style == SMALL or style == MD:
multi_sqr = False
need_trans = False
elif style == CLMUL:
Expand All @@ -194,19 +195,31 @@ def pick_modulus(bits, style):

def print_result(bits, style):
if style == INT:
log_table = False
single_sqr = True
multi_sqr = False
need_trans = False
table_id = "%i" % bits
elif style == MD:
pass
elif style == CLMUL:
log_table = False
single_sqr = True
multi_sqr = True
need_trans = True
table_id = "%i" % bits
elif style == CLMUL_TRI:
log_table = False
single_sqr = True
multi_sqr = True
need_trans = True
table_id = "TRI%i" % bits
elif style == SMALL:
log_table = True
single_sqr = False
multi_sqr = False
need_trans = False
table_id = "%i" % bits
else:
assert(False)

Expand Down Expand Up @@ -234,7 +247,7 @@ def print_result(bits, style):
F.<f> = GF(2**bits, modulus=modulus)

include_table = True
if style != INT and style != CLMUL:
if style == CLMUL_TRI:
cmodulus = pick_modulus(bits, CLMUL)
if cmodulus == modulus:
include_table = False
Expand Down Expand Up @@ -266,7 +279,7 @@ def print_result(bits, style):
else:
assert(modulus == nmodulus)

if include_table:
if include_table and single_sqr:
print("constexpr %s SQR_TABLE_%s({%s});" % (rtyp, table_id, ", ".join([fmt(x,typ) for x in sqr_table(f, bits, 1)])))
if multi_sqr:
# Repeated squaring is a linearised polynomial so in F(2^n) it is
Expand Down Expand Up @@ -296,6 +309,18 @@ def print_result(bits, style):
if include_table:
print("constexpr %s QRT_TABLE_%s({%s});" % (rtyp, table_id, ", ".join([fmt(x,typ) for x in qrt_table(F, f, bits)])))

if log_table:
for baseval in range(2,2**bits):
try:
base = F.fetch_int(baseval)
logs = [2**bits-1] + [discrete_log(F.fetch_int(i), base) for i in range(1,2**bits)]
exps = [(base**i).integer_representation() for i in range(2**bits - 1)] + [1]
break
except:
continue
print("constexpr %s LOG_TABLE_%s[] = {%s};" % (typ, table_id, ", ".join([fmt(x,typ) for x in logs])))
print("constexpr %s EXP_TABLE_%s[] = {%s};" % (typ, table_id, ", ".join([fmt(x,typ) for x in exps])))

modulus_weight = modulus.hamming_weight()
modulus_degree = (modulus - p**bits).degree()
modulus_int = (modulus - p**bits).change_ring(ZZ)(2)
Expand All @@ -304,13 +329,20 @@ def print_result(bits, style):

if style == INT:
print("typedef Field<%s, %i, %i, %s, %s, &SQR_TABLE_%s, &QRT_TABLE_%s%s> Field%i;" % (typ, bits, modulus_int, rtyp, ttyp, table_id, table_id, lfsr, bits))
elif style == SMALL:
print("typedef Field<%s, %i, %i, LOG_TABLE_%s, EXP_TABLE_%s, %s, &QRT_TABLE_%s> Field%i;" % (typ, bits, modulus_int, table_id, table_id, rtyp, table_id, bits))
elif style == CLMUL:
print("typedef Field<%s, %i, %i, %s, &SQR_TABLE_%s, %s, %s, %s, %s, &QRT_TABLE_%s, %s, %s, %s%s> Field%i;" % (typ, bits, modulus_int, rtyp, table_id, sqr2, sqr4, sqr8, sqr16, table_id, ctyp, loadtbl, savetbl, lfsr, bits))
elif style == CLMUL_TRI:
print("typedef FieldTri<%s, %i, %i, %s, &SQR_TABLE_%s, %s, %s, %s, %s, &QRT_TABLE_%s, %s, %s, %s> FieldTri%i;" % (typ, bits, modulus_degree, rtyp, table_id, sqr2, sqr4, sqr8, sqr16, table_id, ctyp, loadtbl, savetbl, bits))
else:
assert(False)

for bits in range(2, 17):
print("// %i bit field" % bits)
print_result(bits, SMALL)
print("")

for bits in range(2, 65):
print("// %i bit field" % bits)
print_result(bits, INT)
Expand Down
12 changes: 8 additions & 4 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ default: test-exhaust bench

DEFINES := -DHAVE_CLZ -O2 -g0

fields/small.o: fields/small.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
$(CXX) $(DEFINES) -DNDEBUG -Wall -std=c++11 fields/small.cpp -c -o fields/small.o
fields/generic_1byte.o: fields/generic_common_impl.h fields/generic_1byte.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
$(CXX) $(DEFINES) -DNDEBUG -Wall -std=c++11 fields/generic_1byte.cpp -c -o fields/generic_1byte.o
fields/generic_2bytes.o: fields/generic_common_impl.h fields/generic_2bytes.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
Expand Down Expand Up @@ -37,6 +39,8 @@ fields/clmul_8bytes.o: fields/clmul_common_impl.h fields/clmul_8bytes.cpp lintra
minisketch.o: minisketch.cpp ../include/minisketch.h
$(CXX) $(DEFINES) -DNDEBUG -Wall -std=c++11 minisketch.cpp -c -o minisketch.o

fields/small_test.o: fields/small.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
$(CXX) $(DEFINES) -DMINISKETCH_VERIFY -Wall -std=c++11 fields/small.cpp -c -o fields/small_test.o
fields/generic_1byte_test.o: fields/generic_common_impl.h fields/generic_1byte.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
$(CXX) $(DEFINES) -DMINISKETCH_VERIFY -Wall -std=c++11 fields/generic_1byte.cpp -c -o fields/generic_1byte_test.o
fields/generic_2bytes_test.o: fields/generic_common_impl.h fields/generic_2bytes.cpp lintrans.h sketch.h sketch_impl.h int_utils.h
Expand Down Expand Up @@ -72,11 +76,11 @@ fields/clmul_8bytes_test.o: fields/clmul_common_impl.h fields/clmul_8bytes.cpp l
minisketch_test.o: minisketch.cpp ../include/minisketch.h
$(CXX) $(DEFINES) -DMINISKETCH_VERIFY -Wall -std=c++11 minisketch.cpp -c -o minisketch_test.o

libminisketch.a: fields/generic_1byte.o fields/generic_2bytes.o fields/generic_3bytes.o fields/generic_4bytes.o fields/generic_5bytes.o fields/generic_6bytes.o fields/generic_7bytes.o fields/generic_8bytes.o fields/clmul_1byte.o fields/clmul_2bytes.o fields/clmul_3bytes.o fields/clmul_4bytes.o fields/clmul_5bytes.o fields/clmul_6bytes.o fields/clmul_7bytes.o fields/clmul_8bytes.o minisketch.o
$(AR) cr libminisketch.a fields/generic_1byte.o fields/generic_2bytes.o fields/generic_3bytes.o fields/generic_4bytes.o fields/generic_5bytes.o fields/generic_6bytes.o fields/generic_7bytes.o fields/generic_8bytes.o fields/clmul_1byte.o fields/clmul_2bytes.o fields/clmul_3bytes.o fields/clmul_4bytes.o fields/clmul_5bytes.o fields/clmul_6bytes.o fields/clmul_7bytes.o fields/clmul_8bytes.o minisketch.o
libminisketch.a: fields/small.o fields/generic_1byte.o fields/generic_2bytes.o fields/generic_3bytes.o fields/generic_4bytes.o fields/generic_5bytes.o fields/generic_6bytes.o fields/generic_7bytes.o fields/generic_8bytes.o fields/clmul_1byte.o fields/clmul_2bytes.o fields/clmul_3bytes.o fields/clmul_4bytes.o fields/clmul_5bytes.o fields/clmul_6bytes.o fields/clmul_7bytes.o fields/clmul_8bytes.o minisketch.o
$(AR) cr libminisketch.a fields/small.o fields/generic_1byte.o fields/generic_2bytes.o fields/generic_3bytes.o fields/generic_4bytes.o fields/generic_5bytes.o fields/generic_6bytes.o fields/generic_7bytes.o fields/generic_8bytes.o fields/clmul_1byte.o fields/clmul_2bytes.o fields/clmul_3bytes.o fields/clmul_4bytes.o fields/clmul_5bytes.o fields/clmul_6bytes.o fields/clmul_7bytes.o fields/clmul_8bytes.o minisketch.o

libminisketch_test.a: fields/generic_1byte_test.o fields/generic_2bytes_test.o fields/generic_3bytes_test.o fields/generic_4bytes_test.o fields/generic_5bytes_test.o fields/generic_6bytes_test.o fields/generic_7bytes_test.o fields/generic_8bytes_test.o fields/clmul_1byte_test.o fields/clmul_2bytes_test.o fields/clmul_3bytes_test.o fields/clmul_4bytes_test.o fields/clmul_5bytes_test.o fields/clmul_6bytes_test.o fields/clmul_7bytes_test.o fields/clmul_8bytes_test.o minisketch_test.o
$(AR) cr libminisketch_test.a fields/generic_1byte_test.o fields/generic_2bytes_test.o fields/generic_3bytes_test.o fields/generic_4bytes_test.o fields/generic_5bytes_test.o fields/generic_6bytes_test.o fields/generic_7bytes_test.o fields/generic_8bytes_test.o fields/clmul_1byte_test.o fields/clmul_2bytes_test.o fields/clmul_3bytes_test.o fields/clmul_4bytes_test.o fields/clmul_5bytes_test.o fields/clmul_6bytes_test.o fields/clmul_7bytes_test.o fields/clmul_8bytes_test.o minisketch_test.o
libminisketch_test.a: fields/small_test.o fields/generic_1byte_test.o fields/generic_2bytes_test.o fields/generic_3bytes_test.o fields/generic_4bytes_test.o fields/generic_5bytes_test.o fields/generic_6bytes_test.o fields/generic_7bytes_test.o fields/generic_8bytes_test.o fields/clmul_1byte_test.o fields/clmul_2bytes_test.o fields/clmul_3bytes_test.o fields/clmul_4bytes_test.o fields/clmul_5bytes_test.o fields/clmul_6bytes_test.o fields/clmul_7bytes_test.o fields/clmul_8bytes_test.o minisketch_test.o
$(AR) cr libminisketch_test.a fields/small_test.o fields/generic_1byte_test.o fields/generic_2bytes_test.o fields/generic_3bytes_test.o fields/generic_4bytes_test.o fields/generic_5bytes_test.o fields/generic_6bytes_test.o fields/generic_7bytes_test.o fields/generic_8bytes_test.o fields/clmul_1byte_test.o fields/clmul_2bytes_test.o fields/clmul_3bytes_test.o fields/clmul_4bytes_test.o fields/clmul_5bytes_test.o fields/clmul_6bytes_test.o fields/clmul_7bytes_test.o fields/clmul_8bytes_test.o minisketch_test.o

test-exhaust.o: test-exhaust.cpp ../include/minisketch.h
$(CXX) $(DEFINES) -DMINISKETCH_VERIFY -Wall -std=c++11 test-exhaust.cpp -pthread -c -o test-exhaust.o
Expand Down
2 changes: 2 additions & 0 deletions src/fields/clmul_common_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ template<typename I, int B, I MOD, I (*MUL)(I, I), typename F, const F* SQR, con
constexpr GenField operator()(GenField a) const { return GenField(Mul(m_val, a.m_val)); }
};

typedef Multiplier NonZeroMultiplier;

/** Compute the square of a. */
inline constexpr GenField Sqr() const { return GenField(Sqr1(m_val)); }

Expand Down
3 changes: 3 additions & 0 deletions src/fields/generic_common_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <stdint.h>
#include <random>

#include "../util.h"
#include "../int_utils.h"
#include "../lintrans.h"

Expand Down Expand Up @@ -48,6 +49,8 @@ template<typename I, int B, uint32_t MOD, typename F, typename T, const F* SQR,
constexpr inline Field operator()(Field a) const { return Field(table.template Map<O>(a.m_val)); }
};

typedef Multiplier NonZeroMultiplier;

inline friend constexpr Field operator+(Field a, Field b) { return Field(a.m_val ^ b.m_val); }
inline Field& operator+=(Field a) { m_val ^= a.m_val; return *this; }
friend Field operator*(Field a, Field b) { return Field(GFMul<I, B, L, O>(a.m_val, b.m_val)); }
Expand Down
Loading