Allow to specify different neural net with stockfish

Closes #55

Author: ThomasKaiser

README.md

@@ -121,7 +121,7 @@ A typical result (Rock 5B with Ubuntu Focal) will look like this:
 
 Stockfish (open source chess engine) also makes heavy use of SIMD extensions but is heavy on memory access too putting even more load on devices than cpuminer which doesn't access RAM that much or at all since working set fits inside CPU caches.
 
-As with cpuminer this test is optional (`sbc-bench -s` or `MODE=extensive` needed) since not representing any broader use case but being more of a stressor / load generator exposing thermal and stability issues. Consumption figures are higher compared to cpuminer since stockfish also stresses the DRAM interface and at least it's sufficient to expose a reliability issue with Rock 5B (most probably RK3588 in general) since running this benchmark [reliably freezes Rock 5B at 2112 MHz DRAM clock](https://github.com/ThomasKaiser/sbc-bench/issues/55).
+As with cpuminer this test is optional (`sbc-bench -s` or `MODE=extensive` needed) since not representing any broader use case but being more of a stressor / load generator exposing thermal and stability issues. Consumption figures are higher compared to cpuminer since stockfish also stresses the DRAM interface and at least it's sufficient to expose a reliability issue with Rock 5B (most probably today RK3588 in general) since running this benchmark [reliably freezes Rock 5B at 2112 MHz DRAM clock](https://github.com/ThomasKaiser/sbc-bench/issues/55).
 
 ### [7-zip](https://www.7-cpu.com)
 

results/opp-tables/amlogic-g12a-5.10.147-Radxa_Zero.txt

@@ -0,0 +1,21 @@
+  opp-table:
+      100 MHz    731.0 mV
+      250 MHz    731.0 mV
+      500 MHz    731.0 mV
+      667 MHz    731.0 mV
+     1000 MHz    731.0 mV
+     1200 MHz    731.0 mV
+     1398 MHz    761.0 mV
+     1512 MHz    791.0 mV
+     1608 MHz    831.0 mV
+     1704 MHz    861.0 mV
+     1800 MHz    981.0 mV
+
+  opp-table-gpu:
+      125 MHz    800.0 mV
+      250 MHz    800.0 mV
+      286 MHz    800.0 mV
+      400 MHz    800.0 mV
+      500 MHz    800.0 mV
+      667 MHz    800.0 mV
+      800 MHz    800.0 mV

results/opp-tables/rk3399-5.15.69-Pine64_RockPro64_v2.1.txt

@@ -1,25 +1,25 @@
   opp-table0:
-      408 MHz   825.0 mV
-      600 MHz   825.0 mV
-      816 MHz   850.0 mV
-     1008 MHz   925.0 mV
-     1200 MHz  1000.0 mV
-     1416 MHz  1125.0 mV
+      408 MHz    825.0 mV
+      600 MHz    825.0 mV
+      816 MHz    850.0 mV
+     1008 MHz    925.0 mV
+     1200 MHz   1000.0 mV
+     1416 MHz   1125.0 mV
 
   opp-table1:
-      408 MHz   825.0 mV
-      600 MHz   825.0 mV
-      816 MHz   825.0 mV
-     1008 MHz   875.0 mV
-     1200 MHz   950.0 mV
-     1416 MHz  1025.0 mV
-     1608 MHz  1100.0 mV
-     1800 MHz  1200.0 mV
+      408 MHz    825.0 mV
+      600 MHz    825.0 mV
+      816 MHz    825.0 mV
+     1008 MHz    875.0 mV
+     1200 MHz    950.0 mV
+     1416 MHz   1025.0 mV
+     1608 MHz   1100.0 mV
+     1800 MHz   1200.0 mV
 
   opp-table2:
-      200 MHz   825.0 mV
-      297 MHz   825.0 mV
-      400 MHz   825.0 mV
-      500 MHz   875.0 mV
-      600 MHz   925.0 mV
-      800 MHz  1100.0 mV
+      200 MHz    825.0 mV
+      297 MHz    825.0 mV
+      400 MHz    825.0 mV
+      500 MHz    875.0 mV
+      600 MHz    925.0 mV
+      800 MHz   1100.0 mV

sbc-bench.sh

@@ -53,6 +53,7 @@ Main() {
 				;;
 			s)
 				# Run Stockfish test (NEON/SSE/AVX/RAM)
+				NeuralNetwork=$2
 				ExecuteStockfish=yes
 				;;
 			h)
