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

ecp5: Add tilemap to chip database

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-08-01 15:23:27 +02:00
parent 305145ffe4
commit bcdcba66a6
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ecp5/arch.h
View File

@ -117,6 +117,17 @@ NPNR_PACKED_STRUCT(struct PackageInfoPOD {
RelPtr<PackagePinPOD> pin_data; RelPtr<PackagePinPOD> pin_data;
}); });
NPNR_PACKED_STRUCT(struct TileNamePOD {
RelPtr<char> name;
int16_t type_idx;
int16_t padding;
});
NPNR_PACKED_STRUCT(struct TileInfoPOD {
int32_t num_tiles;
RelPtr<TileNamePOD> tile_names;
});
enum TapDirection : int8_t enum TapDirection : int8_t
{ {
TAP_DIR_LEFT = 0, TAP_DIR_LEFT = 0,
@ -148,6 +159,7 @@ NPNR_PACKED_STRUCT(struct ChipInfoPOD {
RelPtr<RelPtr<char>> tiletype_names; RelPtr<RelPtr<char>> tiletype_names;
RelPtr<PackageInfoPOD> package_info; RelPtr<PackageInfoPOD> package_info;
RelPtr<PIOInfoPOD> pio_info; RelPtr<PIOInfoPOD> pio_info;
RelPtr<TileInfoPOD> tile_info;
}); });
#if defined(_MSC_VER) #if defined(_MSC_VER)

19
ecp5/trellis_import.py
View File

@ -136,7 +136,7 @@ def process_loc_globals(chip):
tapdrv = chip.global_data.get_tap_driver(y, x) tapdrv = chip.global_data.get_tap_driver(y, x)
global_data[x, y] = (quadrants.index(quad), int(tapdrv.dir), tapdrv.col) global_data[x, y] = (quadrants.index(quad), int(tapdrv.dir), tapdrv.col)
def write_database(dev_name, ddrg, endianness): def write_database(dev_name, chip, ddrg, endianness):
def write_loc(loc, sym_name): def write_loc(loc, sym_name):
bba.u16(loc.x, "%s.x" % sym_name) bba.u16(loc.x, "%s.x" % sym_name)
bba.u16(loc.y, "%s.y" % sym_name) bba.u16(loc.y, "%s.y" % sym_name)
@ -221,6 +221,20 @@ def write_database(dev_name, ddrg, endianness):
bba.r("loc%d_wires" % idx if len(loctype.wires) > 0 else None, "wire_data") bba.r("loc%d_wires" % idx if len(loctype.wires) > 0 else None, "wire_data")
bba.r("loc%d_pips" % idx if len(loctype.arcs) > 0 else None, "pips_data") bba.r("loc%d_pips" % idx if len(loctype.arcs) > 0 else None, "pips_data")
for y in range(0, max_row+1):
for x in range(0, max_col+1):
bba.l("tile_info_%d_%d" % (x, y), "TileNamePOD")
for tile in chip.get_tiles_by_position(y, x):
bba.s(tile.info.name, "name")
bba.u16(get_tiletype_index(tile.info.type), "type_idx")
bba.u16(0, "padding")
bba.l("tiles_info", "TileInfoPOD")
for y in range(0, max_row+1):
for x in range(0, max_col+1):
bba.u32(len(chip.get_tiles_by_position(y, x)), "num_tiles")
bba.r("tile_info_%d_%d" % (x, y), "tile_names")
bba.l("location_types", "int32_t") bba.l("location_types", "int32_t")
for y in range(0, max_row+1): for y in range(0, max_row+1):
for x in range(0, max_col+1): for x in range(0, max_col+1):
@ -278,6 +292,7 @@ def write_database(dev_name, ddrg, endianness):
bba.r("tiletype_names", "tiletype_names") bba.r("tiletype_names", "tiletype_names")
bba.r("package_data", "package_info") bba.r("package_data", "package_info")
bba.r("pio_info", "pio_info") bba.r("pio_info", "pio_info")
bba.r("tiles_info", "tile_info")
bba.pop() bba.pop()
return bba return bba
@ -311,7 +326,7 @@ def main():
process_pio_db(ddrg, args.device) process_pio_db(ddrg, args.device)
process_loc_globals(chip) process_loc_globals(chip)
# print("{} unique location types".format(len(ddrg.locationTypes))) # print("{} unique location types".format(len(ddrg.locationTypes)))
bba = write_database(args.device, ddrg, "le") bba = write_database(args.device, chip, ddrg, "le")