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

clangformat run

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-12-08 09:33:06 +01:00
parent 275805d78f
commit 7fd856b866
4 changed files with 367 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ecp5/arch.cc
View File

@ -597,7 +597,6 @@ bool Arch::route()
// -----------------------------------------------------------------------
std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
{
std::vector<GraphicElement> ret;
@ -628,7 +627,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
GraphicElement::style_t style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
GfxTileWireId tilewire = GfxTileWireId(locInfo(wire)->wire_data[wire.index].tile_wire);
gfxTileWire(ret, x, y, chip_info->width, chip_info->height, wire_type, tilewire, style);
} else if (decal.type == DecalId::TYPE_PIP) {
PipId pip;
@ -641,7 +640,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
GfxTileWireId src_id = GfxTileWireId(locInfo(src_wire)->wire_data[src_wire.index].tile_wire);
GfxTileWireId dst_id = GfxTileWireId(locInfo(dst_wire)->wire_data[dst_wire.index].tile_wire);
GraphicElement::style_t style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_HIDDEN;
gfxTilePip(ret, x, y, chip_info->width, chip_info->height, src_wire, getWireType(src_wire), src_id, dst_wire, getWireType(dst_wire), dst_id, style);
gfxTilePip(ret, x, y, chip_info->width, chip_info->height, src_wire, getWireType(src_wire), src_id, dst_wire,
getWireType(dst_wire), dst_id, style);
} else if (decal.type == DecalId::TYPE_BEL) {
BelId bel;
bel.index = decal.z;
@ -664,34 +664,36 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.style = GraphicElement::STYLE_FRAME;
el.x1 = x + slice_x2 + 0.0255f;
el.x2 = el.x1 + 0.0017f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + z*26) + 3*slice_pitch - 0.0007f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + z * 26) +
3 * slice_pitch - 0.0007f;
el.y2 = el.y1 + 0.0017f * 5;
ret.push_back(el);
} else if (bel_type == id_TRELLIS_IO || bel_type == id_IOLOGIC || bel_type == id_SIOLOGIC || bel_type == id_DQSBUFM) {
bool top_bottom = (y==0 || y==(chip_info->height-1));
} else if (bel_type == id_TRELLIS_IO || bel_type == id_IOLOGIC || bel_type == id_SIOLOGIC ||
bel_type == id_DQSBUFM) {
bool top_bottom = (y == 0 || y == (chip_info->height - 1));
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
if (top_bottom) {
el.x1 = x + io_cell_h_x1 + (z+2) * 0.10;
el.x2 = x + io_cell_h_x1 + (z+2) * 0.10 + 0.08f;
if (y==chip_info->height-1) {
el.y1 = y + 1- io_cell_h_y1;
el.y2 = y + 1- io_cell_h_y2;
el.x1 = x + io_cell_h_x1 + (z + 2) * 0.10;
el.x2 = x + io_cell_h_x1 + (z + 2) * 0.10 + 0.08f;
if (y == chip_info->height - 1) {
el.y1 = y + 1 - io_cell_h_y1;
el.y2 = y + 1 - io_cell_h_y2;
} else {
el.y1 = y + io_cell_h_y1;
el.y2 = y + io_cell_h_y2;
}
} else {
if (x==0) {
el.x1 = x + 1-io_cell_v_x1;
el.x2 = x + 1-io_cell_v_x2;
if (x == 0) {
el.x1 = x + 1 - io_cell_v_x1;
el.x2 = x + 1 - io_cell_v_x2;
} else {
el.x1 = x + io_cell_v_x1;
el.x2 = x + io_cell_v_x2;
}
el.y1 = y + io_cell_v_y1 + z * 0.10;
el.y2 = y + io_cell_v_y1 + z * 0.10 + 0.08f;
el.y2 = y + io_cell_v_y1 + z * 0.10 + 0.08f;
}
ret.push_back(el);
} else if (bel_type == id_DCCA) {
@ -702,7 +704,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y1 = y + 0.14;
el.x2 = x + switchbox_x1 + (z)*0.025 + 0.020;
el.y2 = y + 0.18;
ret.push_back(el);
ret.push_back(el);
} else if (bel_type == id_DP16KD || bel_type == id_MULT18X18D || bel_type == id_ALU54B) {
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
@ -710,8 +712,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.x1 = x + slice_x1;
el.x2 = x + 0.97;
el.y1 = y + slice_y1;
el.y2 = y + slice_y2 + 3*slice_pitch;
ret.push_back(el);
el.y2 = y + slice_y2 + 3 * slice_pitch;
ret.push_back(el);
} else if (bel_type == id_EHXPLLL) {
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
@ -721,7 +723,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y1 = y + slice_y1;
el.y2 = y + slice_y2;
ret.push_back(el);
} else if (bel_type == id_DCUA || bel_type == id_EXTREFB || bel_type == id_PCSCLKDIV || bel_type == id_DTR || bel_type == id_USRMCLK) {
} else if (bel_type == id_DCUA || bel_type == id_EXTREFB || bel_type == id_PCSCLKDIV || bel_type == id_DTR ||
bel_type == id_USRMCLK) {
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
@ -729,7 +732,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.x2 = x + 0.97;
el.y1 = y + slice_y1 + (z)*slice_pitch;
el.y2 = y + slice_y2 + (z)*slice_pitch;
ret.push_back(el);
ret.push_back(el);
} else if (bel_type == id_SEDGA || bel_type == id_GSR || bel_type == id_JTAGG || bel_type == id_OSCG) {
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
@ -748,7 +751,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y1 = y + 0.2;
el.y2 = y + 0.8;
ret.push_back(el);
} else if (bel_type == id_DLLDELD || bel_type == id_CLKDIVF || bel_type == id_ECLKSYNCB || bel_type == id_TRELLIS_ECLKBUF || bel_type == id_ECLKBRIDGECS) {
} else if (bel_type == id_DLLDELD || bel_type == id_CLKDIVF || bel_type == id_ECLKSYNCB ||
bel_type == id_TRELLIS_ECLKBUF || bel_type == id_ECLKBRIDGECS) {
GraphicElement el;
el.type = GraphicElement::TYPE_BOX;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
@ -780,7 +784,7 @@ DecalXY Arch::getWireDecal(WireId wire) const
decalxy.decal.location = wire.location;
decalxy.decal.z = wire.index;
decalxy.decal.active = getBoundWireNet(wire) != nullptr;
return decalxy;
return decalxy;
}
DecalXY Arch::getPipDecal(PipId pip) const
@ -790,7 +794,7 @@ DecalXY Arch::getPipDecal(PipId pip) const
decalxy.decal.location = pip.location;
decalxy.decal.z = pip.index;
decalxy.decal.active = getBoundPipNet(pip) != nullptr;
return decalxy;
return decalxy;
};
DecalXY Arch::getGroupDecal(GroupId group) const
@ -1248,12 +1252,12 @@ std::vector<GroupId> Arch::getGroups() const
{
std::vector<GroupId> ret;
for (int y = 1; y < chip_info->height-1; y++) {
for (int x = 1; x < chip_info->width-1; x++) {
for (int y = 1; y < chip_info->height - 1; y++) {
for (int x = 1; x < chip_info->width - 1; x++) {
GroupId group;
group.type = GroupId::TYPE_SWITCHBOX;
group.location.x = x;
group.location. y = y;
group.location.y = y;
ret.push_back(group);
}
}
@ -1286,7 +1290,6 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) const
// -----------------------------------------------------------------------
std::vector<std::pair<IdString, std::string>> Arch::getWireAttrs(WireId wire) const
{
std::vector<std::pair<IdString, std::string>> ret;

600
ecp5/gfx.cc
View File

File diff suppressed because it is too large Load Diff

40
ecp5/gfx.h
View File

@ -33,7 +33,7 @@ const float slice_x1 = 0.92;
const float slice_x2 = 0.94;
const float slice_y1 = 0.71;
const float slice_y2 = 0.745 + 0.0068;
const float slice_pitch = 0.0374 +0.0068;
const float slice_pitch = 0.0374 + 0.0068;
const float io_cell_v_x1 = 0.76;
const float io_cell_v_x2 = 0.95;
@ -50,7 +50,7 @@ const float io_cell_h_pitch = 0.125;
enum GfxTileWireId
{
TILE_WIRE_NONE,
TILE_WIRE_FCO_SLICE,
TILE_WIRE_D7_SLICE,
TILE_WIRE_C7_SLICE,
@ -76,7 +76,6 @@ enum GfxTileWireId
TILE_WIRE_CE3_SLICE,
TILE_WIRE_FCID_SLICE,
TILE_WIRE_FCOC_SLICE,
TILE_WIRE_D5_SLICE,
TILE_WIRE_C5_SLICE,
@ -93,7 +92,7 @@ enum GfxTileWireId
TILE_WIRE_FXBC_SLICE,
TILE_WIRE_FXAC_SLICE,
TILE_WIRE_DUMMY_C1,
TILE_WIRE_FXC_SLICE,
TILE_WIRE_FXC_SLICE,
TILE_WIRE_F5_SLICE,
TILE_WIRE_Q5_SLICE,
TILE_WIRE_Q4_SLICE,
@ -126,7 +125,7 @@ enum GfxTileWireId
TILE_WIRE_F5B_SLICE,
TILE_WIRE_CE1_SLICE,
TILE_WIRE_FCIB_SLICE,
TILE_WIRE_FCOA_SLICE,
TILE_WIRE_D1_SLICE,
TILE_WIRE_C1_SLICE,
@ -152,10 +151,9 @@ enum GfxTileWireId
TILE_WIRE_CE0_SLICE,
TILE_WIRE_FCI_SLICE,
TILE_WIRE_CLK0,
TILE_WIRE_CLK1,
TILE_WIRE_LSR0,
TILE_WIRE_LSR0,
TILE_WIRE_LSR1,
TILE_WIRE_FCO,
@ -191,7 +189,7 @@ enum GfxTileWireId
TILE_WIRE_D4,
TILE_WIRE_C4,
TILE_WIRE_B4,
TILE_WIRE_A4,
TILE_WIRE_A4,
TILE_WIRE_DI5,
TILE_WIRE_DI4,
TILE_WIRE_M5,
@ -208,7 +206,6 @@ enum GfxTileWireId
TILE_WIRE_CE2,
TILE_WIRE_DUMMY_SWB9,
TILE_WIRE_DUMMY_SWB10,
TILE_WIRE_D3,
TILE_WIRE_C3,
@ -217,7 +214,7 @@ enum GfxTileWireId
TILE_WIRE_D2,
TILE_WIRE_C2,
TILE_WIRE_B2,
TILE_WIRE_A2,
TILE_WIRE_A2,
TILE_WIRE_DI3,
TILE_WIRE_DI2,
TILE_WIRE_M3,
@ -234,7 +231,6 @@ enum GfxTileWireId
TILE_WIRE_CE1,
TILE_WIRE_DUMMY_SWB14,
TILE_WIRE_DUMMY_SWB15,
TILE_WIRE_D1,
TILE_WIRE_C1,
@ -243,7 +239,7 @@ enum GfxTileWireId
TILE_WIRE_D0,
TILE_WIRE_C0,
TILE_WIRE_B0,
TILE_WIRE_A0,
TILE_WIRE_A0,
TILE_WIRE_DI1,
TILE_WIRE_DI0,
TILE_WIRE_M1,
@ -259,7 +255,6 @@ enum GfxTileWireId
TILE_WIRE_DUMMY_SWB18,
TILE_WIRE_CE0,
TILE_WIRE_FCI,
TILE_WIRE_MUXCLK3,
TILE_WIRE_MUXLSR3,
@ -279,10 +274,10 @@ enum GfxTileWireId
TILE_WIRE_WAD2,
TILE_WIRE_WAD1,
TILE_WIRE_WAD0,
TILE_WIRE_DUMMY_D2,
TILE_WIRE_DUMMY_D3,
TILE_WIRE_CLK3_SLICE,
TILE_WIRE_CLK3_SLICE,
TILE_WIRE_LSR3_SLICE,
TILE_WIRE_DUMMY_D4,
TILE_WIRE_DUMMY_D5,
@ -293,7 +288,6 @@ enum GfxTileWireId
TILE_WIRE_DUMMY_D10,
TILE_WIRE_DUMMY_D11,
TILE_WIRE_DUMMY_C2,
TILE_WIRE_DUMMY_C3,
TILE_WIRE_CLK2_SLICE,
@ -307,9 +301,8 @@ enum GfxTileWireId
TILE_WIRE_WADO1C_SLICE,
TILE_WIRE_WADO0C_SLICE,
TILE_WIRE_WCK1_SLICE,
TILE_WIRE_WRE1_SLICE,
TILE_WIRE_WRE1_SLICE,
TILE_WIRE_CLK1_SLICE,
TILE_WIRE_LSR1_SLICE,
TILE_WIRE_DUMMY_B2,
@ -321,7 +314,6 @@ enum GfxTileWireId
TILE_WIRE_WAD1B_SLICE,
TILE_WIRE_WAD0B_SLICE,
TILE_WIRE_WCK0_SLICE,
TILE_WIRE_WRE0_SLICE,
TILE_WIRE_CLK0_SLICE,
@ -335,7 +327,6 @@ enum GfxTileWireId
TILE_WIRE_WAD1A_SLICE,
TILE_WIRE_WAD0A_SLICE,
TILE_WIRE_V01N0001,
TILE_WIRE_V01N0101,
TILE_WIRE_V01S0000,
@ -415,7 +406,7 @@ enum GfxTileWireId
TILE_WIRE_H06W0103,
TILE_WIRE_H06E0103,
TILE_WIRE_H06W0003,
TILE_WIRE_H06E0003,
TILE_WIRE_H06E0003,
TILE_WIRE_G_HPBX0000,
TILE_WIRE_G_HPBX0100,
@ -435,8 +426,11 @@ enum GfxTileWireId
TILE_WIRE_G_HPBX1500,
};
void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire, GraphicElement::style_t style);
void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type, GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style);
void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire,
GraphicElement::style_t style);
void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style);
NEXTPNR_NAMESPACE_END

2
gui/fpgaviewwidget.h
View File

@ -127,7 +127,7 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions
private:
const float zoomNear_ = 0.05f; // do not zoom closer than this
float zoomFar_ = 10.0f; // do not zoom further than this
float zoomFar_ = 10.0f; // do not zoom further than this
const float zoomLvl1_ = 1.0f;
const float zoomLvl2_ = 5.0f;