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

fabulous: Fix bel names for pass bels in v2 format

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2023-04-05 14:33:07 +02:00 committed by myrtle
parent 20b7f760d9
commit 23f2877dde
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generic/viaduct/fabulous/constids.inc
View File

@ -11,6 +11,8 @@ X(LATCH_NOFF)
X(IO_1_bidirectional_frame_config_pass)
X(InPass4_frame_config)
X(OutPass4_frame_config)
X(InPass4_frame_config_mux)
X(OutPass4_frame_config_mux)
X(RegFile_32x4)
X(MULADD)
X(MUX8LUT_frame_config)

14
generic/viaduct/fabulous/fabulous.cc
View File

@ -349,9 +349,19 @@ struct FabulousImpl : ViaductAPI
NPNR_ASSERT(bel_idx.size() == 1);
int bel_z = bel_idx[0] - 'A';
NPNR_ASSERT(bel_z >= 0 && bel_z < 26);
IdString bel_name = bel_idx.to_id(ctx);
if (bel_type.in(id_InPass4_frame_config, id_OutPass4_frame_config, id_InPass4_frame_config_mux,
id_OutPass4_frame_config_mux)) {
// Assign BRAM IO a nicer name than just a letter
auto prefix = csv.next_field();
if (prefix.empty()) {
log_error("Bel definition missing field; please update FABulous!\n");
}
bel_name = prefix.rsplit('_').first.to_id(ctx);
}
Loc loc = tile_loc(tile);
curr_bel = ctx->addBel(IdStringList::concat(tile, bel_idx.to_id(ctx)), bel_type,
Loc(loc.x, loc.y, bel_z), false, false);
curr_bel = ctx->addBel(IdStringList::concat(tile, bel_name), bel_type, Loc(loc.x, loc.y, bel_z), false,
false);
} else if (cmd.in(id_I, id_O)) {
IdString port = csv.next_field().to_id(ctx);
auto wire_name = csv.next_field().split('.');