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

Renamed LOC attribute to BEL, fix ice40 IO bel names

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-09 19:52:22 +02:00
parent 72f5e640af
commit 70f322ab44
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/place.cc
View File

@ -41,13 +41,13 @@ void place_design(Design *design)
// Initial constraints placer // Initial constraints placer
for (auto cell_entry : design->cells) { for (auto cell_entry : design->cells) {
CellInfo *cell = cell_entry.second; CellInfo *cell = cell_entry.second;
auto loc = cell->attrs.find("LOC"); auto loc = cell->attrs.find("BEL");
if (loc != cell->attrs.end()) { if (loc != cell->attrs.end()) {
std::string loc_name = loc->second; std::string loc_name = loc->second;
BelId bel = design->chip.getBelByName(IdString(loc_name)); BelId bel = design->chip.getBelByName(IdString(loc_name));
if (bel == BelId()) { if (bel == BelId()) {
log_error("No Bel named \'%s\' located for " log_error("No Bel named \'%s\' located for "
"this chip (processing LOC on \'%s\')\n", "this chip (processing BEL attribute on \'%s\')\n",
loc_name.c_str(), cell->name.c_str()); loc_name.c_str(), cell->name.c_str());
} }
@ -112,7 +112,7 @@ void place_design(Design *design)
design->chip.bindBel(cell->bel, cell->name); design->chip.bindBel(cell->bel, cell->name);
// Back annotate location // Back annotate location
cell->attrs["LOC"] = design->chip.getBelName(cell->bel); cell->attrs["BEL"] = design->chip.getBelName(cell->bel);
} }
} }
} }

12
ice40/blinky.v
View File

@ -8,7 +8,7 @@ module blinky (
); );
wire clk, led1, led2, led3, led4, led5; wire clk, led1, led2, led3, led4, led5;
(* LOC="0_3_lc0" *) (* BEL="13_12_io1" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0110_01), .PIN_TYPE(6'b 0110_01),
.PULLUP(1'b0), .PULLUP(1'b0),
@ -26,7 +26,7 @@ module blinky (
.D_IN_1() .D_IN_1()
); );
(* LOC="0_3_lc1" *) (* BEL="13_12_io0" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0110_01), .PIN_TYPE(6'b 0110_01),
.PULLUP(1'b0), .PULLUP(1'b0),
@ -44,7 +44,7 @@ module blinky (
.D_IN_1() .D_IN_1()
); );
(* LOC="5_17_lc1" *) (* BEL="13_11_io1" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0110_01), .PIN_TYPE(6'b 0110_01),
.PULLUP(1'b0), .PULLUP(1'b0),
@ -62,7 +62,7 @@ module blinky (
.D_IN_1() .D_IN_1()
); );
(* LOC="10_0_lc1" *) (* BEL="13_11_io0" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0110_01), .PIN_TYPE(6'b 0110_01),
.PULLUP(1'b0), .PULLUP(1'b0),
@ -80,7 +80,7 @@ module blinky (
.D_IN_1() .D_IN_1()
); );
(* LOC="12_17_lc0" *) (* BEL="13_9_io1" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0110_01), .PIN_TYPE(6'b 0110_01),
.PULLUP(1'b0), .PULLUP(1'b0),
@ -98,7 +98,7 @@ module blinky (
.D_IN_1() .D_IN_1()
); );
(* LOC="0_6_lc0" *) (* BEL="0_8_io1" *)
SB_IO #( SB_IO #(
.PIN_TYPE(6'b 0000_01), .PIN_TYPE(6'b 0000_01),
.PULLUP(1'b0), .PULLUP(1'b0),

2
ice40/chipdb.py
View File

@ -186,7 +186,7 @@ def add_bel_lc(x, y, z):
def add_bel_io(x, y, z): def add_bel_io(x, y, z):
bel = len(bel_name) bel = len(bel_name)
bel_name.append("%d_%d_lc%d" % (x, y, z)) bel_name.append("%d_%d_io%d" % (x, y, z))
bel_type.append("SB_IO") bel_type.append("SB_IO")
bel_pos.append((x, y, z)) bel_pos.append((x, y, z))
bel_wires.append(list()) bel_wires.append(list())