speed upgrade for grøstl

[avr-crypto-lib.git] / Makefile

diff --git a/Makefile b/Makefile
index 830d5e79d259f13921d93afd5a7d416de0900463..f51b1a776583040b6499aa5b7c00fd48c6b15289 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,21 @@
 # Makefile for the AVR-Crypto-Lib project
 # author: Daniel Otte
+SHELL = sh
 
 BLOCK_CIPHERS  := 
 STREAM_CIPHERS := 
 HASHES         :=
 MACS           :=
 PRNGS          := 
+ENCODINGS      :=
+AUX            :=
 
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
 include mkfiles/*.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) $(ENCODINGS) $(AUX)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
 ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
 
@@ -43,7 +46,7 @@ all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
 define MAIN_OBJ_TEMPLATE
 $(2): $(3) $(4)
-       @echo "[ld]: $$@"
+       @echo "[ld] : $$@"
 #      echo $$^
        @$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
        $(2) \
@@ -76,6 +79,8 @@ info:
        @echo "    $(MACS)"
        @echo "  PRNG functions:"
        @echo "    $(PRNGS)"
+       @echo "  encodings:"
+       @echo "    $(ENCODINGS)"
 #      @echo "  ALGORITHMS_TEST_BIN:"
 #      @echo "    $(ALGORITHMS_TEST_BIN)"
 #      @echo "  ALGORITHMS_TEST_TARGET_ELF:"
@@ -120,6 +125,15 @@ $(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.S
        @echo "[as] :  $@"
        @$(CC) $(ASFLAGS) -c -o $@ $<
 
+$(TESTBIN_DIR)%.o: %.c
+       @echo "[gcc]:  $@"
+       @$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(TESTBIN_DIR)%.o: %.S
+       @echo "[as] :  $@"
+       @$(CC) $(ASFLAGS) -c -o $@ $<
+
+
 
 %.o: %.c
        @echo "[gcc]:  $@"
@@ -155,6 +169,7 @@ $(STREAM_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(STREAM_CIPHERS))
 $(HASHES_OBJ): $(patsubst %,%_OBJ, $(HASHES))
 $(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
 $(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
+$(ENCODINGS_OBJ): $(patsubst %,%_OBJ, $(ENCODINGS))
 
 #-------------------------------------------------------------------------------
 
@@ -188,6 +203,20 @@ $(foreach algo, $(ALGORITHMS),$(eval $(call TESTRUN_TEMPLATE, $(algo), $(call lc
 
 all_testrun: $(foreach algo, $(ALGORITHMS), $(algo)_TESTRUN)
 
+#-------------------------------------------------------------------------------
+
+define TESTSPEED_TEMPLATE
+$(1)_TESTSPEED: $(1)_FLASH
+       @echo "[speed]: $(1)"
+       $(RUBY) $(GET_PERFORMANCE)  $(TESTPORT) $(TESTPORTBAUDR) 8 1 performance $(SPEEDLOG_DIR)$(SPEEDPREFIX) $(2)
+endef
+
+$(foreach algo, $(ALGORITHMS),$(eval $(call TESTSPEED_TEMPLATE, $(algo), $(call lc,$(algo)) )))
+
+all_testspeed: $(foreach algo, $(ALGORITHMS), $(algo)_TESTSPEED)
+hash_testspeed: $(foreach algo, $(HASHES), $(algo)_TESTSPEED)
+
+
 #-------------------------------------------------------------------------------
 
 define LISTING_TEMPLATE
@@ -232,6 +261,9 @@ macs: $(patsubst %, %_OBJ, $(MACS))
 .PHONY:  prngs
 prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
+.PHONY:  encodings
+encodings: $(patsubst %, %_OBJ, $(ENCODINGS))
+
 tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_TARGET_ELF) \
        $(ALGORITHMS_TEST_TARGET_HEX)
@@ -251,7 +283,7 @@ clean:
        rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak
        rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(STAT_DIR)$(SIZESTAT_FILE) $(STAT_DIR)*_size.txt
 xclean: clean
-       rm -rf $(DEP_DIR)*.d
+       rm -rf $(DEP_DIR)*.d $(AUTOASM_DIR)*.s
 
 docu:
        doxygen
@@ -301,10 +333,14 @@ make-info: make.png make.svg
        @echo "[objcopy]: $@"
        @$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
        
-       
-# Every thing below here is used by avr-libc's build system and can be ignored
-# by the casual user.
+#-------------------------------------------------------------------------------
+$(AUTOASM_DIR)%.s: %.c
+       $(CC) $(CFLAGS) $(AUTOASM_OPT) -o $@ $<
 
+%.s: %.c
+       $(CC) $(CFLAGS) $(AUTOASM_OPT) -o $@ $<
+
+#-------------------------------------------------------------------------------
 FIG2DEV                 = fig2dev
 EXTRA_CLEAN_FILES       = *.hex *.bin *.srec