Separate vBoard union from V2DI; use scalar solid for non-SSE

Author: okuhara

src/board.h

@@ -24,13 +24,13 @@ typedef struct Board {
 	unsigned long long player, opponent;     /**< bitboard representation */
 } Board;
 
-// MSVC can allocate VBoard var to SSE reg
+// MSVC can allocate vBoard var to SSE reg
 typedef union {
-	Board	board;
+	Board	bb;
   #ifdef hasSSE2
 	__m128i	v2;
   #endif
-} VBoard;
+} vBoard;
 
 struct Move;
 struct Random;
@@ -91,7 +91,7 @@ int get_stability(const unsigned long long, const unsigned long long);
 	#define	vget_opp_statility_fulls(vboard,fulls)	get_stability_PO_fulls((vboard).v2, (fulls))
 #else	// Pass the Board, from opp view
 	int get_stability_fulls(const unsigned long long, const unsigned long long, unsigned long long [5]);
-	#define	vget_opp_statility_fulls(vboard,fulls)	get_stability_fulls((vboard).board.opponent, (vboard).board.player, (fulls))
+	#define	vget_opp_statility_fulls(vboard,fulls)	get_stability_fulls((vboard).bb.opponent, (vboard).bb.player, (fulls))
 #endif
 int get_opp_edge_stability(const Board*);
 int get_corner_stability(const unsigned long long);
@@ -230,7 +230,7 @@ extern unsigned char edge_stability[256 * 256];
 #endif
 
 #ifndef vboard_flip
-	#define	vboard_flip(vboard,x)	board_flip(&(vboard).board, (x))
+	#define	vboard_flip(vboard,x)	board_flip(&(vboard).bb, (x))
 #endif
 
 // Use backup copy of search->board in a vector register if available (assume *pboard == vboard on entry)
@@ -251,7 +251,7 @@ extern unsigned char edge_stability[256 * 256];
 	#define vboard_next(vboard,x,next)	board_next_neon((vboard).v2, (x), (next))
 #else
 	unsigned long long board_next(const Board *board, const int x, Board *next);
-	#define	vboard_next(vboard,x,next)	board_next(&(vboard).board, (x), (next))
+	#define	vboard_next(vboard,x,next)	board_next(&(vboard).bb, (x), (next))
 #endif
 
 // Pass vboard to get_moves if vectorcall available, otherwise board
@@ -263,13 +263,13 @@ extern unsigned char edge_stability[256 * 256];
 #else
 	unsigned long long get_moves(const unsigned long long, const unsigned long long);
 	#define	board_get_moves(board)	get_moves((board)->player, (board)->opponent)
-	#define	vboard_get_moves(vboard)	get_moves((vboard).board.player, (vboard).board.opponent)
+	#define	vboard_get_moves(vboard)	get_moves((vboard).bb.player, (vboard).bb.opponent)
 #endif
 
 #ifdef hasSSE2
 	#define	vboard_equal(v,b)	(_mm_movemask_epi8(_mm_cmpeq_epi8((v).v2, _mm_loadu_si128((__m128i *) (b)))) == 0xFFFF)
 #else
-	#define	vboard_equal(v,b)	board_equal(&(v).board, (b))
+	#define	vboard_equal(v,b)	board_equal(&(v).bb, (b))
 #endif
 
 #endif

src/endgame.c

@@ -355,7 +355,7 @@ static int search_shallow(Search *search, const int alpha, bool pass1)
 	unsigned long long moves, prioritymoves;
 	int x, prev, score, bestscore;
 	// const int beta = alpha + 1;
-	VBoard board0;
+	vBoard board0;
 	unsigned int parity0;
 
 	assert(SCORE_MIN <= alpha && alpha <= SCORE_MAX);
@@ -367,7 +367,7 @@ static int search_shallow(Search *search, const int alpha, bool pass1)
 	// stability cutoff (try 8%, cut 7%)
 	if (search_SC_NWS(search, alpha, &score)) return score;
 
