Skip to content
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.

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

New f1600x4 #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion shake256-avx2/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ test/*
PQCsignKAT_*.rsp
PQCsignKAT_*.req
PQCgenKAT_sign
keccak4x/KeccakP-1600-times4-SIMD256.o
keccak4x/KeccakP-1600-times4-SIMD256.o
*.s
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with the file having .S (capital letter) now this probably also needs to be updated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We wouldn't want to ignore the file itself, right? The .s is generated form the .S when compiling.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah you're not running peachpy in Make of course.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Try to keep dependencies to compile to a minimum.

13 changes: 2 additions & 11 deletions shake256-avx2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ CFLAGS = -Wall -Wextra -Wpedantic -O3 -std=c99 -march=native -fomit-frame-pointe

THASH = robust

SOURCES = hash_shake256.c hash_shake256x4.c thash_shake256_$(THASH).c thash_shake256_$(THASH)x4.c address.c randombytes.c wots.c utils.c utilsx4.c fors.c sign.c fips202.c fips202x4.c keccak4x/KeccakP-1600-times4-SIMD256.o
HEADERS = params.h hash.h hashx4.h thash.h thashx4.h address.h randombytes.h wots.h utils.h utilsx4.h fors.h api.h fips202.h fips202x4.h
SOURCES = hash_shake256.c hash_shake256x4.c thash_shake256_$(THASH).c thash_shake256_$(THASH)x4.c address.c randombytes.c wots.c utils.c utilsx4.c fors.c sign.c fips202.c f1600x4.c f1600x4.s
HEADERS = params.h hash.h hashx4.h thash.h thashx4.h address.h randombytes.h wots.h utils.h utilsx4.h fors.h api.h fips202.h f1600x4.h

DET_SOURCES = $(SOURCES:randombytes.%=rng.%)
DET_HEADERS = $(HEADERS:randombytes.%=rng.%)
Expand Down Expand Up @@ -39,16 +39,7 @@ test/%: test/%.c $(SOURCES) $(HEADERS)
test/%.exec: test/%
@$<

keccak4x/KeccakP-1600-times4-SIMD256.o: keccak4x/align.h \
keccak4x/brg_endian.h \
keccak4x/KeccakP-1600-times4-SIMD256.c \
keccak4x/KeccakP-1600-times4-SnP.h \
keccak4x/KeccakP-1600-unrolling.macros \
keccak4x/SIMD256-config.h
$(CC) $(CFLAGS) -c keccak4x/KeccakP-1600-times4-SIMD256.c -o $@

clean:
-$(RM) keccak4x/KeccakP-1600-times4-SIMD256.o
-$(RM) $(TESTS)
-$(RM) $(BENCHMARK)
-$(RM) PQCgenKAT_sign
Expand Down
Loading