update Makefile

cothan · Jun 25, 2020 · d53ed0e · d53ed0e
1 parent b40c46d
commit d53ed0e
Showing 1 changed file with 11 additions and 23 deletions.
diff --git a/Cortex-A/Makefile b/Cortex-A/Makefile
@@ -1,44 +1,31 @@
 CC 		  = cc
-CFLAGS   = -Wall -Wextra -O3 -fomit-frame-pointer -march=native -lcrypto
-CFLAGS2  = -Wall -Wextra -O3 -fomit-frame-pointer -march=native -std=c11 
-CFLAGS3  = -Wall -Wextra -O3 -fomit-frame-pointer -march=native
 CFLAGS4  = -Wall -Wextra -O3 -fomit-frame-pointer -mtune=native -mcpu=cortex-a53 -lpapi -g3
-CFLAGS5  = -Wall -Wextra -O3 -fomit-frame-pointer -mtune=native -mcpu=native -lcrypto -fwrapv -w  -g3 -I/usr/include -I/usr/local/include -lpapi   -flax-vector-conversions
-CFLAGS6  = -Wall -Wextra -O3-fomit-frame-pointer -mtune=native -mcpu=native -lcrypto -fwrapv -w  -lpapi -g3 
+CFLAGS5  = -Wall -Wextra -O3 -fomit-frame-pointer -mtune=native -mcpu=native -lcrypto -fwrapv -w  -g3 -I/usr/include -I/usr/local/include -lpapi
+CFLAGS6  = -Wall -Wextra -O3 -fomit-frame-pointer -mtune=native -mcpu=native -lcrypto -fwrapv -w  -lpapi -g3 
 CFLAGSDEBUG  = -Wall -Wextra -O0 -fomit-frame-pointer -mtune=native -mcpu=native -march=native -lcrypto -fwrapv -w  -lpapi -g3
 CLANG   = -Wall -Wextra -O2 -fomit-frame-pointer -mtune=native -mcpu=cortex-a53 -lcrypto -fwrapv -Qunused-arguments -w  -lpapi -g3
 RM 		  = /bin/rm
 
 
 all: test/PQCgenKAT_kem \
-     test/test_speed
+     test/test_speed \
+	 test/test_speed2
 
-SOURCES = pack_unpack.c poly.c verify.c fips202.c SABER_indcpa.c kem.c \
-					cbd.c rng.c
-#rng.o
-#randombytes.c
+SOURCES = pack_unpack.c poly.c verify.c fips202.c SABER_indcpa.c kem.c cbd.c rng.c
 
 SOURCES2 =  pack_unpack.c \
 			rng.c \
 			poly.c \
 			verify.c \
-			polymul/toom_cook_4/asimd_scm_neon.c \
-			polymul/toom_cook_4/batch_64coefficient_multiplications.c \
-			polymul/toom_cook_4/asimd_toom_cook_4way_neon.c \
 			SABER_indcpa.c \
 			kem.c \
 			cbd.c \
 			fips202.c
-
-
 
 HEADERS = 	SABER_params.h  \
 			pack_unpack.h  \
 			poly.h  \
 			verify.h  \
-			polymul/toom_cook_4/asimd_scm_neon.h \
-			polymul/toom_cook_4/batch_64coefficient_multiplications.h \
-			polymul/toom_cook_4/asimd_scm_neon.h \
 			cbd.h  \
 			SABER_indcpa.h  \
 			kem.h  \
@@ -49,7 +36,10 @@ HEADERS = 	SABER_params.h  \
 
 
 test/test_speed: $(SOURCES2) $(HEADERS) test/test_speed.c 
-	$(CC) $(CFLAGS5) -o $@ $(SOURCES2) test/test_speed.c 
+	$(CC) $(CFLAGS6) -o $@ $(SOURCES2) test/test_speed.c 
+
+test/test_speed2: $(SOURCES2) $(HEADERS) test/test_speed2.c 
+	$(CC) $(CFLAGS6) -o $@ $(SOURCES2) test/test_speed2.c 
 
 test/PQCgenKAT_kem: $(SOURCES2) $(HEADERS) test/PQCgenKAT_kem.c 
 	$(CC) $(CFLAGS6) -o $@ $(SOURCES2) test/PQCgenKAT_kem.c 
@@ -65,13 +55,11 @@ fips202.o: fips202.c
 
 test:
 	./test/test_speed
-	./test/PQCgenKAT_kem
-
+	./test/test_speed2
 
 clean:
 	-$(RM) -r test/test_speed
+	-$(RM) -r test/test_speed2
 	-$(RM) -r test/PQCgenKAT_kem
 	-$(RM) -r test/*.req
 	-$(RM) -r test/*.rsp
-
-