riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes bad VHDL port map assignment for vectors in VST driver. 

* Bug: In CRL/Vhdl::VectorPortMap::toVhdlPortMap(), two problems:
    1. Bad condition for the use of VstUseConcat. Must be used *only*
       when there is more than *one* mapped name.
    2. Missing case, when there is exactly *one* mapped name, that
       means that we have one full width vector to vector assignement.
       There may be another weakness here, for the portmap we assumes
       that both vector are mapped in the *same* direction (which is
       "downto" by our convention).
    3. In the "bit by bit mapping case" (every bits of the vector are
       differents bits), use the "signal + bit index" name instead of
       juste the signal name (i.e. full width).
    Solves the Libre-SOC/soclayout/experiment6/fpmul64 problem, now
    we can avoid the YOSYS_FLATTEN.
This commit is contained in:
Jean-Paul Chaput 2020-06-26 17:13:18 +02:00
parent b23f620c5d
commit b48f9b40b8
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
crlcore/src/ccore/alliance/vst/VhdlPortMap.cpp
View File

@ -155,14 +155,14 @@ namespace Vhdl {
{ {
vector<string> mappedNames; vector<string> mappedNames;
if (getSignal()->isContiguous()) { if (getSignal()->isContiguous()) {
int begin = -1; int begin = -1;
int end = -1; int end = -1;
int delta = 0; int delta = 0;
int deltap = 0; int deltap = 0;
const Bit* bit = NULL; const Bit* bit = NULL;
const Bit* bitp = NULL; const Bit* bitp = NULL;
string name = "UNCONNECTED"; string name = "UNCONNECTED";
string namep = "UNCONNECTED"; string namep = "UNCONNECTED";
auto imapping = _mapping.rbegin(); auto imapping = _mapping.rbegin();
auto imappingp = _mapping.rbegin(); auto imappingp = _mapping.rbegin();
@ -221,8 +221,14 @@ namespace Vhdl {
} }
} }
} }
if (mappedNames.size() == 1) {
out << setw(width) << left << _signal->getName()
<< " => " << mappedNames[0];
return;
}
if ( (mappedNames.size() == 1) or (_flags & Entity::VstUseConcat) ) { if ( (mappedNames.size() > 1) and (_flags & Entity::VstUseConcat) ) {
out << setw(width) << left << _signal->getName() << " => "; out << setw(width) << left << _signal->getName() << " => ";
size_t lhsWidth = 90 - tab.getWidth() - width - 4; size_t lhsWidth = 90 - tab.getWidth() - width - 4;
@ -241,25 +247,26 @@ namespace Vhdl {
out << name; out << name;
first = false; first = false;
} }
} else { return;
const Bit* bit = NULL; }
string name = "UNCONNECTED";
// cerr << "VhdlPortMap is in bit mode for \"" << _signal->getName() << "\"" const Bit* bit = NULL;
// << " _flags:" << _flags << " mappedNames:" << _mapping.size() << endl; string name = "UNCONNECTED";
auto imapping = _mapping.rbegin(); // cerr << "VhdlPortMap is in bit mode for \"" << _signal->getName() << "\""
bool first = true; // << " _flags:" << _flags << " mappedNames:" << _mapping.size() << endl;
for ( ; imapping!=_mapping.rend() ; ++imapping ) {
bit = imapping ->second;
name = (bit) ? bit ->getSignal()->getName() : "UNCONNECTED";
if (not first) out << "\n" << tab << " , "; auto imapping = _mapping.rbegin();
bool first = true;
out << setw(width) << left << _signal->getBit(imapping->first)->getName() for ( ; imapping!=_mapping.rend() ; ++imapping ) {
<< " => " << name; bit = imapping ->second;
first = false; name = (bit) ? bit->getName() : "UNCONNECTED";
}
if (not first) out << "\n" << tab << " , ";
out << setw(width) << left << _signal->getBit(imapping->first)->getName()
<< " => " << name;
first = false;
} }
} }