diff options
Diffstat (limited to 'machxo2')
| -rw-r--r-- | machxo2/arch.cc | 9 | ||||
| -rw-r--r-- | machxo2/bitstream.cc | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/machxo2/arch.cc b/machxo2/arch.cc index f2c87888..022fb8ff 100644 --- a/machxo2/arch.cc +++ b/machxo2/arch.cc @@ -315,9 +315,9 @@ IdStringList Arch::getPipName(PipId pip) const { auto &pip_data = tile_info(pip)->pip_data[pip.index]; WireId src = getPipSrcWire(pip), dst = getPipDstWire(pip); - std::string pip_name = stringf("%d_%d_%s->%d_%d_%s", pip_data.src.x, pip_data.src.y, - get_wire_basename(src).c_str(this), pip_data.dst.x, pip_data.dst.y, - get_wire_basename(dst).c_str(this)); + std::string pip_name = + stringf("%d_%d_%s->%d_%d_%s", pip_data.src.x, pip_data.src.y, get_wire_basename(src).c_str(this), + pip_data.dst.x, pip_data.dst.y, get_wire_basename(dst).c_str(this)); std::array<IdString, 3> ids{x_ids.at(pip.location.x), y_ids.at(pip.location.y), id(pip_name)}; return IdStringList(ids); @@ -490,8 +490,7 @@ std::vector<std::pair<std::string, std::string>> Arch::get_tiles_at_loc(int row, std::vector<std::pair<std::string, std::string>> ret; auto &tileloc = chip_info->tile_info[row * chip_info->width + col]; for (auto &tn : tileloc.tile_names) { - ret.push_back(std::make_pair(tn.name.get(), - chip_info->tiletype_names[tn.type_idx].get())); + ret.push_back(std::make_pair(tn.name.get(), chip_info->tiletype_names[tn.type_idx].get())); } return ret; } diff --git a/machxo2/bitstream.cc b/machxo2/bitstream.cc index e6b1bb17..5b0e8664 100644 --- a/machxo2/bitstream.cc +++ b/machxo2/bitstream.cc @@ -176,12 +176,11 @@ static std::string get_pic_tile(Context *ctx, BelId bel) { static const std::set<std::string> pio_t = {"PIC_T0", "PIC_T0_256", "PIC_TS0"}; static const std::set<std::string> pio_b = {"PIC_B0", "PIC_B0_256", "PIC_BS0_256"}; - static const std::set<std::string> pio_l = {"PIC_L0", "PIC_L1", "PIC_L2", "PIC_L3", "PIC_LS0", - "PIC_L0_VREF3", "PIC_L0_VREF4", "PIC_L0_VREF5", - "PIC_L1_VREF3", "PIC_L1_VREF4", "PIC_L1_VREF5", - "PIC_L2_VREF4", "PIC_L2_VREF5", - "PIC_L3_VREF4", "PIC_L3_VREF5"}; - static const std::set<std::string> pio_r = {"PIC_R0", "PIC_R1", "PIC_RS0", + static const std::set<std::string> pio_l = {"PIC_L0", "PIC_L1", "PIC_L2", "PIC_L3", + "PIC_LS0", "PIC_L0_VREF3", "PIC_L0_VREF4", "PIC_L0_VREF5", + "PIC_L1_VREF3", "PIC_L1_VREF4", "PIC_L1_VREF5", "PIC_L2_VREF4", + "PIC_L2_VREF5", "PIC_L3_VREF4", "PIC_L3_VREF5"}; + static const std::set<std::string> pio_r = {"PIC_R0", "PIC_R1", "PIC_RS0", "PIC_R0_256", "PIC_R1_640", "PIC_RS0_256"}; std::string pio_name = ctx->tile_info(bel)->bel_data[bel.index].name.get(); |