@@ -2082,7 +2083,7 @@ InstallPrerequisits() {
 
 	# if called with -s or with MODE=extensive we also use stockfish
 	if [ "${ExecuteStockfish}" = "yes" -o "X${MODE}" = "Xextensive" ]; then
-		InstallStockfish
+		InstallStockfish && DownloadNeuralNet
 	fi
 
 	# if called with -c or as 'sbc-bench neon' or with MODE=extensive we also use cpuminer
@@ -2123,7 +2124,6 @@ InstallStockfish() {
 		wget -q -O "${InstallLocation}/sf_15.tar.gz" https://github.com/official-stockfish/Stockfish/archive/refs/tags/sf_15.tar.gz 2>/dev/null
 		[ -f "${InstallLocation}/sf_15.tar.gz" ] && tar xf sf_15.tar.gz
 		[ -d "${InstallLocation}/Stockfish-sf_15/src" ] && cd "${InstallLocation}/Stockfish-sf_15/src" || return
-		wget -q -O nn-6877cd24400e.nnue https://tests.stockfishchess.org/api/nn/nn-6877cd24400e.nnue 2>/dev/null
 
 		case ${CPUArchitecture} in
 			x86_64)
@@ -2171,12 +2171,59 @@ InstallStockfish() {
 
 		if [ ! -x "${InstallLocation}/Stockfish-sf_15/src/stockfish" ]; then
 			echo -e "\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08 (can't build stockfish)  \c"
+			return 1
+		else
+			[ -f "${InstallLocation}/sf_15.tar.gz" ] && rm "${InstallLocation}/sf_15.tar.gz"
 		fi
-
-		[ -f "${InstallLocation}/sf_15.tar.gz" ] && rm "${InstallLocation}/sf_15.tar.gz"
 	fi
 } # InstallStockfish
 
+DownloadNeuralNet() {
+	if [ -d "${InstallLocation}/Stockfish-sf_15/src" ]; then
+		cd "${InstallLocation}/Stockfish-sf_15/src" || return 1
+		case ${NeuralNetwork} in
+			????????????)
+				# prefix with nn- and suffix with .nnue
+				NeuralNetwork="nn-${NeuralNetwork}.nnue"
+				;;
+			????????????.nnue)
+				# prefix with nn-
+				NeuralNetwork="nn-${NeuralNetwork}"
+				;;
+			nn-????????????)
+				# suffix with .nnue
+				NeuralNetwork="${NeuralNetwork}.nnue"
+				;;
+			nn-????????????.nnue)
+				# name fits already
+				:
+				;;
+			*)
+				# use default net
+				FallbackNotification=" (fallback default net)"
+				NeuralNetwork="nn-6877cd24400e.nnue"
+				;;
+		esac
+
+		# download neural network if missing
+		if [ ! -f "${NeuralNetwork}" ]; then
+			echo -e "\x08\x08\x08, stockfish NN...\c"
+			wget -q -O "${NeuralNetwork}" "https://tests.stockfishchess.org/api/nn/${NeuralNetwork}" 2>/dev/null
+		fi
+
+		# check neural network
+		if [ -f "${NeuralNetwork}" ]; then
+			NetHeader="$(od <"${NeuralNetwork}" | head -n1 | cut -c9-28)"
+			if [ "X${NetHeader}" != "X027440 075363 027362" ]; then
+				echo -e "\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08 (can't use ${NeuralNetwork}${FallbackNotification})  \c"
+				return
+			fi
+		else
+			echo -e "\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08\x08 (can't download ${NeuralNetwork}${FallbackNotification})  \c"
+		fi
+	fi
+} # DownloadNeuralNet
+
 InitialMonitoring() {
 	# record start time
 	BenchmarkStartTime=$(date +"%s")
@@ -2884,14 +2931,14 @@ RunStockfishBenchmark() {
 	cd "${InstallLocation}/Stockfish-sf_15/src"
 	echo "" >${TempLog}
 	for ((i=1;i<=RunHowManyTimes;i++)); do
-		./stockfish bench 128 ${CPUCores} 24 default depth >/dev/null 2>>${TempLog}
+		echo -e "setoption name EvalFile value ${NeuralNetwork} \n bench 128 8 24 default depth" | ./stockfish 2>>${TempLog} >/dev/null
 	done
 	kill ${MonitoringPID}
 	echo -e "\n##########################################################################\n" >>${ResultLog}
-	echo -e "Executing Stockfish 15 using nn-6877cd24400e.nnue ${RunHowManyTimes} times in a row:\n" >>${ResultLog}
+	echo -e "Executing Stockfish 15 using ${NeuralNetwork} ${RunHowManyTimes} times in a row:\n" >>${ResultLog}
 	sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" <${TempLog} | sed -e '/^$/d' -e '/^============/i \ ' -e '/second/a \ ' >>${ResultLog}
 	StockfishScores="$(awk -F": " '/^Nodes\/second/ {print $2}' <${TempLog} | tr '\n' ', ' | sed 's/,$//')"
-	echo -e "Total Scores: ${StockfishScores}" >>${ResultLog}
+	echo -e "Total Scores (${NeuralNetwork}): ${StockfishScores}" >>${ResultLog}
 } # RunStockfishBenchmark
 
 RunPTS() {