.

Author: powturbo

Diff for: makefile

@@ -7,29 +7,35 @@ CXX ?= g++
 #NCHECK=1
 #uncomment for full base64 checking (default=partial checking, detect allmost all errors)
 #FULLCHECK=1
-#RDTSC=1
+#uncomment for use memcpy instead of unaligned loads
+#UAMEMCPY=1
+
 #NAVX512=1
+#NAVX2=1
+#NSSE=1
+#NAVX=1
 
+#RDTSC=1
+#XBASE64=1
+
+#CC=aarch64-linux-gnu-gcc
 #CC=powerpc64le-linux-gnu-gcc
-#DEFS=$(DEBUG)
-#CFLAGS=$(DEBUG)
-#UAMEMCPY=1
 
-#DEFS+=-DDEBUG -g
-DEFS+=-DNDEBUG
+#CFLAGS+=-DDEBUG -g
+CFLAGS+=-DNDEBUG
 
 #------- OS/ARCH -------------------
 ifneq (,$(filter Windows%,$(OS)))
   OS := Windows
-#  CC=gcc
-#  CXX=g++
   ARCH=x86_64
 else
   OS := $(shell uname -s)
   ARCH := $(shell uname -m)
 
 ifneq (,$(findstring aarch64,$(CC)))
   ARCH = aarch64
+else ifneq (,$(findstring arm64,$(ARCH)))
+  ARCH = aarch64
 else ifneq (,$(findstring powerpc64le,$(CC)))
   ARCH = ppc64le
 endif
@@ -47,15 +53,9 @@ else
 endif
   MSSE=-march=armv8-a
 else ifeq ($(ARCH),$(filter $(ARCH),x86_64 ppc64le))
-  CFLAGS=-march=native
   MSSE=-mssse3
 endif
 
-ifeq (,$(findstring clang, $(CC)))
-DEFS+=-falign-loops -fstrict-aliasing 
-endif
-#$(info ARCH="$(ARCH)")
-
 ifeq ($(OS),$(filter $(OS),Linux GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku))
 LDFLAGS+=-lrt
 endif
@@ -65,8 +65,9 @@ LDFLAGS+=-static
 endif
 
 FPIC=-fPIC
-
-all: tb64app libtb64.so libtb64.a
+ifeq (,$(findstring clang, $(CC)))
+  CFLAGS+=-falign-loops
+endif
 
 ifeq ($(NCHECK),1)
 DEFS+=-DNB64CHECK
@@ -84,53 +85,42 @@ ifeq ($(UAMEMCPY),1)
 DEFS+=-DUA_MEMCPY
 endif
 
-turbob64c.o: turbob64c.c
-	$(CC) -O3 $(MARCH) $(DEFS) $(FPIC) -fstrict-aliasing  $< -c -o $@ 
-
-tb64app.o: tb64app.c
-	$(CC) -O3 $(DEFS) $< -c -o $@ 
-
-turbob64d.o: turbob64d.c
-	$(CC) -O3 $(MARCH) $(DEFS) $(FPIC) -fstrict-aliasing $< -c -o $@ 
+ifeq ($(XBASE64),1)
+include xtb64.mak
+endif
 
-turbob64v128.o: turbob64v128.c
-	$(CC) -O3 $(MSSE) $(DEFS) $(FPIC) -fstrict-aliasing $< -c -o $@ 
+all: tb64app libtb64.so libtb64.a
 
+tb64app.o:       CFLAGS+=$(XDEFS) $(MARCH) 
+turbob64c.o:     CFLAGS+=$(DEFS) $(FPIC) -fstrict-aliasing $(MARCH)
+turbob64d.o:     CFLAGS+=$(DEFS) $(FPIC) -fstrict-aliasing $(MARCH)
+turbob64v128.o:  CFLAGS+=$(DEFS) $(FPIC) -fstrict-aliasing $(MSSE)
+turbob64v256.o:  CFLAGS+=$(DEFS) $(FPIC) -fstrict-aliasing -march=haswell
+turbob64v512.o:  CFLAGS+=$(DEFS) $(FPIC) -fstrict-aliasing -march=skylake-avx512 -mavx512vbmi
 turbob64v128a.o: turbob64v128.c
-	$(CC) -O3 $(DEFS) $(FPIC) -march=corei7-avx -mtune=corei7-avx -mno-aes -fstrict-aliasing $< -c -o turbob64v128a.o 
-
-turbob64v256.o: turbob64v256.c
-	$(CC) -O3 $(FPIC) $(DEFS) -march=haswell -fstrict-aliasing -falign-loops $< -c -o $@ 
+	$(CC) -O3 $(CFLAGS) $(DEFS) $(FPIC) -fstrict-aliasing -march=corei7-avx -mtune=corei7-avx -mno-aes $< -c -o turbob64v128a.o 
 
-turbob64v512.o: turbob64v512.c
-	$(CC) -O3 $(FPIC) -march=skylake-avx512 -mavx512vbmi -fstrict-aliasing -falign-loops $< -c -o $@ 
-
-_tb64.o: _tb64.c
-	$(CC) -O3 $(FPIC) -I/usr/include/python2.7 $< -c -o $@ 
+#_tb64.o: _tb64.c
+#	$(CC) -O3 $(FPIC) -I/usr/include/python2.7 $< -c -o $@ 
 
 LIB=turbob64c.o turbob64d.o turbob64v128.o
 ifeq ($(ARCH),x86_64)
 LIB+=turbob64v128a.o turbob64v256.o
-endif
-
-ifeq ($(BASE64),1)
-include xtb64make
-endif
-
 ifneq ($(NAVX512),1)
 LIB+=turbob64v512.o
 else
 DEFS+=-DNAVX512
 endif
+endif
 
 #_tb64.so: _tb64.o
-#	gcc -shared $^ -o $@
+#	$(CC) -shared $^ -o $@
 
 libtb64.a: $(LIB)
 	ar cr $@ $+
 
 libtb64.so: $(LIB)
-	gcc -shared $^ -o $@
+	$(CC) -shared $^ -o $@
 
 install:
 	cp libtb64.so ~/.local/lib/
@@ -139,8 +129,8 @@ install:
 	# ./python/tb64/build.py
 	# cp _tb64.so ~/.local/lib/
 
-tb64app: $(LIB) tb64app.o 
-	$(CC) -O3 $(LIB) tb64app.o $(LDFLAGS) -o tb64app
+tb64app: $(LIB) $(XLIB) tb64app.o 
+	$(CC) -O3 $(LIB) $(XLIB) $(XDEFS) tb64app.o $(LDFLAGS) -o tb64app
 
 tb64bench: $(LIB) tb64bench.o 
 	$(CC) -O3 $(LIB) tb64bench.o $(LDFLAGS) -o tb64bench
@@ -149,7 +139,7 @@ tb64test: $(LIB) tb64test.o
 	$(CC) -O3 $(LIB) tb64test.o $(LDFLAGS) -o tb64test
 
 .c.o:
-	$(CC) -O3 $(CFLAGS) $(MARCH) $< -c -o $@
+	$(CC) -O3 $(CFLAGS) $< -c -o $@
 
 ifeq ($(OS),Windows)
 clean: