fix openbench compilation issues (#302)

vshcherbyna · web-flow · commit a4412452b7af · 2024-10-18T23:39:20.000+01:00
bench: 1217611
diff --git a/.github/workflows/build-linux-pgo.yml b/.github/workflows/build-linux-pgo.yml
@@ -0,0 +1,40 @@
+name: Igel Linux Build PGO
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+  workflow_dispatch:  # Allow manual triggering of the workflow
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install GCC versions
+      run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+        sudo apt-get update
+        sudo apt-get install -y gcc-12 g++-12 gcc-13 g++-13
+
+    - name: Set GCC version
+      run: |
+        # Set GCC 14 as the default version
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 60
+
+    - name: Run make pgo
+      run: cd src&&make pgo
+
+    - name: Run the bench
+      run: cd src&&./igel bench
diff --git a/src/makefile b/src/makefile
@@ -2,7 +2,7 @@
 # This makefile is used to compile Igel for OpenBench and TCEC
 #
 
-CC  = clang
+CC  = g++
 EXE = igel
 SRC = *.cpp fathom/tbprobe.cpp
 
@@ -11,7 +11,7 @@ GCCDEFINES = $(shell echo | $(CC) -m64 -march=native -E -dM -)
 EVALFILE = weights/c049c117
 NNFLAGS  = -DEVALFILE=\"$(EVALFILE)\"
 
-LIBS   = -std=c++20 -mpopcnt -pthread -lstdc++ -lm
+LIBS   = -std=c++17 -mpopcnt -pthread -lstdc++ -lm
 WARN   = -Wall
 OPTIM  = -O3 -march=native -flto=auto
 DEFS   = -DNDEBUG -D_BTYPE=0 -DSYZYGY_SUPPORT=TRUE
@@ -30,23 +30,23 @@ endif
 
 CFLAGS = $(WARN) $(LIBS) $(OPTIM) $(NNFLAGS)
 
+basic:
+	$(CC) $(CFLAGS) $(SRC) $(DEFS) -o $(EXE)
+
 pgo: download-network
 ifeq ($(findstring g++, $(CC)), g++)
 	$(CC) $(CFLAGS) $(SRC) $(DEFS) -fprofile-generate=pgo -o $(EXE)
-	./$(EXE) bench 14 > pgo.out 2>&1
+	./$(EXE) bench 15 > pgo.out 2>&1
 	$(CC) $(CFLAGS) $(SRC) $(DEFS) -fprofile-use=pgo -o $(EXE)
 	@rm -rf pgo pgo.out
 else ifeq ($(findstring clang, $(CC)), clang)
 	$(CC) $(CFLAGS) $(SRC) $(DEFS) -fprofile-instr-generate -o $(EXE)
-	./$(EXE) bench 14 > pgo.out 2>&1
+	./$(EXE) bench 15 > pgo.out 2>&1
 	llvm-profdata merge -output=igel.profdata *.profraw
 	$(CC) $(CFLAGS) $(SRC) $(DEFS) -fprofile-instr-use=igel.profdata -o $(EXE)
 	@rm -rf pgo pgo.out igel.profdata *.profraw
 endif
 
-basic:
-	$(CC) $(CFLAGS) $(SRC) $(DEFS) -o $(EXE)
-
 download-network:
 	mkdir weights; \
 	echo "Downloading latest Igel network with wget"; wget -P weights https://github.com/vshcherbyna/igel/releases/download/3.5.0/c049c117;
