X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=294634f69156656ddf617a0df157f0a550efc3f4;hp=843d45fc89aeb64093cdf992c44a94f6150bdc85;hb=8fb45caadef67fb2ccc27857c15ade987d9f5e2f;hpb=0b2794ae1257b224256ac0c6392a705cfc80a848 diff --git a/src/Makefile b/src/Makefile index 843d45fc..294634f6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,7 @@ # Stockfish, a UCI chess playing engine derived from Glaurung 2.1 # Copyright (C) 2004-2008 Tord Romstad (Glaurung author) -# Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad +# Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad +# Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad # # Stockfish is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,20 +29,15 @@ EXE = stockfish ### Installation dir definitions PREFIX = /usr/local -# Haiku has a non-standard filesystem layout -ifeq ($(UNAME),Haiku) - PREFIX=/boot/common -endif BINDIR = $(PREFIX)/bin -### Built-in benchmark for pgo-builds and signature -PGOBENCH = ./$(EXE) bench 32 1 1 default time -SIGNBENCH = ./$(EXE) bench +### Built-in benchmark for pgo-builds +PGOBENCH = ./$(EXE) bench 16 1 1000 default time ### Object files -OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ - material.o misc.o movegen.o movepick.o notation.o pawns.o position.o \ - search.o thread.o timeman.o tt.o uci.o ucioption.o +OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.o \ + material.o misc.o movegen.o movepick.o pawns.o position.o psqt.o \ + search.o thread.o timeman.o tt.o uci.o ucioption.o syzygy/tbprobe.o ### ========================================================================== ### Section 2. High-level Configuration @@ -53,12 +49,9 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ # debug = yes/no --- -DNDEBUG --- Enable/Disable debug mode # optimize = yes/no --- (-O3/-fast etc.) --- Enable/Disable optimizations # arch = (name) --- (-arch) --- Target architecture -# os = (name) --- --- Target operating system # bits = 64/32 --- -DIS_64BIT --- 64-/32-bit operating system -# prefetch = yes/no --- -DUSE_PREFETCH --- Use prefetch x86 asm-instruction -# bsfq = yes/no --- -DUSE_BSFQ --- Use bsfq x86_64 asm-instruction (only -# with GCC and ICC 64-bit) -# popcnt = yes/no --- -DUSE_POPCNT --- Use popcnt x86_64 asm-instruction +# prefetch = yes/no --- -DUSE_PREFETCH --- Use prefetch asm-instruction +# popcnt = yes/no --- -DUSE_POPCNT --- Use popcnt asm-instruction # sse = yes/no --- -msse --- Use Intel Streaming SIMD Extensions # pext = yes/no --- -DUSE_PEXT --- Use pext x86_64 asm-instruction # @@ -69,10 +62,8 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ ### 2.1. General and architecture defaults optimize = yes debug = no -os = any bits = 32 prefetch = no -bsfq = no popcnt = no sse = no pext = no @@ -102,7 +93,6 @@ ifeq ($(ARCH),x86-64) arch = x86_64 bits = 64 prefetch = yes - bsfq = yes sse = yes endif @@ -110,7 +100,6 @@ ifeq ($(ARCH),x86-64-modern) arch = x86_64 bits = 64 prefetch = yes - bsfq = yes popcnt = yes sse = yes endif @@ -119,7 +108,6 @@ ifeq ($(ARCH),x86-64-bmi2) arch = x86_64 bits = 64 prefetch = yes - bsfq = yes popcnt = yes sse = yes pext = yes @@ -128,53 +116,17 @@ endif ifeq ($(ARCH),armv7) arch = armv7 prefetch = yes - bsfq = yes endif -ifeq ($(ARCH),osx-ppc-32) +ifeq ($(ARCH),ppc-32) arch = ppc - os = osx -endif - -ifeq ($(ARCH),osx-ppc-64) - arch = ppc64 - os = osx - bits = 64 endif -ifeq ($(ARCH),linux-ppc-64) +ifeq ($(ARCH),ppc-64) arch = ppc64 bits = 64 endif -ifeq ($(ARCH),osx-x86-64) - arch = x86_64 - os = osx - bits = 64 - prefetch = yes - bsfq = yes - sse = yes -endif - -ifeq ($(ARCH),osx-x86-64-modern) - arch = x86_64 - os = osx - bits = 64 - prefetch = yes - bsfq = yes - popcnt = yes - sse = yes -endif - -ifeq ($(ARCH),osx-x86-32) - arch = i386 - os = osx - prefetch = yes - bsfq = no - popcnt = no - sse = yes -endif - ### ========================================================================== ### Section 3. Low-level configuration @@ -182,7 +134,8 @@ endif ### 3.1 Selecting compiler (default = gcc) -CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti $(EXTRACXXFLAGS) +CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -fno-rtti -std=c++11 $(EXTRACXXFLAGS) +DEPENDFLAGS += -std=c++11 LDFLAGS += $(EXTRALDFLAGS) ifeq ($(COMP),) @@ -192,14 +145,35 @@ endif ifeq ($(COMP),gcc) comp=gcc CXX=g++ - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow + CXXFLAGS += -pedantic -Wextra -Wshadow -m$(bits) + ifneq ($(UNAME),Darwin) + LDFLAGS += -Wl,--no-as-needed + endif endif ifeq ($(COMP),mingw) comp=mingw - CXX=g++ + + ifeq ($(UNAME),Linux) + ifeq ($(bits),64) + ifeq ($(shell which x86_64-w64-mingw32-c++-posix),) + CXX=x86_64-w64-mingw32-c++ + else + CXX=x86_64-w64-mingw32-c++-posix + endif + else + ifeq ($(shell which i686-w64-mingw32-c++-posix),) + CXX=i686-w64-mingw32-c++ + else + CXX=i686-w64-mingw32-c++-posix + endif + endif + else + CXX=g++ + endif + CXXFLAGS += -Wextra -Wshadow - LDFLAGS += -static-libstdc++ -static-libgcc + LDFLAGS += -static endif ifeq ($(COMP),icc) @@ -211,7 +185,12 @@ endif ifeq ($(COMP),clang) comp=clang CXX=clang++ - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow + CXXFLAGS += -pedantic -Wextra -Wshadow -m$(bits) + LDFLAGS += -m$(bits) + ifeq ($(UNAME),Darwin) + CXXFLAGS += -stdlib=libc++ + DEPENDFLAGS += -stdlib=libc++ + endif endif ifeq ($(comp),icc) @@ -226,9 +205,19 @@ else profile_clean = gcc-profile-clean endif -ifeq ($(os),osx) - CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6 - LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6 +ifeq ($(UNAME),Darwin) + CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.9 + LDFLAGS += -arch $(arch) -mmacosx-version-min=10.9 +endif + +### Travis CI script uses COMPILER to overwrite CXX +ifdef COMPILER + COMPCXX=$(COMPILER) +endif + +### Allow overwriting CXX from command line +ifdef COMPCXX + CXX=$(COMPCXX) endif ### On mingw use Windows threads, otherwise POSIX @@ -255,7 +244,7 @@ ifeq ($(optimize),yes) ifeq ($(comp),gcc) CXXFLAGS += -O3 - ifeq ($(os),osx) + ifeq ($(UNAME),Darwin) ifeq ($(arch),i386) CXXFLAGS += -mdynamic-no-pic endif @@ -274,7 +263,7 @@ ifeq ($(optimize),yes) endif ifeq ($(comp),icc) - ifeq ($(os),osx) + ifeq ($(UNAME),Darwin) CXXFLAGS += -fast -mdynamic-no-pic else CXXFLAGS += -fast @@ -284,8 +273,11 @@ ifeq ($(optimize),yes) ifeq ($(comp),clang) CXXFLAGS += -O3 - ifeq ($(os),osx) - CXXFLAGS += -flto + ifeq ($(UNAME),Darwin) + ifeq ($(pext),no) + CXXFLAGS += -flto + LDFLAGS += $(CXXFLAGS) + endif ifeq ($(arch),i386) CXXFLAGS += -mdynamic-no-pic endif @@ -311,40 +303,54 @@ else CXXFLAGS += -DNO_PREFETCH endif -### 3.8 bsfq -ifeq ($(bsfq),yes) - CXXFLAGS += -DUSE_BSFQ -endif - ### 3.9 popcnt ifeq ($(popcnt),yes) - CXXFLAGS += -msse3 -DUSE_POPCNT + ifeq ($(comp),icc) + CXXFLAGS += -msse3 -DUSE_POPCNT + else + CXXFLAGS += -msse3 -mpopcnt -DUSE_POPCNT + endif endif ### 3.10 pext ifeq ($(pext),yes) CXXFLAGS += -DUSE_PEXT ifeq ($(comp),$(filter $(comp),gcc clang mingw)) - CXXFLAGS += -mbmi2 + CXXFLAGS += -mbmi -mbmi2 endif endif -### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw. +### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw under Windows. ### This is a mix of compile and link time options because the lto link phase ### needs access to the optimization flags. ifeq ($(comp),gcc) ifeq ($(optimize),yes) ifeq ($(debug),no) - GCC_MAJOR := `$(CXX) -dumpversion | cut -f1 -d.` - GCC_MINOR := `$(CXX) -dumpversion | cut -f2 -d.` - ifeq (1,$(shell expr \( $(GCC_MAJOR) \> 4 \) \| \( $(GCC_MAJOR) \= 4 \& $(GCC_MINOR) \>= 5 \))) - CXXFLAGS += -flto - LDFLAGS += $(CXXFLAGS) - endif + CXXFLAGS += -flto + LDFLAGS += $(CXXFLAGS) + endif + endif +endif + +ifeq ($(comp),mingw) + ifeq ($(UNAME),Linux) + ifeq ($(optimize),yes) + ifeq ($(debug),no) + CXXFLAGS += -flto + LDFLAGS += $(CXXFLAGS) + endif endif endif endif +### 3.12 Android 5 can only run position independent executables. Note that this +### breaks Android 4.0 and earlier. +ifeq ($(arch),armv7) + CXXFLAGS += -fPIE + LDFLAGS += -fPIE -pie +endif + + ### ========================================================================== ### Section 4. Public targets ### ========================================================================== @@ -353,7 +359,7 @@ help: @echo "" @echo "To compile stockfish, type: " @echo "" - @echo "make target ARCH=arch [COMP=comp]" + @echo "make target ARCH=arch [COMP=compiler] [COMPCXX=cxx]" @echo "" @echo "Supported targets:" @echo "" @@ -370,13 +376,9 @@ help: @echo "x86-64-bmi2 > x86 64-bit with pext support" @echo "x86-32 > x86 32-bit with SSE support" @echo "x86-32-old > x86 32-bit fall back for old hardware" - @echo "linux-ppc-64 > PPC-Linux 64 bit" - @echo "osx-ppc-64 > PPC-Mac OS X 64 bit" - @echo "osx-ppc-32 > PPC-Mac OS X 32 bit" - @echo "osx-x86-64-modern > x86-Mac OS X 64 bit with popcnt support" - @echo "osx-x86-64 > x86-Mac OS X 64 bit" - @echo "osx-x86-32 > x86-Mac OS X 32 bit" - @echo "armv7 > ARMv7 32 bit" + @echo "ppc-64 > PPC 64-bit" + @echo "ppc-32 > PPC 32-bit" + @echo "armv7 > ARMv7 32-bit" @echo "general-64 > unspecified 64-bit" @echo "general-32 > unspecified 32-bit" @echo "" @@ -387,15 +389,17 @@ help: @echo "clang > LLVM Clang compiler" @echo "icc > Intel compiler" @echo "" - @echo "Non-standard targets:" - @echo "" - @echo "make hpux > Compile for HP-UX. Compiler = aCC" - @echo "" - @echo "Examples. If you don't know what to do, you likely want to run: " + @echo "Simple examples. If you don't know what to do, you likely want to run: " @echo "" @echo "make build ARCH=x86-64 (This is for 64-bit systems)" @echo "make build ARCH=x86-32 (This is for 32-bit systems)" @echo "" + @echo "Advanced examples, for experienced users: " + @echo "" + @echo "make build ARCH=x86-64 COMP=clang" + @echo "make profile-build ARCH=x86-64-modern COMP=gcc COMPCXX=g++-4.8" + @echo "" + .PHONY: build profile-build build: @@ -409,14 +413,14 @@ profile-build: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_prepare) @echo "" @echo "Step 1/4. Building executable for benchmark ..." - @touch *.cpp *.h + @touch *.cpp *.h syzygy/*.cpp syzygy/*.h $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_make) @echo "" @echo "Step 2/4. Running benchmark for pgo-build ..." - @$(PGOBENCH) > /dev/null + $(PGOBENCH) > /dev/null @echo "" @echo "Step 3/4. Building final executable ..." - @touch *.cpp + @touch *.cpp *.h syzygy/*.cpp syzygy/*.h $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_use) @echo "" @echo "Step 4/4. Deleting profile data ..." @@ -431,7 +435,7 @@ install: -strip $(BINDIR)/$(EXE) clean: - $(RM) $(EXE) $(EXE).exe *.o .depend *~ core bench.txt *.gcda + $(RM) $(EXE) $(EXE).exe *.o .depend *~ core bench.txt *.gcda ./syzygy/*.o ./syzygy/*.gcda default: help @@ -448,10 +452,8 @@ config-sanity: @echo "debug: '$(debug)'" @echo "optimize: '$(optimize)'" @echo "arch: '$(arch)'" - @echo "os: '$(os)'" @echo "bits: '$(bits)'" @echo "prefetch: '$(prefetch)'" - @echo "bsfq: '$(bsfq)'" @echo "popcnt: '$(popcnt)'" @echo "sse: '$(sse)'" @echo "pext: '$(pext)'" @@ -467,10 +469,8 @@ config-sanity: @test "$(optimize)" = "yes" || test "$(optimize)" = "no" @test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \ test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7" - @test "$(os)" = "any" || test "$(os)" = "osx" @test "$(bits)" = "32" || test "$(bits)" = "64" @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no" - @test "$(bsfq)" = "yes" || test "$(bsfq)" = "no" @test "$(popcnt)" = "yes" || test "$(popcnt)" = "no" @test "$(sse)" = "yes" || test "$(sse)" = "no" @test "$(pext)" = "yes" || test "$(pext)" = "no" @@ -490,12 +490,12 @@ gcc-profile-make: gcc-profile-use: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) \ - EXTRACXXFLAGS='-fprofile-use' \ + EXTRACXXFLAGS='-fprofile-use -fno-peel-loops -fno-tracer' \ EXTRALDFLAGS='-lgcov' \ all gcc-profile-clean: - @rm -rf *.gcda *.gcno bench.txt + @rm -rf *.gcda *.gcno syzygy/*.gcda syzygy/*.gcno bench.txt icc-profile-prepare: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) icc-profile-clean @@ -519,15 +519,3 @@ icc-profile-clean: -include .depend - -### ========================================================================== -### Section 6. Non-standard targets -### ========================================================================== - -hpux: - $(MAKE) \ - CXX='/opt/aCC/bin/aCC -AA +hpxstd98 -mt +O3 -DNDEBUG -DNO_PREFETCH' \ - CXXFLAGS="" \ - LDFLAGS="" \ - all -