diff options
| author | David Shah <davey1576@gmail.com> | 2018-08-05 14:31:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-05 14:31:43 +0200 |
| commit | ba97c233fb6e4502f3465a602f997cc2382f0e06 (patch) | |
| tree | 3a62397aebff56e2031f3d5c6c930ead2699d641 /ice40/gfx.h | |
| parent | 8a9b3626d32e8845dc51044e0f281c0ccdb7e53a (diff) | |
| parent | 287fe7e89451b952d15c7839aff9cb3db12bf807 (diff) | |
| download | nextpnr-ba97c233fb6e4502f3465a602f997cc2382f0e06.tar.gz nextpnr-ba97c233fb6e4502f3465a602f997cc2382f0e06.tar.bz2 nextpnr-ba97c233fb6e4502f3465a602f997cc2382f0e06.zip | |
Merge pull request #36 from YosysHQ/lutperm
Add LUT input permutations, improvements in ice40 timing model, improvements in router
Diffstat (limited to 'ice40/gfx.h')
| -rw-r--r-- | ice40/gfx.h | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/ice40/gfx.h b/ice40/gfx.h index 7eeaccf1..8ee7b0b6 100644 --- a/ice40/gfx.h +++ b/ice40/gfx.h @@ -34,7 +34,10 @@ const float local_swbox_x2 = 0.73; const float local_swbox_y1 = 0.05; const float local_swbox_y2 = 0.55; -const float logic_cell_x1 = 0.76; +const float lut_swbox_x1 = 0.76; +const float lut_swbox_x2 = 0.80; + +const float logic_cell_x1 = 0.83; const float logic_cell_x2 = 0.95; const float logic_cell_y1 = 0.05; const float logic_cell_y2 = 0.10; @@ -92,9 +95,6 @@ enum GfxTileWireId TILE_WIRE_LOCAL_G3_6, TILE_WIRE_LOCAL_G3_7, - TILE_WIRE_CARRY_IN, - TILE_WIRE_CARRY_IN_MUX, - TILE_WIRE_LUTFF_0_IN_0, TILE_WIRE_LUTFF_0_IN_1, TILE_WIRE_LUTFF_0_IN_2, @@ -135,6 +135,46 @@ enum GfxTileWireId TILE_WIRE_LUTFF_7_IN_2, TILE_WIRE_LUTFF_7_IN_3, + TILE_WIRE_LUTFF_0_IN_0_LUT, + TILE_WIRE_LUTFF_0_IN_1_LUT, + TILE_WIRE_LUTFF_0_IN_2_LUT, + TILE_WIRE_LUTFF_0_IN_3_LUT, + + TILE_WIRE_LUTFF_1_IN_0_LUT, + TILE_WIRE_LUTFF_1_IN_1_LUT, + TILE_WIRE_LUTFF_1_IN_2_LUT, + TILE_WIRE_LUTFF_1_IN_3_LUT, + + TILE_WIRE_LUTFF_2_IN_0_LUT, + TILE_WIRE_LUTFF_2_IN_1_LUT, + TILE_WIRE_LUTFF_2_IN_2_LUT, + TILE_WIRE_LUTFF_2_IN_3_LUT, + + TILE_WIRE_LUTFF_3_IN_0_LUT, + TILE_WIRE_LUTFF_3_IN_1_LUT, + TILE_WIRE_LUTFF_3_IN_2_LUT, + TILE_WIRE_LUTFF_3_IN_3_LUT, + + TILE_WIRE_LUTFF_4_IN_0_LUT, + TILE_WIRE_LUTFF_4_IN_1_LUT, + TILE_WIRE_LUTFF_4_IN_2_LUT, + TILE_WIRE_LUTFF_4_IN_3_LUT, + + TILE_WIRE_LUTFF_5_IN_0_LUT, + TILE_WIRE_LUTFF_5_IN_1_LUT, + TILE_WIRE_LUTFF_5_IN_2_LUT, + TILE_WIRE_LUTFF_5_IN_3_LUT, + + TILE_WIRE_LUTFF_6_IN_0_LUT, + TILE_WIRE_LUTFF_6_IN_1_LUT, + TILE_WIRE_LUTFF_6_IN_2_LUT, + TILE_WIRE_LUTFF_6_IN_3_LUT, + + TILE_WIRE_LUTFF_7_IN_0_LUT, + TILE_WIRE_LUTFF_7_IN_1_LUT, + TILE_WIRE_LUTFF_7_IN_2_LUT, + TILE_WIRE_LUTFF_7_IN_3_LUT, + TILE_WIRE_LUTFF_0_LOUT, TILE_WIRE_LUTFF_1_LOUT, TILE_WIRE_LUTFF_2_LOUT, @@ -165,6 +205,9 @@ enum GfxTileWireId TILE_WIRE_LUTFF_GLOBAL_CLK, TILE_WIRE_LUTFF_GLOBAL_S_R, + TILE_WIRE_CARRY_IN, + TILE_WIRE_CARRY_IN_MUX, + TILE_WIRE_NEIGH_OP_BNL_0, TILE_WIRE_NEIGH_OP_BNL_1, TILE_WIRE_NEIGH_OP_BNL_2, |