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

Revert "Slight simplification of proxy code"

Browse Source 
This reverts commit a71b576de6.
This commit is contained in:
Sergiusz Bazanski 2018-07-14 18:50:54 +01:00
parent 36b4e3382d
commit 89b9d6bc8a
2 changed files with 67 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
ice40/arch.cc
View File

@ -736,19 +736,19 @@ bool Arch::isGlobalNet(const NetInfo *net) const
bool ArchRProxyMethods::checkBelAvail(BelId bel) const bool ArchRProxyMethods::checkBelAvail(BelId bel) const
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
return bel_to_cell[bel.index] == IdString(); return parent_->bel_to_cell[bel.index] == IdString();
} }
IdString ArchRProxyMethods::getBoundBelCell(BelId bel) const IdString ArchRProxyMethods::getBoundBelCell(BelId bel) const
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
return bel_to_cell[bel.index]; return parent_->bel_to_cell[bel.index];
} }
IdString ArchRProxyMethods::getConflictingBelCell(BelId bel) const IdString ArchRProxyMethods::getConflictingBelCell(BelId bel) const
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
return bel_to_cell[bel.index]; return parent_->bel_to_cell[bel.index];
} }
WireId ArchRProxyMethods::getWireBelPin(BelId bel, PortPin pin) const WireId ArchRProxyMethods::getWireBelPin(BelId bel, PortPin pin) const
@ -757,8 +757,8 @@ WireId ArchRProxyMethods::getWireBelPin(BelId bel, PortPin pin) const
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
int num_bel_wires = chip_info->bel_data[bel.index].num_bel_wires; int num_bel_wires = parent_->chip_info->bel_data[bel.index].num_bel_wires;
const BelWirePOD *bel_wires = chip_info->bel_data[bel.index].bel_wires.get(); const BelWirePOD *bel_wires = parent_->chip_info->bel_data[bel.index].bel_wires.get();
for (int i = 0; i < num_bel_wires; i++) for (int i = 0; i < num_bel_wires; i++)
if (bel_wires[i].port == pin) { if (bel_wires[i].port == pin) {
@ -773,13 +773,13 @@ WireId ArchRProxyMethods::getWireByName(IdString name) const
{ {
WireId ret; WireId ret;
if (wire_by_name.empty()) { if (parent_->wire_by_name.empty()) {
for (int i = 0; i < chip_info->num_wires; i++) for (int i = 0; i < parent_->chip_info->num_wires; i++)
wire_by_name[parent_->id(chip_info->wire_data[i].name.get())] = i; parent_->wire_by_name[parent_->id(parent_->chip_info->wire_data[i].name.get())] = i;
} }
auto it = wire_by_name.find(name); auto it = parent_->wire_by_name.find(name);
if (it != wire_by_name.end()) if (it != parent_->wire_by_name.end())
ret.index = it->second; ret.index = it->second;
return ret; return ret;
@ -788,35 +788,35 @@ WireId ArchRProxyMethods::getWireByName(IdString name) const
bool ArchRProxyMethods::checkWireAvail(WireId wire) const bool ArchRProxyMethods::checkWireAvail(WireId wire) const
{ {
NPNR_ASSERT(wire != WireId()); NPNR_ASSERT(wire != WireId());
return wire_to_net[wire.index] == IdString(); return parent_->wire_to_net[wire.index] == IdString();
} }
IdString ArchRProxyMethods::getBoundWireNet(WireId wire) const IdString ArchRProxyMethods::getBoundWireNet(WireId wire) const
{ {
NPNR_ASSERT(wire != WireId()); NPNR_ASSERT(wire != WireId());
return wire_to_net[wire.index]; return parent_->wire_to_net[wire.index];
} }
IdString ArchRProxyMethods::getConflictingWireNet(WireId wire) const IdString ArchRProxyMethods::getConflictingWireNet(WireId wire) const
{ {
NPNR_ASSERT(wire != WireId()); NPNR_ASSERT(wire != WireId());
return wire_to_net[wire.index]; return parent_->wire_to_net[wire.index];
} }
PipId ArchRProxyMethods::getPipByName(IdString name) const PipId ArchRProxyMethods::getPipByName(IdString name) const
{ {
PipId ret; PipId ret;
if (pip_by_name.empty()) { if (parent_->pip_by_name.empty()) {
for (int i = 0; i < chip_info->num_pips; i++) { for (int i = 0; i < parent_->chip_info->num_pips; i++) {
PipId pip; PipId pip;
pip.index = i; pip.index = i;
pip_by_name[parent_->getPipName(pip)] = i; parent_->pip_by_name[parent_->getPipName(pip)] = i;
} }
} }
auto it = pip_by_name.find(name); auto it = parent_->pip_by_name.find(name);
if (it != pip_by_name.end()) if (it != parent_->pip_by_name.end())
ret.index = it->second; ret.index = it->second;
return ret; return ret;
@ -825,32 +825,32 @@ PipId ArchRProxyMethods::getPipByName(IdString name) const
bool ArchRProxyMethods::checkPipAvail(PipId pip) const bool ArchRProxyMethods::checkPipAvail(PipId pip) const
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
return switches_locked[chip_info->pip_data[pip.index].switch_index] == IdString(); return parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] == IdString();
} }
IdString ArchRProxyMethods::getBoundPipNet(PipId pip) const IdString ArchRProxyMethods::getBoundPipNet(PipId pip) const
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
return pip_to_net[pip.index]; return parent_->pip_to_net[pip.index];
} }
IdString ArchRProxyMethods::getConflictingPipNet(PipId pip) const IdString ArchRProxyMethods::getConflictingPipNet(PipId pip) const
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
return switches_locked[chip_info->pip_data[pip.index].switch_index]; return parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index];
} }
BelId ArchRProxyMethods::getBelByName(IdString name) const BelId ArchRProxyMethods::getBelByName(IdString name) const
{ {
BelId ret; BelId ret;
if (bel_by_name.empty()) { if (parent_->bel_by_name.empty()) {
for (int i = 0; i < chip_info->num_bels; i++) for (int i = 0; i < parent_->chip_info->num_bels; i++)
bel_by_name[parent_->id(chip_info->bel_data[i].name.get())] = i; parent_->bel_by_name[parent_->id(parent_->chip_info->bel_data[i].name.get())] = i;
} }
auto it = bel_by_name.find(name); auto it = parent_->bel_by_name.find(name);
if (it != bel_by_name.end()) if (it != parent_->bel_by_name.end())
ret.index = it->second; ret.index = it->second;
return ret; return ret;
@ -861,8 +861,8 @@ BelId ArchRProxyMethods::getBelByName(IdString name) const
void ArchRWProxyMethods::bindBel(BelId bel, IdString cell, PlaceStrength strength) void ArchRWProxyMethods::bindBel(BelId bel, IdString cell, PlaceStrength strength)
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
NPNR_ASSERT(bel_to_cell[bel.index] == IdString()); NPNR_ASSERT(parent_->bel_to_cell[bel.index] == IdString());
bel_to_cell[bel.index] = cell; parent_->bel_to_cell[bel.index] = cell;
parent_->cells[cell]->bel = bel; parent_->cells[cell]->bel = bel;
parent_->cells[cell]->belStrength = strength; parent_->cells[cell]->belStrength = strength;
parent_->refreshUiBel(bel); parent_->refreshUiBel(bel);
@ -871,19 +871,19 @@ void ArchRWProxyMethods::bindBel(BelId bel, IdString cell, PlaceStrength strengt
void ArchRWProxyMethods::unbindBel(BelId bel) void ArchRWProxyMethods::unbindBel(BelId bel)
{ {
NPNR_ASSERT(bel != BelId()); NPNR_ASSERT(bel != BelId());
NPNR_ASSERT(bel_to_cell[bel.index] != IdString()); NPNR_ASSERT(parent_->bel_to_cell[bel.index] != IdString());
parent_->cells[bel_to_cell[bel.index]]->bel = BelId(); parent_->cells[parent_->bel_to_cell[bel.index]]->bel = BelId();
parent_->cells[bel_to_cell[bel.index]]->belStrength = STRENGTH_NONE; parent_->cells[parent_->bel_to_cell[bel.index]]->belStrength = STRENGTH_NONE;
bel_to_cell[bel.index] = IdString(); parent_->bel_to_cell[bel.index] = IdString();
parent_->refreshUiBel(bel); parent_->refreshUiBel(bel);
} }
void ArchRWProxyMethods::bindWire(WireId wire, IdString net, PlaceStrength strength) void ArchRWProxyMethods::bindWire(WireId wire, IdString net, PlaceStrength strength)
{ {
NPNR_ASSERT(wire != WireId()); NPNR_ASSERT(wire != WireId());
NPNR_ASSERT(wire_to_net[wire.index] == IdString()); NPNR_ASSERT(parent_->wire_to_net[wire.index] == IdString());
wire_to_net[wire.index] = net; parent_->wire_to_net[wire.index] = net;
parent_->nets[net]->wires[wire].pip = PipId(); parent_->nets[net]->wires[wire].pip = PipId();
parent_->nets[net]->wires[wire].strength = strength; parent_->nets[net]->wires[wire].strength = strength;
parent_->refreshUiWire(wire); parent_->refreshUiWire(wire);
@ -892,37 +892,37 @@ void ArchRWProxyMethods::bindWire(WireId wire, IdString net, PlaceStrength stren
void ArchRWProxyMethods::unbindWire(WireId wire) void ArchRWProxyMethods::unbindWire(WireId wire)
{ {
NPNR_ASSERT(wire != WireId()); NPNR_ASSERT(wire != WireId());
NPNR_ASSERT(wire_to_net[wire.index] != IdString()); NPNR_ASSERT(parent_->wire_to_net[wire.index] != IdString());
auto &net_wires = parent_->nets[wire_to_net[wire.index]]->wires; auto &net_wires = parent_->nets[parent_->wire_to_net[wire.index]]->wires;
auto it = net_wires.find(wire); auto it = net_wires.find(wire);
NPNR_ASSERT(it != net_wires.end()); NPNR_ASSERT(it != net_wires.end());
auto pip = it->second.pip; auto pip = it->second.pip;
if (pip != PipId()) { if (pip != PipId()) {
pip_to_net[pip.index] = IdString(); parent_->pip_to_net[pip.index] = IdString();
switches_locked[chip_info->pip_data[pip.index].switch_index] = IdString(); parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] = IdString();
parent_->refreshUiPip(pip); parent_->refreshUiPip(pip);
} }
net_wires.erase(it); net_wires.erase(it);
wire_to_net[wire.index] = IdString(); parent_->wire_to_net[wire.index] = IdString();
parent_->refreshUiWire(wire); parent_->refreshUiWire(wire);
} }
void ArchRWProxyMethods::bindPip(PipId pip, IdString net, PlaceStrength strength) void ArchRWProxyMethods::bindPip(PipId pip, IdString net, PlaceStrength strength)
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
NPNR_ASSERT(pip_to_net[pip.index] == IdString()); NPNR_ASSERT(parent_->pip_to_net[pip.index] == IdString());
NPNR_ASSERT(switches_locked[chip_info->pip_data[pip.index].switch_index] == IdString()); NPNR_ASSERT(parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] == IdString());
pip_to_net[pip.index] = net; parent_->pip_to_net[pip.index] = net;
switches_locked[chip_info->pip_data[pip.index].switch_index] = net; parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] = net;
WireId dst; WireId dst;
dst.index = chip_info->pip_data[pip.index].dst; dst.index = parent_->chip_info->pip_data[pip.index].dst;
NPNR_ASSERT(wire_to_net[dst.index] == IdString()); NPNR_ASSERT(parent_->wire_to_net[dst.index] == IdString());
wire_to_net[dst.index] = net; parent_->wire_to_net[dst.index] = net;
parent_->nets[net]->wires[dst].pip = pip; parent_->nets[net]->wires[dst].pip = pip;
parent_->nets[net]->wires[dst].strength = strength; parent_->nets[net]->wires[dst].strength = strength;
@ -933,17 +933,17 @@ void ArchRWProxyMethods::bindPip(PipId pip, IdString net, PlaceStrength strength
void ArchRWProxyMethods::unbindPip(PipId pip) void ArchRWProxyMethods::unbindPip(PipId pip)
{ {
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
NPNR_ASSERT(pip_to_net[pip.index] != IdString()); NPNR_ASSERT(parent_->pip_to_net[pip.index] != IdString());
NPNR_ASSERT(switches_locked[chip_info->pip_data[pip.index].switch_index] != IdString()); NPNR_ASSERT(parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] != IdString());
WireId dst; WireId dst;
dst.index = chip_info->pip_data[pip.index].dst; dst.index = parent_->chip_info->pip_data[pip.index].dst;
NPNR_ASSERT(wire_to_net[dst.index] != IdString()); NPNR_ASSERT(parent_->wire_to_net[dst.index] != IdString());
wire_to_net[dst.index] = IdString(); parent_->wire_to_net[dst.index] = IdString();
parent_->nets[pip_to_net[pip.index]]->wires.erase(dst); parent_->nets[parent_->pip_to_net[pip.index]]->wires.erase(dst);
pip_to_net[pip.index] = IdString(); parent_->pip_to_net[pip.index] = IdString();
switches_locked[chip_info->pip_data[pip.index].switch_index] = IdString(); parent_->switches_locked[parent_->chip_info->pip_data[pip.index].switch_index] = IdString();
parent_->refreshUiPip(pip); parent_->refreshUiPip(pip);
parent_->refreshUiWire(dst); parent_->refreshUiWire(dst);

41
ice40/arch.h
View File

@ -640,24 +640,10 @@ class ArchRProxyMethods {
friend class ArchRWProxy; friend class ArchRWProxy;
private: private:
const Arch *parent_; const Arch *parent_;
ArchRProxyMethods(const Arch *parent) : parent_(parent), chip_info(parent->chip_info), ArchRProxyMethods(const Arch *parent) : parent_(parent) {}
bel_to_cell(parent->bel_to_cell), wire_to_net(parent->wire_to_net), ArchRProxyMethods(ArchRProxyMethods &&other) noexcept : parent_(other.parent_) {}
pip_to_net(parent->pip_to_net), switches_locked(parent->switches_locked), ArchRProxyMethods(const ArchRProxyMethods &other) : parent_(other.parent_) {}
bel_by_name(parent->bel_by_name), wire_by_name(parent->wire_by_name),
pip_by_name(parent->pip_by_name) {}
ArchRProxyMethods(ArchRProxyMethods &&other) noexcept : ArchRProxyMethods(other.parent_) {}
ArchRProxyMethods(const ArchRProxyMethods &other) : ArchRProxyMethods(other.parent_) {}
// Let methods access hot members directly without having to go through
// parent_.
const ChipInfoPOD *chip_info;
const std::vector<IdString> &bel_to_cell;
const std::vector<IdString> &wire_to_net;
const std::vector<IdString> &pip_to_net;
const std::vector<IdString> &switches_locked;
std::unordered_map<IdString, int> &bel_by_name;
std::unordered_map<IdString, int> &wire_by_name;
std::unordered_map<IdString, int> &pip_by_name;
public: public:
~ArchRProxyMethods() noexcept { } ~ArchRProxyMethods() noexcept { }
@ -723,22 +709,9 @@ class ArchRWProxyMethods {
friend class ArchRWProxy; friend class ArchRWProxy;
private: private:
Arch *parent_; Arch *parent_;
ArchRWProxyMethods(Arch *parent) : parent_(parent), chip_info(parent->chip_info), ArchRWProxyMethods(Arch *parent) : parent_(parent) {}
bel_to_cell(parent->bel_to_cell), wire_to_net(parent->wire_to_net), ArchRWProxyMethods(ArchRWProxyMethods &&other) : parent_(other.parent_) {}
pip_to_net(parent->pip_to_net), switches_locked(parent->switches_locked), ArchRWProxyMethods(const ArchRWProxyMethods &other) : parent_(other.parent_) {}
bel_by_name(parent->bel_by_name), wire_by_name(parent->wire_by_name),
pip_by_name(parent->pip_by_name) {}
ArchRWProxyMethods(ArchRWProxyMethods &&other) : ArchRWProxyMethods(other.parent_) {}
ArchRWProxyMethods(const ArchRWProxyMethods &other) : ArchRWProxyMethods(other.parent_) {}
const ChipInfoPOD *chip_info;
std::vector<IdString> &bel_to_cell;
std::vector<IdString> &wire_to_net;
std::vector<IdString> &pip_to_net;
std::vector<IdString> &switches_locked;
std::unordered_map<IdString, int> &bel_by_name;
std::unordered_map<IdString, int> &wire_by_name;
std::unordered_map<IdString, int> &pip_by_name;
public: public:
~ArchRWProxyMethods() {} ~ArchRWProxyMethods() {}
@ -773,6 +746,8 @@ public:
lock_->unlock(); lock_->unlock();
} }
} }
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END