opelly/Stockfish
1
0
Fork 0
mirror of https://github.com/opelly27/Stockfish.git synced 2026-05-20 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move pawn and material tables under Thread class

Browse Source 
This change allows to remove some quite a bit of code
and seems the natural thing to do.

Introduced file thread.cpp to move away from search.cpp a lot
of threads related stuff.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2011-04-24 09:20:03 +01:00
parent c9d7e99de6
commit fecefbb99c
13 changed files with 585 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evaluate.cpp
+2 -52
View File
@@ -232,13 +232,6 @@ namespace {
PASSED = 12, UNSTOPPABLE = 13, SPACE = 14, TOTAL = 15
};
// Pawn and material hash tables, indexed by the current thread id.
// We use per-thread tables so that once we get a pointer to an entry
// its life time is unlimited and we don't have to care about someone
// changing the entry under our feet.
MaterialInfoTable* MaterialTable[MAX_THREADS];
PawnInfoTable* PawnTable[MAX_THREADS];
// Function prototypes
template<bool HasPopCnt, bool Trace>
Value do_evaluate(const Position& pos, Value& margin);
@@ -271,16 +264,6 @@ namespace {
}
/// prefetchTables() is called in do_move() to prefetch pawn and material
/// hash tables data that will be needed shortly after in evaluation.
void prefetchTables(Key pKey, Key mKey, int threadID) {
PawnTable[threadID]->prefetch(pKey);
MaterialTable[threadID]->prefetch(mKey);
}
/// evaluate() is the main evaluation function. It always computes two
/// values, an endgame score and a middle game score, and interpolates
/// between them based on the remaining material.
@@ -320,7 +303,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
margins[WHITE] = margins[BLACK] = VALUE_ZERO;
// Probe the material hash table
MaterialInfo* mi = MaterialTable[pos.thread()]->get_material_info(pos);
MaterialInfo* mi = ThreadsMgr[pos.thread()].materialTable.get_material_info(pos);
bonus += mi->material_value();
// If we have a specialized evaluation function for the current material
@@ -332,7 +315,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
}
// Probe the pawn hash table
ei.pi = PawnTable[pos.thread()]->get_pawn_info(pos);
ei.pi = ThreadsMgr[pos.thread()].pawnTable.get_pawn_info(pos);
bonus += apply_weight(ei.pi->pawns_value(), Weights[PawnStructure]);
// Initialize attack and king safety bitboards
@@ -433,39 +416,6 @@ Value do_evaluate(const Position& pos, Value& margin) {
} // namespace
/// init_eval() initializes various tables used by the evaluation function
void init_eval(int threads) {
assert(threads <= MAX_THREADS);
for (int i = 0; i < MAX_THREADS; i++)
{
if (i >= threads)
{
delete PawnTable[i];
delete MaterialTable[i];
PawnTable[i] = NULL;
MaterialTable[i] = NULL;
continue;
}
if (!PawnTable[i])
PawnTable[i] = new PawnInfoTable();
if (!MaterialTable[i])
MaterialTable[i] = new MaterialInfoTable();
}
}
/// quit_eval() releases heap-allocated memory at program termination
void quit_eval() {
init_eval(0);
}
/// read_weights() reads evaluation weights from the corresponding UCI parameters
void read_evaluation_uci_options(Color us) {