caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove pip names from ice40 chip db to safe memory

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-07-15 21:41:34 +02:00
parent 1d15bbacd1
commit 5531546d6b
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ice40/arch.cc
View File

@ -333,7 +333,21 @@ PipId Arch::getPipByName(IdString name) const
IdString Arch::getPipName(PipId pip) const IdString Arch::getPipName(PipId pip) const
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
#if 1
int x = chip_info->pip_data[pip.index].x;
int y = chip_info->pip_data[pip.index].y;
std::string src_name = chip_info->wire_data[chip_info->pip_data[pip.index].src].name.get();
std::replace(src_name.begin(), src_name.end(), '/', '.');
std::string dst_name = chip_info->wire_data[chip_info->pip_data[pip.index].dst].name.get();
std::replace(dst_name.begin(), dst_name.end(), '/', '.');
return id("X" + std::to_string(x) + "/Y" + std::to_string(y) + "/" + src_name + ".->." + dst_name);
#else
return id(chip_info->pip_data[pip.index].name.get()); return id(chip_info->pip_data[pip.index].name.get());
#endif
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@ -470,9 +484,9 @@ DecalXY Arch::getWireDecal(WireId wire) const
DecalXY Arch::getPipDecal(PipId pip) const DecalXY Arch::getPipDecal(PipId pip) const
{ {
DecalXY decalxy; DecalXY decalxy;
decalxy.decal.type = DecalId::TYPE_PIP; // decalxy.decal.type = DecalId::TYPE_PIP;
decalxy.decal.index = pip.index; // decalxy.decal.index = pip.index;
decalxy.decal.active = pip_to_net.at(pip.index) != IdString(); // decalxy.decal.active = pip_to_net.at(pip.index) != IdString();
return decalxy; return decalxy;
}; };

2
ice40/arch.h
View File

@ -63,7 +63,7 @@ NPNR_PACKED_STRUCT(struct BelPortPOD {
}); });
NPNR_PACKED_STRUCT(struct PipInfoPOD { NPNR_PACKED_STRUCT(struct PipInfoPOD {
RelPtr<char> name; // RelPtr<char> name;
int32_t src, dst; int32_t src, dst;
int32_t delay; int32_t delay;
int8_t x, y; int8_t x, y;

2
ice40/chipdb.py
View File

@ -1107,7 +1107,7 @@ for info in pipinfo:
dst_seg = gfx_wire_ids["TILE_WIRE_" + dst_segname.upper().replace("/", "_")] dst_seg = gfx_wire_ids["TILE_WIRE_" + dst_segname.upper().replace("/", "_")]
dst_segname = dst_segname.replace("/", ".") dst_segname = dst_segname.replace("/", ".")
bba.s("X%d/Y%d/%s->%s" % (info["x"], info["y"], src_segname, dst_segname), "name") # bba.s("X%d/Y%d/%s->%s" % (info["x"], info["y"], src_segname, dst_segname), "name")
bba.u32(info["src"], "src") bba.u32(info["src"], "src")
bba.u32(info["dst"], "dst") bba.u32(info["dst"], "dst")
bba.u32(info["delay"], "delay") bba.u32(info["delay"], "delay")