Updated Makefile, added README.md

Author: sirzooro

README.md

@@ -0,0 +1,28 @@
+# RakeSearch
+Rake search of Diagonal Latin Squares
+
+## Compilation
+
+Application is compiled using gcc and make. Windows version is compiled using MinGW gcc crosscompiler.
+
+To compile everything, you must have BOINC client libraries. Make sure you compile them using the same gcc version as this app, otherwise you may get link errors.
+
+When compiling app for x86/x86_64, you will need gcc 8.x (I used gcc 8.2). Older gcc versions may not support some options used in Makefile.
+
+To compile app, enter RakeSearch/RakeDiagSearch/RakeDiagSearch directory first. Open Makefile and update `BOINC_DIR` variable, so it will point to place where you have BOINC client library and its include files. After doing so, type `make` to start compilation.
+
+Makefile supports number of extra parameters. Here are ones used for x86 and x86_64:
+
+- `SSE2=1` - enable SSE2 instructions (x86 and x86_64)
+- `AVX=1` - enable AVX instructions (x86_64 only)
+- `AVX2=1` - enable AVX2 and BMI1/2 instructions (x86_64 only)
+- `AVX512=1` - enable AVX512 instructions (x86_64 only)
+
+Note: SSE2 is always enabled on x86_64, support for it is part of AMD64 specification.
+
+You can also specify target platform:
+- `M32=1` - compile 32-bit app version (used for Linux app)
+- `MinGW64=1` - compile 64-bit app for Windows using MinGW crosscompiler
+- `MinGW32=1` - compile 32-bit app for Windows using MinGW crosscompiler
+
+You can also compile app for ARM (32-bit) and AARCH64 (64-bit). ARM may support NEON instructions, so there is compilation option `NEON=1` to enable it. AARCH64 always support NEON, so there is no special option for it.

RakeDiagSearch/RakeDiagSearch/Makefile

@@ -4,44 +4,48 @@ BOINC_LIB_DIR = $(BOINC_DIR)/lib
 
 CXX = g++
 
-CXXFLAGS += -O3 -ftree-vectorize -std=c++11 -static-libgcc -static-libstdc++ \
+CXXFLAGS += -O3 -ftree-vectorize -std=c++11 -Wall -static -static-libgcc -static-libstdc++ -pthread \
     -I$(BOINC_DIR) \
     -I$(BOINC_LIB_DIR) \
     -I$(BOINC_API_DIR) \
     -L$(BOINC_API_DIR) \
     -L$(BOINC_LIB_DIR) \
 
-PTHREAD = -pthread
-
 PROGRAM = rakesearch
 
-ifeq ($(MinGW),1)
-$(info ===== Compiling MinGW app version =====)
-PROGRAM = rakesearch.exe
+ifeq ($(MinGW32),1)
+$(info ===== Compiling MinGW 32-bit app version =====)
+CXX = i686-w64-mingw32-g++
+else ifeq ($(MinGW64),1)
+$(info ===== Compiling MinGW 64-bit app version =====)
 CXX = x86_64-w64-mingw32-g++
-PTHREAD = -static -pthread
+else ifeq ($(M32),1)
+$(info ===== Compiling 32-bit app version =====)
+CXX = g++ -m32
+else
+CXX = g++
 endif
 
 ifeq ($(Native),1)
 # Tune for machine where app is compiled
 $(info ===== Compiling native app version =====)
 CXXFLAGS += -march=native -mtune=native
 else ifeq ($(AVX512),1)
-# AVX512+BMI2, 64-bit
+# AVX512+BMI2
 $(info ===== Compiling AVX512+BMI2 app version =====)
-CXXFLAGS += -march=skylake-avx512 -mprefer-vector-width=256 -m64
+CXXFLAGS += -march=skylake-avx512 -mprefer-vector-width=256
 else ifeq ($(AVX2),1)
-# AVX2+BMI2, 64-bit
+# AVX2+BMI2
 $(info ===== Compiling AVX2+BMI2 app version =====)
-CXXFLAGS += -march=core2 -mtune=haswell -mpopcnt -mavx2 -mbmi -mbmi2 -m64
+CXXFLAGS += -march=core2 -mtune=haswell -mpopcnt -mavx2 -mbmi -mbmi2
 else ifeq ($(AVX),1)
-# AVX, 64-bit
+# AVX
 $(info ===== Compiling AVX app version =====)
-CXXFLAGS += -march=core2 -mtune=sandybridge -mpopcnt -mavx -m64
+CXXFLAGS += -march=core2 -mtune=sandybridge -mpopcnt -mavx
 else ifeq ($(SSE2),1)
 # SSE2, 64-bit
 $(info ===== Compiling SSE2 app version =====)
-CXXFLAGS += -march=core2 -mtune=generic -m64
+CXXFLAGS += -march=core2 -mtune=generic -msse2
 else ifeq ($(NEON),1)
 # NEON (ARM only; AARCH64 has NEON by default)
 $(info ===== Compiling ARM NEON app version =====)
@@ -53,19 +57,10 @@ endif
 all: $(PROGRAM)
 
 clean:
-	rm -f $(PROGRAM) *.o
+	rm -f $(PROGRAM) $(PROGRAM).exe *.o
 
 $(PROGRAM): main.o Square.o Generator.o MovePairSearch.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	$(CXX) $(CXXFLAGS) -o $(PROGRAM) main.o Square.o Generator.o MovePairSearch.o $(PTHREAD) -lboinc_api -lboinc
-
-Square.o: Square.cpp
-	$(CXX) $(CXXFLAGS) -c Square.cpp
-
-Generator.o: Generator.cpp
-	$(CXX) $(CXXFLAGS) -c Generator.cpp
-	
-MovePairSearch.o: MovePairSearch.cpp
-	$(CXX) $(CXXFLAGS) -c MovePairSearch.cpp 
+	$(CXX) $(CXXFLAGS) -o $(PROGRAM) main.o Square.o Generator.o MovePairSearch.o -lboinc_api -lboinc
 
-main.o: main.cpp
-	$(CXX) $(CXXFLAGS) -c main.cpp
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@