diff options
| author | David Shah <davey1576@gmail.com> | 2018-08-01 15:23:27 +0200 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-08-01 15:23:27 +0200 |
| commit | bcdcba66a69fbad707866299772a17a4ba0972ee (patch) | |
| tree | 3bb609aaffdf8dcefa988d0261e59d5fa1fb74b6 | |
| parent | 305145ffe455e307818bb44aaaf9cf0817367885 (diff) | |
| download | nextpnr-bcdcba66a69fbad707866299772a17a4ba0972ee.tar.gz nextpnr-bcdcba66a69fbad707866299772a17a4ba0972ee.tar.bz2 nextpnr-bcdcba66a69fbad707866299772a17a4ba0972ee.zip | |
ecp5: Add tilemap to chip database
Signed-off-by: David Shah <davey1576@gmail.com>
| -rw-r--r-- | ecp5/arch.h | 12 | ||||
| -rwxr-xr-x | ecp5/trellis_import.py | 19 |
2 files changed, 29 insertions, 2 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index 2e54276b..0685042c 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -117,6 +117,17 @@ NPNR_PACKED_STRUCT(struct PackageInfoPOD { 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 { TAP_DIR_LEFT = 0, @@ -148,6 +159,7 @@ NPNR_PACKED_STRUCT(struct ChipInfoPOD { RelPtr<RelPtr<char>> tiletype_names; RelPtr<PackageInfoPOD> package_info; RelPtr<PIOInfoPOD> pio_info; + RelPtr<TileInfoPOD> tile_info; }); #if defined(_MSC_VER) diff --git a/ecp5/trellis_import.py b/ecp5/trellis_import.py index 9a4f30ab..d60ab6f4 100755 --- a/ecp5/trellis_import.py +++ b/ecp5/trellis_import.py @@ -136,7 +136,7 @@ def process_loc_globals(chip): tapdrv = chip.global_data.get_tap_driver(y, x) 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): bba.u16(loc.x, "%s.x" % 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_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") for y in range(0, max_row+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("package_data", "package_info") bba.r("pio_info", "pio_info") + bba.r("tiles_info", "tile_info") bba.pop() return bba @@ -311,7 +326,7 @@ def main(): process_pio_db(ddrg, args.device) process_loc_globals(chip) # print("{} unique location types".format(len(ddrg.locationTypes))) - bba = write_database(args.device, ddrg, "le") + bba = write_database(args.device, chip, ddrg, "le") |