mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-07 14:43:23 +00:00
Code Activity

fixup! hashlib: redo interface for flexibility

Browse source
This commit is contained in:
Emil J. Tywoniak 2024-10-01 18:49:10 +02:00
parent e6f6c7d690
commit b6981d329e
1 changed files with 141 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

253
kernel/drivertools.h
View file

@ -74,12 +74,8 @@ struct DriveBitWire
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(wire->name);
h.acc(offset);
return h;
}
operator SigBit() const operator SigBit() const
{ {
@ -109,13 +105,8 @@ struct DriveBitPort
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(cell->name);
h.acc(port);
h.acc(offset);
return h;
}
}; };
@ -138,12 +129,7 @@ struct DriveBitMarker
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(marker);
h.acc(offset);
return h;
}
}; };
@ -178,11 +164,7 @@ public:
return multiple_ == other.multiple_; return multiple_ == other.multiple_;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(multiple_);
return h;
}
}; };
struct DriveBit struct DriveBit
@ -370,32 +352,7 @@ public:
return *this; return *this;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
switch (type_)
{
case DriveType::NONE:
h.acc(0);
break;
case DriveType::CONSTANT:
h.acc(constant_);
break;
case DriveType::WIRE:
h.acc(wire_);
break;
case DriveType::PORT:
h.acc(port_);
break;
case DriveType::MARKER:
h.acc(marker_);
break;
case DriveType::MULTIPLE:
h.acc(multiple_);
break;
}
h.acc(type_);
return h;
}
bool operator==(const DriveBit &other) const bool operator==(const DriveBit &other) const
{ {
@ -516,13 +473,7 @@ struct DriveChunkWire
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(wire->name);
h.acc(width);
h.acc(offset);
return h;
}
explicit operator SigChunk() const explicit operator SigChunk() const
{ {
@ -580,14 +531,7 @@ struct DriveChunkPort
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(cell->name);
h.acc(port);
h.acc(width);
h.acc(offset);
return h;
}
}; };
@ -628,13 +572,7 @@ struct DriveChunkMarker
return offset < other.offset; return offset < other.offset;
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(marker);
h.acc(width);
h.acc(offset);
return h;
}
}; };
struct DriveChunkMultiple struct DriveChunkMultiple
@ -674,12 +612,7 @@ public:
return false; // TODO implement, canonicalize order return false; // TODO implement, canonicalize order
} }
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
h.acc(width_);
h.acc(multiple_);
return h;
}
}; };
struct DriveChunk struct DriveChunk
@ -930,32 +863,7 @@ public:
bool try_append(DriveBit const &bit); bool try_append(DriveBit const &bit);
bool try_append(DriveChunk const &chunk); bool try_append(DriveChunk const &chunk);
Hasher hash_acc(Hasher h) const Hasher hash_acc(Hasher h) const;
{
switch (type_)
{
case DriveType::NONE:
h.acc(0);
break;
case DriveType::CONSTANT:
h.acc(constant_);
break;
case DriveType::WIRE:
h.acc(wire_);
break;
case DriveType::PORT:
h.acc(port_);
break;
case DriveType::MARKER:
h.acc(marker_);
break;
case DriveType::MULTIPLE:
h.acc(multiple_);
break;
}
h.acc(type_);
return h;
}
bool operator==(const DriveChunk &other) const bool operator==(const DriveChunk &other) const
{ {
@ -1165,13 +1073,7 @@ public:
that->hash_ |= (that->hash_ == 0); that->hash_ |= (that->hash_ == 0);
} }
Hasher hash_acc(Hasher h) const { Hasher hash_acc(Hasher h) const;
if (hash_ == 0)
updhash();
h.acc(hash_);
return h;
}
bool operator==(DriveSpec const &other) const { bool operator==(DriveSpec const &other) const {
updhash(); updhash();
@ -1210,7 +1112,7 @@ private:
bool operator!=(const DriveBitId &other) const { return id != other.id; } bool operator!=(const DriveBitId &other) const { return id != other.id; }
bool operator<(const DriveBitId &other) const { return id < other.id; } bool operator<(const DriveBitId &other) const { return id < other.id; }
// unsigned int hash() const { return id; } // unsigned int hash() const { return id; }
Hasher hash_acc(Hasher h) const { h.acc(id); return h; } Hasher hash_acc(Hasher h) const;
}; };
// Essentially a dict<DriveBitId, pool<DriveBitId>> but using less memory // Essentially a dict<DriveBitId, pool<DriveBitId>> but using less memory
// and fewer allocations // and fewer allocations
@ -1356,6 +1258,133 @@ private:
} }
}; };
inline Hasher DriveBitWire::hash_acc(Hasher h) const
{
h.acc(wire->name);
h.acc(offset);
return h;
}
inline Hasher DriveBitPort::hash_acc(Hasher h) const
{
h.acc(cell->name);
h.acc(port);
h.acc(offset);
return h;
}
inline Hasher DriveBitMarker::hash_acc(Hasher h) const
{
h.acc(marker);
h.acc(offset);
return h;
}
inline Hasher DriveBitMultiple::hash_acc(Hasher h) const
{
h.acc(multiple_);
return h;
}
inline Hasher DriveBit::hash_acc(Hasher h) const
{
switch (type_) {
case DriveType::NONE:
h.acc(0);
break;
case DriveType::CONSTANT:
h.acc(constant_);
break;
case DriveType::WIRE:
h.acc(wire_);
break;
case DriveType::PORT:
h.acc(port_);
break;
case DriveType::MARKER:
h.acc(marker_);
break;
case DriveType::MULTIPLE:
h.acc(multiple_);
break;
}
h.acc(type_);
return h;
}
inline Hasher DriveChunkWire::hash_acc(Hasher h) const
{
h.acc(wire->name);
h.acc(width);
h.acc(offset);
return h;
}
inline Hasher DriveChunkPort::hash_acc(Hasher h) const
{
h.acc(cell->name);
h.acc(port);
h.acc(width);
h.acc(offset);
return h;
}
inline Hasher DriveChunkMarker::hash_acc(Hasher h) const
{
h.acc(marker);
h.acc(width);
h.acc(offset);
return h;
}
inline Hasher DriveChunkMultiple::hash_acc(Hasher h) const
{
h.acc(width_);
h.acc(multiple_);
return h;
}
inline Hasher DriveChunk::hash_acc(Hasher h) const
{
switch (type_) {
case DriveType::NONE:
h.acc(0);
break;
case DriveType::CONSTANT:
h.acc(constant_);
break;
case DriveType::WIRE:
h.acc(wire_);
break;
case DriveType::PORT:
h.acc(port_);
break;
case DriveType::MARKER:
h.acc(marker_);
break;
case DriveType::MULTIPLE:
h.acc(multiple_);
break;
}
h.acc(type_);
return h;
}
inline Hasher DriveSpec::hash_acc(Hasher h) const
{
if (hash_ == 0)
updhash();
h.acc(hash_);
return h;
}
inline Hasher DriverMap::DriveBitId::hash_acc(Hasher h) const
{
h.acc(id);
return h;
}
YOSYS_NAMESPACE_END YOSYS_NAMESPACE_END
#endif #endif