mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-06 17:44:09 +00:00
Code Activity

Explicitly use uint64_t as the type of fingerprint to avoid type mismatch with some compilers.

Browse source
This commit is contained in:
Rasmus Munk Larsen 2023-10-03 15:02:02 -07:00
parent 8e0308b5e7
commit 57a2b4b0cd
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
passes/opt/opt_merge.cc
View file

@ -41,7 +41,6 @@ struct OptMergeWorker
CellTypes ct; CellTypes ct;
int total_count; int total_count;
using FingerPrint = std::hash<std::string>::result_type;
static void sort_pmux_conn(dict<RTLIL::IdString, RTLIL::SigSpec> &conn) static void sort_pmux_conn(dict<RTLIL::IdString, RTLIL::SigSpec> &conn)
{ {
@ -78,7 +77,7 @@ struct OptMergeWorker
return str; return str;
} }
FingerPrint hash_cell_parameters_and_connections(const RTLIL::Cell *cell) uint64_t hash_cell_parameters_and_connections(const RTLIL::Cell *cell)
{ {
vector<string> hash_conn_strings; vector<string> hash_conn_strings;
std::string hash_string = cell->type.str() + "\n"; std::string hash_string = cell->type.str() + "\n";
@ -267,13 +266,13 @@ struct OptMergeWorker
} }
did_something = false; did_something = false;
dict<FingerPrint, RTLIL::Cell*> sharemap; dict<uint64_t, RTLIL::Cell*> sharemap;
for (auto cell : cells) for (auto cell : cells)
{ {
if ((!mode_share_all && !ct.cell_known(cell->type)) || !cell->known()) if ((!mode_share_all && !ct.cell_known(cell->type)) || !cell->known())
continue; continue;
FingerPrint hash = hash_cell_parameters_and_connections(cell); uint64_t hash = hash_cell_parameters_and_connections(cell);
auto r = sharemap.insert(std::make_pair(hash, cell)); auto r = sharemap.insert(std::make_pair(hash, cell));
if (!r.second) { if (!r.second) {
if (compare_cell_parameters_and_connections(cell, r.first->second)) { if (compare_cell_parameters_and_connections(cell, r.first->second)) {