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

Debug BEL bucket data.

Browse Source 
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2021-02-01 13:31:31 -08:00
parent cd41c4001e
commit 5c16c5024d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fpga_interchange/arch.h
View File

@ -86,7 +86,7 @@ NPNR_PACKED_STRUCT(struct BelInfoPOD {
int16_t category; int16_t category;
int16_t padding; int16_t padding;
RelPtr<int8_t> valid_cells; RelPtr<int8_t> valid_cells; // Bool array, length of number_cells.
}); });
enum BELCategory { enum BELCategory {
@ -183,14 +183,10 @@ NPNR_PACKED_STRUCT(struct NodeInfoPOD {
}); });
NPNR_PACKED_STRUCT(struct CellMapPOD { NPNR_PACKED_STRUCT(struct CellMapPOD {
// BEL bucket constids.
int32_t number_bel_buckets;
RelPtr<int32_t> bel_buckets;
int32_t number_cells; int32_t number_cells;
// Cell names supported in this arch. // Cell names supported in this arch.
RelPtr<int32_t> cell_names; RelPtr<int32_t> cell_names; // constids
RelPtr<int32_t> cell_bel_buckets; RelPtr<int32_t> cell_bel_buckets; // constids
}); });
NPNR_PACKED_STRUCT(struct ChipInfoPOD { NPNR_PACKED_STRUCT(struct ChipInfoPOD {
@ -212,10 +208,11 @@ NPNR_PACKED_STRUCT(struct ChipInfoPOD {
int32_t num_nodes; int32_t num_nodes;
RelPtr<NodeInfoPOD> nodes; RelPtr<NodeInfoPOD> nodes;
RelPtr<CellMapPOD> cell_map; // BEL bucket constids.
int32_t number_bel_buckets; int32_t number_bel_buckets;
RelPtr<int32_t> bel_buckets; RelPtr<int32_t> bel_buckets;
RelPtr<CellMapPOD> cell_map;
}); });
/************************ End of chipdb section. ************************/ /************************ End of chipdb section. ************************/
@ -306,7 +303,9 @@ struct FilteredBelIterator
BelId operator*() const BelId operator*() const
{ {
return *b; BelId bel = *b;
NPNR_ASSERT(filter(bel));
return bel;
} }
}; };
@ -318,11 +317,15 @@ struct FilteredBelRange
b.e = bel_e; b.e = bel_e;
if(b.b != b.e && !filter(*b.b)) { if(b.b != b.e && !filter(*b.b)) {
++b.b; ++b;
} }
e.b = bel_e; e.b = bel_e;
e.e = bel_e; e.e = bel_e;
if(b != e) {
NPNR_ASSERT(filter(*b.b));
}
} }
FilteredBelIterator b, e; FilteredBelIterator b, e;