X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=83c36c2b8bf5c08f1eb1f75bb005e85b7e135330;hp=04418cdc51f9d33ae57327edc0e476194732f712;hb=66f5cd3f9d123306c509b6172fd11ed3afa1d39a;hpb=f196c1bad8928b502c0ad1abd86c35ab53d3468e diff --git a/src/Makefile b/src/Makefile index 04418cdc..83c36c2b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ # Stockfish, a UCI chess playing engine derived from Glaurung 2.1 # Copyright (C) 2004-2008 Tord Romstad (Glaurung author) -# Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad +# Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, 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 @@ -30,18 +30,17 @@ EXE = stockfish PREFIX = /usr/local # Haiku has a non-standard filesystem layout ifeq ($(UNAME),Haiku) - PREFIX=/boot/common + PREFIX=/boot/system/non-packaged endif BINDIR = $(PREFIX)/bin -### Built-in benchmark for pgo-builds and signature -PGOBENCH = ./$(EXE) bench 32 1 10 default depth -SIGNBENCH = ./$(EXE) bench +### Built-in benchmark for pgo-builds +PGOBENCH = ./$(EXE) bench 16 1 1 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 \ + search.o thread.o timeman.o tt.o uci.o ucioption.o syzygy/tbprobe.o ### ========================================================================== ### Section 2. High-level Configuration @@ -60,37 +59,41 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ # with GCC and ICC 64-bit) # popcnt = yes/no --- -DUSE_POPCNT --- Use popcnt x86_64 asm-instruction # sse = yes/no --- -msse --- Use Intel Streaming SIMD Extensions +# pext = yes/no --- -DUSE_PEXT --- Use pext x86_64 asm-instruction # # Note that Makefile is space sensitive, so when adding new architectures # or modifying existing flags, you have to make sure there are no extra spaces # at the end of the line for flag values. ### 2.1. General and architecture defaults -debug = no optimize = yes - -arch = any +debug = no os = any bits = 32 prefetch = no bsfq = no popcnt = no sse = no +pext = no ### 2.2 Architecture specific +ifeq ($(ARCH),general-32) + arch = any +endif + ifeq ($(ARCH),x86-32-old) arch = i386 endif ifeq ($(ARCH),x86-32) arch = i386 - bits = 32 prefetch = yes sse = yes endif ifeq ($(ARCH),general-64) + arch = any bits = 64 endif @@ -111,57 +114,29 @@ ifeq ($(ARCH),x86-64-modern) sse = yes endif -ifeq ($(ARCH),armv7) - arch = armv7 - bits = 32 - prefetch = yes - bsfq = yes -endif - -ifeq ($(ARCH),osx-ppc-32) - arch = ppc - os = osx - bits = 32 -endif - -ifeq ($(ARCH),osx-ppc-64) - arch = ppc64 - os = osx - bits = 64 -endif - -ifeq ($(ARCH),linux-ppc-64) - arch = ppc64 - bits = 64 -endif - -ifeq ($(ARCH),osx-x86-64) +ifeq ($(ARCH),x86-64-bmi2) arch = x86_64 - os = osx bits = 64 prefetch = yes bsfq = yes + popcnt = yes sse = yes + pext = yes endif -ifeq ($(ARCH),osx-x86-64-modern) - arch = x86_64 - os = osx - bits = 64 +ifeq ($(ARCH),armv7) + arch = armv7 prefetch = yes bsfq = yes - popcnt = yes - sse = yes endif -ifeq ($(ARCH),osx-x86-32) - arch = i386 - os = osx - bits = 32 - prefetch = yes - bsfq = no - popcnt = no - sse = yes +ifeq ($(ARCH),ppc-32) + arch = ppc +endif + +ifeq ($(ARCH),ppc-64) + arch = ppc64 + bits = 64 endif @@ -200,7 +175,7 @@ endif ifeq ($(COMP),clang) comp=clang CXX=clang++ - CXXFLAGS += -ansi -pedantic -Wno-long-long -Wextra -Wshadow + CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow endif ifeq ($(comp),icc) @@ -215,7 +190,7 @@ else profile_clean = gcc-profile-clean endif -ifeq ($(os),osx) +ifeq ($(UNAME),Darwin) CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6 LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6 endif @@ -244,7 +219,7 @@ ifeq ($(optimize),yes) ifeq ($(comp),gcc) CXXFLAGS += -O3 - ifeq ($(os),osx) + ifeq ($(UNAME),Darwin) ifeq ($(arch),i386) CXXFLAGS += -mdynamic-no-pic endif @@ -263,7 +238,7 @@ ifeq ($(optimize),yes) endif ifeq ($(comp),icc) - ifeq ($(os),osx) + ifeq ($(UNAME),Darwin) CXXFLAGS += -fast -mdynamic-no-pic else CXXFLAGS += -fast @@ -271,14 +246,13 @@ ifeq ($(optimize),yes) endif ifeq ($(comp),clang) - ifeq ($(os),osx) - # Clang on OS X supports LTO - CXXFLAGS += -O4 - else - CXXFLAGS += -O3 - endif + CXXFLAGS += -O3 - ifeq ($(os),osx) + ifeq ($(UNAME),Darwin) + ifeq ($(pext),no) + CXXFLAGS += -flto + LDFLAGS += $(CXXFLAGS) + endif ifeq ($(arch),i386) CXXFLAGS += -mdynamic-no-pic endif @@ -311,10 +285,22 @@ 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 += -mbmi -mbmi2 + endif endif -### 3.10 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. ### This is a mix of compile and link time options because the lto link phase ### needs access to the optimization flags. ifeq ($(comp),gcc) @@ -343,9 +329,7 @@ help: @echo "Supported targets:" @echo "" @echo "build > Standard build" - @echo "signature-build > Standard build with embedded signature" @echo "profile-build > PGO build" - @echo "signature-profile-build > PGO build with embedded signature" @echo "strip > Strip executable" @echo "install > Install executable" @echo "clean > Clean up" @@ -354,15 +338,12 @@ help: @echo "" @echo "x86-64 > x86 64-bit" @echo "x86-64-modern > x86 64-bit with popcnt support" + @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 "" @@ -383,7 +364,7 @@ help: @echo "make build ARCH=x86-32 (This is for 32-bit systems)" @echo "" -.PHONY: build profile-build embed-signature +.PHONY: build profile-build build: $(MAKE) ARCH=$(ARCH) COMP=$(COMP) config-sanity $(MAKE) ARCH=$(ARCH) COMP=$(COMP) all @@ -408,18 +389,6 @@ profile-build: @echo "Step 4/4. Deleting profile data ..." $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_clean) -embed-signature: - @echo "Running benchmark for getting the signature ..." - @$(SIGNBENCH) 2>&1 | sed -n 's/Nodes searched : \(.*\)/\/string Version\/s\/"\\(.*\\)"\/"sig-\1"\//p' > sign.txt - @sed -f sign.txt misc.cpp > misc2.cpp - @mv misc2.cpp misc.cpp - @rm sign.txt - -signature-build: build embed-signature - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) all - -signature-profile-build: build embed-signature profile-build - strip: strip $(EXE) @@ -429,7 +398,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 default: help @@ -452,6 +421,7 @@ config-sanity: @echo "bsfq: '$(bsfq)'" @echo "popcnt: '$(popcnt)'" @echo "sse: '$(sse)'" + @echo "pext: '$(pext)'" @echo "" @echo "Flags:" @echo "CXX: $(CXX)" @@ -464,12 +434,13 @@ 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 "$(os)" = "any" @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" @test "$(comp)" = "gcc" || test "$(comp)" = "icc" || test "$(comp)" = "mingw" || test "$(comp)" = "clang" $(EXE): $(OBJS)