-	board0.board = search->board;
+	board0.bb = search->board;
 	moves = vboard_get_moves(board0);
 	if (moves == 0) {	// pass (2%)
 		if (pass1)	// gameover (1%)
@@ -441,7 +441,7 @@ static int NWS_endgame_local(Search *search, const int alpha)
 	int score, ofssolid, bestmove, bestscore;
 	// const int beta = alpha + 1;
 	Move *move;
-	VBoard board0, hashboard;
+	vBoard board0, hashboard;
 	unsigned int parity0;
 	MoveList movelist;
 
@@ -452,7 +452,7 @@ static int NWS_endgame_local(Search *search, const int alpha)
 	SEARCH_UPDATE_INTERNAL_NODES(search->n_nodes);
 
 	// stability cutoff
-	board0.board = hashboard.board = search->board;
+	board0.bb = hashboard.bb = search->board;
 	ofssolid = 0;
 #ifdef USE_SOLID
 	if (USE_SC && alpha >= NWS_STABILITY_SOLID_THRESHOLD) {	// (7%)
@@ -473,10 +473,10 @@ static int NWS_endgame_local(Search *search, const int alpha)
 			hashboard.v2 = _mm_xor_si128(hashboard.v2, _mm_unpacklo_epi64(solid, solid));
 			ofssolid = bit_count_si64(solid) * 2;
   #else
-			unsigned long long solid = full[4] & hashboard.board.player;	// full[4] = all full
+			unsigned long long solid = full[4] & hashboard.bb.player;	// full[4] = all full
 			if (solid) {	// (72%)
-				hashboard.board.player ^= solid;	// normalize solid to opponent
-				hashboard.board.opponent ^= solid;
+				hashboard.bb.player ^= solid;	// normalize solid to opponent
+				hashboard.bb.opponent ^= solid;
 				ofssolid = bit_count(solid) * 2;	// hash score is ofssolid smaller than real
 			}
   #endif
@@ -489,9 +489,9 @@ static int NWS_endgame_local(Search *search, const int alpha)
 
 	if (movelist.n_moves > 0) {
 		// transposition cutoff
-		// hash_get(&search->thread_hash, &hashboard.board, hash_code, &hash_data.data)
+		// hash_get(&search->thread_hash, &hashboard.bb, hash_code, &hash_data.data)
 		unsigned char hashmove[2] = { NOMOVE, NOMOVE };
-		Hash *hash_entry = search->thread_hash.hash + (board_get_hash_code(&hashboard.board) & search->thread_hash.hash_mask);
+		Hash *hash_entry = search->thread_hash.hash + (board_get_hash_code(&hashboard.bb) & search->thread_hash.hash_mask);
 		if (vboard_equal(hashboard, &hash_entry->board)) {	// (6%)
 			hashmove[0] = hash_entry->data.move[0];
 			// search_TC_NWS(&hash_data.data, search->eval.n_empties, NO_SELECTIVITY, alpha, &score)
@@ -529,7 +529,7 @@ static int NWS_endgame_local(Search *search, const int alpha)
 				score = -NWS_endgame_local(search, ~alpha);
 				empty_restore(search->empties, move->x);
 			}
-			search->board = board0.board;
+			search->board = board0.bb;
 
 			if (score > bestscore) {	// (63%)
 				bestscore = score;
@@ -586,7 +586,7 @@ int NWS_endgame(Search *search, const int alpha)
 	HashStoreData hash_data;
 	Move *move;
 	long long nodes_org;
-	VBoard board0;
+	vBoard board0;
 	unsigned int parity0;
 	MoveList movelist;
 
@@ -608,7 +608,7 @@ int NWS_endgame(Search *search, const int alpha)
 	hash_prefetch(&search->hash_table, hash_code);
 
 	search_get_movelist(search, &movelist);
-	board0.board = search->board;
+	board0.bb = search->board;
 
 	if (movelist.n_moves > 0) {	// (96%)
 		// transposition cutoff
@@ -630,7 +630,7 @@ int NWS_endgame(Search *search, const int alpha)
 			vboard_update(&search->board, board0, move);
 			score = -NWS_endgame(search, ~alpha);
 			empty_restore(search->empties, move->x);
-			search->board = board0.board;
+			search->board = board0.bb;
 
 			if (score > bestscore) {	// (63%)
 				bestscore = score;

src/hash.c

@@ -550,7 +550,7 @@ void hash_store(HashTable *hash_table, const Board *board, const unsigned long l
  * @param score      Best score found.
  * @param move       Best move found.
  */
-void hash_store_local(Hash *hash, VBoard vboard, int alpha, int beta, int score, int move)
+void hash_store_local(Hash *hash, vBoard vboard, int alpha, int beta, int score, int move)
 {
 	if (vboard_equal(vboard, &hash->board)) {	// data_update
 		if (score < beta && score < hash->data.upper) hash->data.upper = score;
@@ -566,7 +566,7 @@ void hash_store_local(Hash *hash, VBoard vboard, int alpha, int beta, int score,
 			score = SCORE_MIN;
 			move = NOMOVE;
 		}
-		hash->board = vboard.board;
+		hash->board = vboard.bb;
 		hash->data.upper = upper;
 		hash->data.lower = score;
 		hash->data.move[0] = move;

src/hash.h

@@ -94,7 +94,7 @@ void hash_clear(HashTable*);
 void hash_free(HashTable*);
 void hash_feed(HashTable*, const Board *, const unsigned long long, HashStoreData *);
 void hash_store(HashTable*, const Board *, const unsigned long long, HashStoreData *);
-void hash_store_local(Hash*, VBoard, int, int, int, int);
+void hash_store_local(Hash*, vBoard, int, int, int, int);
 void hash_force(HashTable*, const Board *, const unsigned long long, HashStoreData *);
 bool hash_get(HashTable*, const Board *, const unsigned long long, HashData *);
 bool hash_get_from_board(HashTable*, const Board *, HashData *);

src/midgame.c

@@ -142,7 +142,7 @@ int search_eval_1(Search *search, int alpha, int beta, unsigned long long moves)
 	int x, score, bestscore, alphathres;
 	unsigned long long flipped;
 	Eval Ev;
-	VBoard board0;
+	vBoard board0;
 
 	SEARCH_STATS(++statistics.n_search_eval_1);
 	SEARCH_UPDATE_INTERNAL_NODES(search->n_nodes);
@@ -152,7 +152,7 @@ int search_eval_1(Search *search, int alpha, int beta, unsigned long long moves)
 		if (alpha < SCORE_MIN + 1) alphathres = ((SCORE_MIN + 1) * 128) + 64;
 		else alphathres = (alpha * 128) + 63 + (int) (alpha < 0);	// highest score rounded to alpha
 
-		board0.board = search->board;
+		board0.bb = search->board;
 		x = NOMOVE;
 		do {
 			do {
@@ -210,7 +210,7 @@ int search_eval_2(Search *search, int alpha, int beta, unsigned long long moves)
 	int x, bestscore, score;
 	unsigned long long flipped;
 	Eval eval0;
-	VBoard board0;
+	vBoard board0;
 
 	SEARCH_STATS(++statistics.n_search_eval_2);
 	SEARCH_UPDATE_INTERNAL_NODES(search->n_nodes);
@@ -223,7 +223,7 @@ int search_eval_2(Search *search, int alpha, int beta, unsigned long long moves)
 		bestscore = -SCORE_INF;
 		eval0.feature = search->eval.feature;
 		eval0.n_empties = search->eval.n_empties--;
-		board0.board = search->board;
+		board0.bb = search->board;
 		x = NOMOVE;
 		do {
 			do {
@@ -245,7 +245,7 @@ int search_eval_2(Search *search, int alpha, int beta, unsigned long long moves)
 		} while (moves);
 		search->eval.feature = eval0.feature;
 		search->eval.n_empties = eval0.n_empties;
-		search->board = board0.board;
+		search->board = board0.bb;
 
 	} else {
 		moves = get_moves(search->board.opponent, search->board.player);
@@ -380,7 +380,7 @@ static int NWS_shallow(Search *search, const int alpha, int depth, HashTable *ha
 	MoveList movelist;
 	Move *move;
 	Eval eval0;
-	VBoard board0;
+	vBoard board0;
 	long long nodes_org;
 
 	if (depth == 2) return search_eval_2(search, alpha, alpha + 1, board_get_moves(&search->board));
@@ -400,7 +400,7 @@ static int NWS_shallow(Search *search, const int alpha, int depth, HashTable *ha
 	if (search_SC_NWS(search, alpha, &score)) return score;
 
 	search_get_movelist(search, &movelist);
-	board0.board = search->board;
+	board0.bb = search->board;
 	eval0 = search->eval;
 
 	if (movelist.n_moves > 1) {
@@ -418,7 +418,7 @@ static int NWS_shallow(Search *search, const int alpha, int depth, HashTable *ha
 			search_update_midgame(search, move);
 			score = -NWS_shallow(search, ~alpha, depth - 1, hash_table);
 			search_restore_midgame(search, move->x, &eval0);
-			search->board = board0.board;
+			search->board = board0.bb;
 			if (score > bestscore) {
 				bestscore = score;
 				hash_data.data.move[0] = move->x;
@@ -441,7 +441,7 @@ static int NWS_shallow(Search *search, const int alpha, int depth, HashTable *ha
 		search_update_midgame(search, move);
 		bestscore = -NWS_shallow(search, ~alpha, depth - 1, hash_table);
 		search_restore_midgame(search, move->x, &eval0);
-		search->board = board0.board;
+		search->board = board0.bb;
 
 	} else { // no moves
 		if (can_move(search->board.opponent, search->board.player)) { // pass ?
@@ -593,7 +593,7 @@ int NWS_midgame(Search *search, const int alpha, int depth, Node *parent)
 	Move *move;
 	Node node;
 	Eval eval0;
-	VBoard board0;
+	vBoard board0;
 	long long nodes_org;
 
 	assert(search->eval.n_empties == bit_count(~(search->board.player | search->board.opponent)));
@@ -659,14 +659,14 @@ int NWS_midgame(Search *search, const int alpha, int depth, Node *parent)
 		node_init(&node, search, alpha, alpha + 1, depth, movelist.n_moves, parent);
 
 		// loop over all moves
-		board0.board = search->board;
+		board0.bb = search->board;
 		eval0 = search->eval;
 		for (move = node_first_move(&node, &movelist); move; move = node_next_move(&node)) {
 			if (!node_split(&node, move)) {
 				search_update_midgame(search, move);
 				move->score = -NWS_midgame(search, ~alpha, depth - 1, &node);
 				search_restore_midgame(search, move->x, &eval0);
-				search->board = board0.board;
+				search->board = board0.bb;
 				node_update(&node, move);
 			}
 		}
@@ -843,18 +843,18 @@ int PVS_midgame(Search *search, const int alpha, const int beta, int depth, Node
 
 		// lacal hash (main thread only)
 		if (search->eval.n_empties <= depth && depth <= DEPTH_TO_USE_LOCAL_HASH && depth > DEPTH_TO_SHALLOW_SEARCH) {
-			VBoard hashboard;
+			vBoard hashboard;
   #ifdef USE_SOLID
 			unsigned long long solid = get_all_full_lines(search->board.player | search->board.opponent) & search->board.player;
 			if (solid) {
 				int ofssolid = bit_count(solid) * 2;	// hash score is ofssolid smaller than real
-				hashboard.board.player = search->board.player ^ solid;	// normalize solid to opponent
-				hashboard.board.opponent = search->board.opponent ^ solid;
-				hash_store_local(search->thread_hash.hash + (board_get_hash_code(&hashboard.board) & search->thread_hash.hash_mask),
+				hashboard.bb.player = search->board.player ^ solid;	// normalize solid to opponent
+				hashboard.bb.opponent = search->board.opponent ^ solid;
+				hash_store_local(search->thread_hash.hash + (board_get_hash_code(&hashboard.bb) & search->thread_hash.hash_mask),
 					hashboard, alpha - ofssolid, beta - ofssolid, node.bestscore - ofssolid, node.bestmove);
 			}
   #endif
-			hashboard.board = search->board;
+			hashboard.bb = search->board;
 			hash_store_local(search->thread_hash.hash + (hash_code & search->thread_hash.hash_mask),
 				hashboard, alpha, beta, node.bestscore, node.bestmove);
 		}

src/search.c

@@ -882,11 +882,11 @@ void search_get_movelist(const Search *search, MoveList *movelist)
 {
 	Move *previous = movelist->move;
 	Move *move = movelist->move + 1;
-	VBoard vboard;
+	vBoard vboard;
 	unsigned long long moves;
 	int x;
 
-	vboard.board = search->board;
+	vboard.bb = search->board;
 	moves = vboard_get_moves(vboard);
 	movelist->n_moves = 0;
 	foreach_bit(x, moves) {