From 346ef735e5915849f96abb726b07eafdbee2ddfc Mon Sep 17 00:00:00 2001
From: nocturn9x <nocturn9x@nocturn9x.space>
Date: Sun, 2 Feb 2025 12:23:41 +0100
Subject: [PATCH] Revert to HTTPS submodule, several QoL improvements to
 Makefile (bench 5844195)

---
 .gitmodules |  2 +-
 Makefile    | 47 +++++++++++++++++++++++++++++++++++++----------
 README.md   |  2 +-
 nim.cfg     |  2 +-
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ea144fb..c84ab0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "networks"]
 	path = networks
-	url = git@git.nocturn9x.space:heimdall-engine/networks
+	url = https://git.nocturn9x.space/heimdall-engine/networks
diff --git a/Makefile b/Makefile
index e34140a..7393faf 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,8 @@ NFLAGS_NATIVE := $(NFLAGS) --passC:"$(CFLAGS_NATIVE)" -d:simd -d:avx2
 CFLAGS_LEGACY := $(CFLAGS) -mtune=core2 -march=core2
 NFLAGS_LEGACY := $(NFLAGS) --passC:"$(CFLAGS_LEGACY)" -u:simd -u:avx2
 
+OS_TAG := $(if $(OS),windows,linux)
+
 ifeq ($(SKIP_DEPS),)
 avx512: deps net
 modern: deps net
@@ -47,44 +49,69 @@ native: deps net
 endif
 
 avx512:
+	@echo Building AVX512 binary
 	$(ECHO) nim c $(NFLAGS_AVX512) $(SRCDIR)/heimdall.nim
 
 modern:
+	@echo Building Haswell binary
 	$(ECHO) nim c $(NFLAGS_MODERN) $(SRCDIR)/heimdall.nim
 
 zen2:
+	@echo Building Zen 2 binary
 	$(ECHO) nim c $(NFLAGS_ZEN2) $(SRCDIR)/heimdall.nim
 
 legacy:
+	@echo Building Core 2 binary
 	$(ECHO) nim c $(NFLAGS_LEGACY) $(SRCDIR)/heimdall.nim
 
-native:
-	$(ECHO) nim c $(NFLAGS_NATIVE) $(SRCDIR)/heimdall.nim
-
 deps:
+	@echo Verifying dependencies
 	$(ECHO) nimble install -d
 
 net:
+	@echo Preparing neural network
 	$(ECHO) git submodule update --init --recursive
 	$(ECHO) cd networks && git fetch origin && git checkout FETCH_HEAD
 	$(ECHO) git lfs fetch --include files/$(NET_NAME)
 
 # Check if AVX-512 is supported (cross-platform)
-AVX512_SUPPORTED := $(shell $(CC) -dM -E - </dev/null | grep -q '__AVX512F__' && echo 1 || echo 0)
+ARCH_DEFINES := $(shell echo | $(CXX) -march=native -E -dM -)
+
+AVX512_SUPPORTED := 0
+
+ifneq ($(findstring __AVX512F__, $(ARCH_DEFINES)),)
+    ifneq ($(findstring __AVX512BW__, $(ARCH_DEFINES)),)
+        AVX512_SUPPORTED := 1
+    endif
+endif
+
+native:
+	@if [ $(AVX512_SUPPORTED) -eq 1 ]; then \
+		@echo Building native AVX512 binary
+		$(ECHO) nim c $(NFLAGS_AVX512) $(SRCDIR)/heimdall.nim; \
+	else \
+		@echo Building native AVX2 binary
+		$(ECHO) nim c $(NFLAGS_NATIVE) $(SRCDIR)/heimdall.nim; \
+	fi
 
 releases: deps net
 	@echo Building platform targets
-	$(MAKE) -s legacy SKIP_DEPS=1 EXE=$(EXE_BASE)-linux-amd64-core2
+	$(MAKE) -s legacy SKIP_DEPS=1 EXE=$(EXE_BASE)-$(OS_TAG)-amd64-core2
 	@echo Finished Core 2 build
-	$(MAKE) -s modern SKIP_DEPS=1 EXE=$(EXE_BASE)-linux-amd64-haswell
+	$(MAKE) -s modern SKIP_DEPS=1 EXE=$(EXE_BASE)-$(OS_TAG)-amd64-haswell
 	@echo Finished Haswell build
-	$(MAKE) -s zen2 SKIP_DEPS=1 EXE=$(EXE_BASE)-linux-amd64-zen2
+	$(MAKE) -s zen2 SKIP_DEPS=1 EXE=$(EXE_BASE)-$(OS_TAG)-amd64-zen2
 	@echo Finished Zen 2 build
 	@if [ $(AVX512_SUPPORTED) -eq 1 ]; then \
-		$(MAKE) -s avx512 SKIP_DEPS=1 EXE=$(EXE_BASE)-linux-amd64-avx512; \
+		@echo AVX512 support detected \
+		$(MAKE) -s avx512 SKIP_DEPS=1 EXE=$(EXE_BASE)-$(OS_TAG)-amd64-avx512; \
 		@echo Finished AVX-512 build; \
 	fi
-	@echo All targets built
+	@echo All platform targets built
 
 openbench: deps
-	nim c $(NFLAGS_NATIVE) $(SRCDIR)/heimdall.nim
+	@if [ $(AVX512_SUPPORTED) -eq 1 ]; then \
+		nim c $(NFLAGS_AVX512) $(SRCDIR)/heimdall.nim \
+	else \
+		nim c $(NFLAGS_NATIVE) $(SRCDIR)/heimdall.nim \
+	fi
diff --git a/README.md b/README.md
index 91925bb..c6c7795 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Just run `make native`, this is the easiest (Nim 2.2.0 is required, see [here](h
 build the most optimized executable possible, but AVX2 support is expected on the target platform. Heimdall also requires
 the clang compiler to be built, as executables generated by gcc are horrendously slow for some reason.
 
-If your CPU supports AVX512 (AMD Zen 4 or later and Intel Coffee Lake or later), you can run `make avx512`. You can also run `make zen2` to build a
+You can also run `make zen2` to build a
 modern version of Heimdall for slightly older CPUs (AVX2 support is still required here). For even slightly older CPUs, try `make modern` instead. 
 For (very) old CPUs without AVX2 support, run `make legacy`. In every case, the resulting executable will be located at `bin/$(EXE)` (`bin/heimdall` by default).
 
diff --git a/nim.cfg b/nim.cfg
index 8b6fe55..a298ac9 100644
--- a/nim.cfg
+++ b/nim.cfg
@@ -13,7 +13,7 @@
 -d:simd
 -d:avx2
 #-d:isBeta
--d:isRelease
+#-d:isRelease
 #-d:mimalloc
 #-d:enableTuning
 #-d:pinSearchThreads