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

Cleanup

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-06-07 13:49:19 +02:00
parent 54175f9187
commit 78e6631f76
8 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/nextpnr.cc
View File

@ -454,7 +454,7 @@ DecalXY BaseCtx::constructDecalXY(DecalId decal, float x, float y)
return dxy; return dxy;
} }
void BaseCtx::commonInfoToAttributes() void BaseCtx::archInfoToAttributes()
{ {
for (auto &cell : cells) { for (auto &cell : cells) {
auto ci = cell.second.get(); auto ci = cell.second.get();
@ -498,7 +498,7 @@ void BaseCtx::commonInfoToAttributes()
} }
} }
void BaseCtx::attributesToCommonInfo() void BaseCtx::attributesToArchInfo()
{ {
for (auto &cell : cells) { for (auto &cell : cells) {
auto ci = cell.second.get(); auto ci = cell.second.get();
@ -544,6 +544,7 @@ void BaseCtx::attributesToCommonInfo()
} }
} }
} }
getCtx()->assignArchInfo();
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

4
common/nextpnr.h
View File

@ -682,8 +682,8 @@ struct BaseCtx
// Workaround for lack of wrappable constructors // Workaround for lack of wrappable constructors
DecalXY constructDecalXY(DecalId decal, float x, float y); DecalXY constructDecalXY(DecalId decal, float x, float y);
void commonInfoToAttributes(); void archInfoToAttributes();
void attributesToCommonInfo(); void attributesToArchInfo();
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

11
ecp5/arch.cc
View File

@ -989,17 +989,6 @@ WireId Arch::getBankECLK(int bank, int eclk)
return getWireByLocAndBasename(Location(0, 0), "G_BANK" + std::to_string(bank) + "ECLK" + std::to_string(eclk)); return getWireByLocAndBasename(Location(0, 0), "G_BANK" + std::to_string(bank) + "ECLK" + std::to_string(eclk));
} }
void Arch::archInfoToAttributes()
{
commonInfoToAttributes();
}
void Arch::attributesToArchInfo()
{
attributesToCommonInfo();
assignArchInfo();
}
#ifdef WITH_HEAP #ifdef WITH_HEAP
const std::string Arch::defaultPlacer = "heap"; const std::string Arch::defaultPlacer = "heap";
#else #else

2
ecp5/arch.h
View File

@ -994,8 +994,6 @@ struct Arch : BaseCtx
bool slicesCompatible(const std::vector<const CellInfo *> &cells) const; bool slicesCompatible(const std::vector<const CellInfo *> &cells) const;
void assignArchInfo(); void assignArchInfo();
void archInfoToAttributes();
void attributesToArchInfo();
void permute_luts(); void permute_luts();

11
generic/arch.cc
View File

@ -604,17 +604,6 @@ void Arch::assignArchInfo()
} }
} }
void Arch::archInfoToAttributes()
{
commonInfoToAttributes();
}
void Arch::attributesToArchInfo()
{
attributesToCommonInfo();
assignArchInfo();
}
bool Arch::cellsCompatible(const CellInfo **cells, int count) const bool Arch::cellsCompatible(const CellInfo **cells, int count) const
{ {
const NetInfo *clk = nullptr; const NetInfo *clk = nullptr;

2
generic/arch.h
View File

@ -288,8 +288,6 @@ struct Arch : BaseCtx
// Internal usage // Internal usage
void assignArchInfo(); void assignArchInfo();
bool cellsCompatible(const CellInfo **cells, int count) const; bool cellsCompatible(const CellInfo **cells, int count) const;
void archInfoToAttributes();
void attributesToArchInfo();
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

11
ice40/arch.cc
View File

@ -1234,17 +1234,6 @@ void Arch::assignCellInfo(CellInfo *cell)
} }
} }
void Arch::archInfoToAttributes()
{
commonInfoToAttributes();
}
void Arch::attributesToArchInfo()
{
attributesToCommonInfo();
assignArchInfo();
}
const std::string Arch::defaultPlacer = "sa"; const std::string Arch::defaultPlacer = "sa";
const std::vector<std::string> Arch::availablePlacers = {"sa", const std::vector<std::string> Arch::availablePlacers = {"sa",

2
ice40/arch.h
View File

@ -878,8 +878,6 @@ struct Arch : BaseCtx
// netlist modifications, and validity checks // netlist modifications, and validity checks
void assignArchInfo(); void assignArchInfo();
void assignCellInfo(CellInfo *cell); void assignCellInfo(CellInfo *cell);
void archInfoToAttributes();
void attributesToArchInfo();
// ------------------------------------------------- // -------------------------------------------------
BelPin getIOBSharingPLLPin(BelId pll, IdString pll_pin) const BelPin getIOBSharingPLLPin(BelId pll, IdString pll_pin) const