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

Add RelSlice::ssize and use it when comparing with signed ints.

Browse Source 
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2021-02-05 09:32:30 -08:00
parent 9557047e5e
commit a0ee42833b
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/relptr.h
View File

@ -32,6 +32,7 @@ NPNR_PACKED_STRUCT(template <typename T> struct RelSlice {
const T *end() const { return get() + length; } const T *end() const { return get() + length; }
const size_t size() const { return length; } const size_t size() const { return length; }
const ptrdiff_t ssize() const { return length; }
const T &operator*() const { return *(get()); } const T &operator*() const { return *(get()); }

28
fpga_interchange/arch.cc
View File

@ -71,14 +71,14 @@ Arch::Arch(ArchArgs args) : args(args)
} }
tileStatus.resize(chip_info->tiles.size()); tileStatus.resize(chip_info->tiles.size());
for (int i = 0; i < chip_info->tiles.size(); i++) { for (int i = 0; i < chip_info->tiles.ssize(); i++) {
tileStatus[i].boundcells.resize(chip_info->tile_types[chip_info->tiles[i].type].bel_data.size()); tileStatus[i].boundcells.resize(chip_info->tile_types[chip_info->tiles[i].type].bel_data.size());
} }
// Sanity check cell name ids. // Sanity check cell name ids.
const CellMapPOD &cell_map = *chip_info->cell_map; const CellMapPOD &cell_map = *chip_info->cell_map;
int32_t first_cell_id = cell_map.cell_names[0]; int32_t first_cell_id = cell_map.cell_names[0];
for (int32_t i = 0; i < cell_map.cell_names.size(); ++i) { for (int32_t i = 0; i < cell_map.cell_names.ssize(); ++i) {
log_assert(cell_map.cell_names[i] == i + first_cell_id); log_assert(cell_map.cell_names[i] == i + first_cell_id);
} }
} }
@ -96,13 +96,13 @@ IdString Arch::archArgsToId(ArchArgs args) const { return IdString(); }
void Arch::setup_byname() const void Arch::setup_byname() const
{ {
if (tile_by_name.empty()) { if (tile_by_name.empty()) {
for (int i = 0; i < chip_info->tiles.size(); i++) { for (int i = 0; i < chip_info->tiles.ssize(); i++) {
tile_by_name[id(chip_info->tiles[i].name.get())] = i; tile_by_name[id(chip_info->tiles[i].name.get())] = i;
} }
} }
if (site_by_name.empty()) { if (site_by_name.empty()) {
for (int i = 0; i < chip_info->tiles.size(); i++) { for (int i = 0; i < chip_info->tiles.ssize(); i++) {
auto &tile = chip_info->tiles[i]; auto &tile = chip_info->tiles[i];
auto &tile_type = chip_info->tile_types[tile.type]; auto &tile_type = chip_info->tile_types[tile.type];
for (int j = 0; j < tile_type.number_sites; j++) { for (int j = 0; j < tile_type.number_sites; j++) {
@ -126,7 +126,7 @@ BelId Arch::getBelByName(IdStringList name) const
std::tie(tile, site) = site_by_name.at(name.ids[0]); std::tie(tile, site) = site_by_name.at(name.ids[0]);
auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type]; auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type];
IdString belname = name.ids[1]; IdString belname = name.ids[1];
for (int i = 0; i < tile_info.bel_data.size(); i++) { for (int i = 0; i < tile_info.bel_data.ssize(); i++) {
if (tile_info.bel_data[i].site == site && tile_info.bel_data[i].name == belname.index) { if (tile_info.bel_data[i].site == site && tile_info.bel_data[i].name == belname.index) {
ret.tile = tile; ret.tile = tile;
ret.index = i; ret.index = i;
@ -202,7 +202,7 @@ WireId Arch::getWireByName(IdStringList name) const
std::tie(tile, site) = iter->second; std::tie(tile, site) = iter->second;
auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type]; auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type];
IdString wirename = name.ids[1]; IdString wirename = name.ids[1];
for (int i = 0; i < tile_info.wire_data.size(); i++) { for (int i = 0; i < tile_info.wire_data.ssize(); i++) {
if (tile_info.wire_data[i].site == site && tile_info.wire_data[i].name == wirename.index) { if (tile_info.wire_data[i].site == site && tile_info.wire_data[i].name == wirename.index) {
ret.tile = tile; ret.tile = tile;
ret.index = i; ret.index = i;
@ -213,7 +213,7 @@ WireId Arch::getWireByName(IdStringList name) const
int tile = tile_by_name.at(name.ids[0]); int tile = tile_by_name.at(name.ids[0]);
auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type]; auto &tile_info = chip_info->tile_types[chip_info->tiles[tile].type];
IdString wirename = name.ids[1]; IdString wirename = name.ids[1];
for (int i = 0; i < tile_info.wire_data.size(); i++) { for (int i = 0; i < tile_info.wire_data.ssize(); i++) {
if (tile_info.wire_data[i].site == -1 && tile_info.wire_data[i].name == wirename.index) { if (tile_info.wire_data[i].site == -1 && tile_info.wire_data[i].name == wirename.index) {
int32_t node = chip_info->tiles[tile].tile_wire_to_node[i]; int32_t node = chip_info->tiles[tile].tile_wire_to_node[i];
if (node == -1) { if (node == -1) {
@ -266,7 +266,7 @@ PipId Arch::getPipByName(IdStringList name) const
int pin_index = get_bel_pin_index(bel, pinname); int pin_index = get_bel_pin_index(bel, pinname);
NPNR_ASSERT(pin_index >= 0); NPNR_ASSERT(pin_index >= 0);
for (int i = 0; i < tile_info.pip_data.size(); i++) { for (int i = 0; i < tile_info.pip_data.ssize(); i++) {
if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].bel == bel.index && if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].bel == bel.index &&
tile_info.pip_data[i].extra_data == pin_index) { tile_info.pip_data[i].extra_data == pin_index) {
@ -294,7 +294,7 @@ PipId Arch::getPipByName(IdStringList name) const
BelId bel = getBelByName(name); BelId bel = getBelByName(name);
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
for (int i = 0; i < tile_info.pip_data.size(); i++) { for (int i = 0; i < tile_info.pip_data.ssize(); i++) {
if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].bel == bel.index) { if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].bel == bel.index) {
PipId ret; PipId ret;
@ -310,7 +310,7 @@ PipId Arch::getPipByName(IdStringList name) const
int32_t src_index = -1; int32_t src_index = -1;
int32_t dst_index = -1; int32_t dst_index = -1;
for (int i = 0; i < tile_info.wire_data.size(); i++) { for (int i = 0; i < tile_info.wire_data.ssize(); i++) {
if (tile_info.wire_data[i].site == site && tile_info.wire_data[i].name == src_site_wire.index) { if (tile_info.wire_data[i].site == site && tile_info.wire_data[i].name == src_site_wire.index) {
src_index = i; src_index = i;
if (dst_index != -1) { if (dst_index != -1) {
@ -328,7 +328,7 @@ PipId Arch::getPipByName(IdStringList name) const
NPNR_ASSERT(src_index != -1); NPNR_ASSERT(src_index != -1);
NPNR_ASSERT(dst_index != -1); NPNR_ASSERT(dst_index != -1);
for (int i = 0; i < tile_info.pip_data.size(); i++) { for (int i = 0; i < tile_info.pip_data.ssize(); i++) {
if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].src_index == src_index && if (tile_info.pip_data[i].site == site && tile_info.pip_data[i].src_index == src_index &&
tile_info.pip_data[i].dst_index == dst_index) { tile_info.pip_data[i].dst_index == dst_index) {
@ -350,7 +350,7 @@ PipId Arch::getPipByName(IdStringList name) const
int32_t src_index = -1; int32_t src_index = -1;
int32_t dst_index = -1; int32_t dst_index = -1;
for (int i = 0; i < tile_info.wire_data.size(); i++) { for (int i = 0; i < tile_info.wire_data.ssize(); i++) {
if (tile_info.wire_data[i].site == -1 && tile_info.wire_data[i].name == src_wire_name.index) { if (tile_info.wire_data[i].site == -1 && tile_info.wire_data[i].name == src_wire_name.index) {
src_index = i; src_index = i;
if (dst_index != -1) { if (dst_index != -1) {
@ -368,7 +368,7 @@ PipId Arch::getPipByName(IdStringList name) const
NPNR_ASSERT(src_index != -1); NPNR_ASSERT(src_index != -1);
NPNR_ASSERT(dst_index != -1); NPNR_ASSERT(dst_index != -1);
for (int i = 0; i < tile_info.pip_data.size(); i++) { for (int i = 0; i < tile_info.pip_data.ssize(); i++) {
if (tile_info.pip_data[i].src_index == src_index && tile_info.pip_data[i].dst_index == dst_index) { if (tile_info.pip_data[i].src_index == src_index && tile_info.pip_data[i].dst_index == dst_index) {
PipId ret; PipId ret;
@ -442,7 +442,7 @@ BelId Arch::getBelByLocation(Loc loc) const
bi.tile = get_tile_index(loc); bi.tile = get_tile_index(loc);
auto &li = loc_info(chip_info, bi); auto &li = loc_info(chip_info, bi);
if (loc.z >= li.bel_data.size()) { if (loc.z >= li.bel_data.ssize()) {
return BelId(); return BelId();
} else { } else {
bi.index = loc.z; bi.index = loc.z;

27
fpga_interchange/arch.h
View File

@ -177,6 +177,7 @@ NPNR_PACKED_STRUCT(struct ChipInfoPOD {
RelPtr<CellMapPOD> cell_map; RelPtr<CellMapPOD> cell_map;
// Constid string data.
RelPtr<RelSlice<RelPtr<char>>> constids; RelPtr<RelSlice<RelPtr<char>>> constids;
}); });
@ -207,7 +208,7 @@ struct BelIterator
BelIterator operator++() BelIterator operator++()
{ {
cursor_index++; cursor_index++;
while (cursor_tile < chip->tiles.size() && cursor_index >= tile_info(chip, cursor_tile).bel_data.size()) { while (cursor_tile < chip->tiles.ssize() && cursor_index >= tile_info(chip, cursor_tile).bel_data.ssize()) {
cursor_index = 0; cursor_index = 0;
cursor_tile++; cursor_tile++;
} }
@ -349,7 +350,7 @@ inline WireId canonical_wire(const ChipInfoPOD *chip_info, int32_t tile, int32_t
{ {
WireId id; WireId id;
if (wire >= chip_info->tiles[tile].tile_wire_to_node.size()) { if (wire >= chip_info->tiles[tile].tile_wire_to_node.ssize()) {
// Cannot be a nodal wire // Cannot be a nodal wire
id.tile = tile; id.tile = tile;
id.index = wire; id.index = wire;
@ -382,18 +383,18 @@ struct WireIterator
// Iterate over nodes first, then tile wires that aren't nodes // Iterate over nodes first, then tile wires that aren't nodes
do { do {
cursor_index++; cursor_index++;
if (cursor_tile == -1 && cursor_index >= chip->nodes.size()) { if (cursor_tile == -1 && cursor_index >= chip->nodes.ssize()) {
cursor_tile = 0; cursor_tile = 0;
cursor_index = 0; cursor_index = 0;
} }
while (cursor_tile != -1 && cursor_tile < chip->tiles.size() && while (cursor_tile != -1 && cursor_tile < chip->tiles.ssize() &&
cursor_index >= chip->tile_types[chip->tiles[cursor_tile].type].wire_data.size()) { cursor_index >= chip->tile_types[chip->tiles[cursor_tile].type].wire_data.ssize()) {
cursor_index = 0; cursor_index = 0;
cursor_tile++; cursor_tile++;
} }
} while ((cursor_tile != -1 && cursor_tile < chip->tiles.size() && } while ((cursor_tile != -1 && cursor_tile < chip->tiles.ssize() &&
cursor_index < chip->tiles[cursor_tile].tile_wire_to_node.size() && cursor_index < chip->tiles[cursor_tile].tile_wire_to_node.ssize() &&
chip->tiles[cursor_tile].tile_wire_to_node[cursor_index] != -1)); chip->tiles[cursor_tile].tile_wire_to_node[cursor_index] != -1));
return *this; return *this;
@ -441,8 +442,8 @@ struct AllPipIterator
AllPipIterator operator++() AllPipIterator operator++()
{ {
cursor_index++; cursor_index++;
while (cursor_tile < chip->tiles.size() && while (cursor_tile < chip->tiles.ssize() &&
cursor_index >= chip->tile_types[chip->tiles[cursor_tile].type].pip_data.size()) { cursor_index >= chip->tile_types[chip->tiles[cursor_tile].type].pip_data.ssize()) {
cursor_index = 0; cursor_index = 0;
cursor_tile++; cursor_tile++;
} }
@ -497,7 +498,7 @@ struct UphillPipIterator
break; break;
WireId w = *twi; WireId w = *twi;
auto &tile = chip->tile_types[chip->tiles[w.tile].type]; auto &tile = chip->tile_types[chip->tiles[w.tile].type];
if (cursor < tile.wire_data[w.index].pips_uphill.size()) if (cursor < tile.wire_data[w.index].pips_uphill.ssize())
break; break;
++twi; ++twi;
cursor = 0; cursor = 0;
@ -536,7 +537,7 @@ struct DownhillPipIterator
break; break;
WireId w = *twi; WireId w = *twi;
auto &tile = chip->tile_types[chip->tiles[w.tile].type]; auto &tile = chip->tile_types[chip->tiles[w.tile].type];
if (cursor < tile.wire_data[w.index].pips_downhill.size()) if (cursor < tile.wire_data[w.index].pips_downhill.ssize())
break; break;
++twi; ++twi;
cursor = 0; cursor = 0;
@ -574,7 +575,7 @@ struct BelPinIterator
while (twi != twi_end) { while (twi != twi_end) {
WireId w = *twi; WireId w = *twi;
auto &tile = tile_info(chip, w.tile); auto &tile = tile_info(chip, w.tile);
if (cursor < tile.wire_data[w.index].bel_pins.size()) if (cursor < tile.wire_data[w.index].bel_pins.ssize())
break; break;
++twi; ++twi;
@ -1209,7 +1210,7 @@ struct Arch : BaseCtx
{ {
const CellMapPOD &cell_map = *chip_info->cell_map; const CellMapPOD &cell_map = *chip_info->cell_map;
int cell_offset = cell_type.index - cell_map.cell_names[0]; int cell_offset = cell_type.index - cell_map.cell_names[0];
NPNR_ASSERT(cell_offset >= 0 && cell_offset < cell_map.cell_names.size()); NPNR_ASSERT(cell_offset >= 0 && cell_offset < cell_map.cell_names.ssize());
NPNR_ASSERT(cell_map.cell_names[cell_offset] == cell_type.index); NPNR_ASSERT(cell_map.cell_names[cell_offset] == cell_type.index);
return cell_offset; return cell_offset;