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

Merge pull request #886 from Ravenslofty/mistral-m10k

Browse Source 
mistral: M10K support
This commit is contained in:
gatecat 2022-03-09 18:03:59 +00:00 committed by GitHub
commit 1911a9523c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 233 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mistral/arch.cc
View File

@ -122,6 +122,9 @@ Arch::Arch(ArchArgs args)
CycloneV::pos2y(hps_pos[CycloneV::I_HPS_MPU_GENERAL_PURPOSE]));
}
for (auto m10k_pos : cyclonev->m10k_get_pos())
create_m10k(CycloneV::pos2x(m10k_pos), CycloneV::pos2y(m10k_pos));
// This import takes about 5s, perhaps long term we can speed it up, e.g. defer to Mistral more...
log_info("Initialising routing graph...\n");
int pip_count = 0;
@ -407,6 +410,8 @@ void Arch::add_bel_pin(BelId bel, IdString pin, PortType dir, WireId wire)
void Arch::assign_default_pinmap(CellInfo *cell)
{
if (cell->type == id_MISTRAL_M10K)
return; // M10Ks always have a custom pinmap
for (auto &port : cell->ports) {
auto &pinmap = cell->pin_data[port.first].bel_pins;
if (!pinmap.empty())

1
mistral/arch.h
View File

@ -467,6 +467,7 @@ struct Arch : BaseArch<ArchRanges>
bool has_port(CycloneV::block_type_t bt, int x, int y, int bi, CycloneV::port_type_t port, int pi = -1) const;
void create_lab(int x, int y, bool is_mlab); // lab.cc
void create_m10k(int x, int y); // m10k.cc
void create_gpio(int x, int y); // io.cc
void create_clkbuf(int x, int y); // globals.cc
void create_control(int x, int y); // globals.cc

42
mistral/bitstream.cc
View File

@ -118,6 +118,46 @@ struct MistralBitgen
cv->bmux_m_set(CycloneV::CMUXHG, pos, CycloneV::TESTSYN_ENOUT_SELECT, bi, CycloneV::PRE_SYNENB);
}
void write_m10k_cell(CellInfo *ci, int x, int y, int bi)
{
auto pos = CycloneV::xy2pos(x, y);
// Notes:
// DATA_FLOW_THRU is probably transparent reads.
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::A_DATA_FLOW_THRU, bi, 1);
cv->bmux_n_set(CycloneV::M10K, pos, CycloneV::A_DATA_WIDTH, bi, ci->params.at(id_CFG_DBITS).as_int64());
cv->bmux_m_set(CycloneV::M10K, pos, CycloneV::A_FAST_WRITE, bi, CycloneV::FAST);
cv->bmux_m_set(CycloneV::M10K, pos, CycloneV::A_OUTPUT_SEL, bi, CycloneV::ASYNC);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::A_SA_WREN_DELAY, bi, 1);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::A_SAEN_DELAY, bi, 2);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::A_WL_DELAY, bi, 2);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::A_WR_TIMER_PULSE, bi, 0x0b);
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::B_DATA_FLOW_THRU, bi, 1);
cv->bmux_n_set(CycloneV::M10K, pos, CycloneV::B_DATA_WIDTH, bi, ci->params.at(id_CFG_DBITS).as_int64());
cv->bmux_m_set(CycloneV::M10K, pos, CycloneV::B_FAST_WRITE, bi, CycloneV::FAST);
cv->bmux_m_set(CycloneV::M10K, pos, CycloneV::B_OUTPUT_SEL, bi, CycloneV::ASYNC);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::B_SA_WREN_DELAY, bi, 1);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::B_SAEN_DELAY, bi, 2);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::B_WL_DELAY, bi, 2);
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::B_WR_TIMER_PULSE, bi, 0x0b);
cv->bmux_n_set(CycloneV::M10K, pos, CycloneV::TOP_CLK_SEL, bi, 1);
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::TOP_W_INV, bi, 1);
cv->bmux_n_set(CycloneV::M10K, pos, CycloneV::TOP_W_SEL, bi, 1);
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::BOT_CLK_INV, bi, 1);
cv->bmux_n_set(CycloneV::M10K, pos, CycloneV::BOT_W_SEL, bi, 1);
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::TRUE_DUAL_PORT, bi, 0);
cv->bmux_b_set(CycloneV::M10K, pos, CycloneV::DISABLE_UNUSED, bi, 0);
// Note for future us: the RAM init contents are inverted.
for (int bi = 0; bi < 256; bi++)
cv->bmux_r_set(CycloneV::M10K, pos, CycloneV::RAM, bi, 0xffffffffff);
}
void write_cells()
{
for (auto &cell : ctx->cells) {
@ -128,6 +168,8 @@ struct MistralBitgen
write_io_cell(ci, loc.x, loc.y, bi);
else if (ctx->is_clkbuf_cell(ci->type))
write_clkbuf_cell(ci, loc.x, loc.y, bi);
else if (ci->type == id_MISTRAL_M10K)
write_m10k_cell(ci, loc.x, loc.y, bi);
}
}

7
mistral/constids.inc
View File

@ -90,6 +90,7 @@ X(WE)
X(MISTRAL_MLAB)
X(CLK1)
X(A1EN)
X(B1EN)
X(A1DATA)
X(B1DATA)
X(WCLK_INV)
@ -98,6 +99,12 @@ X(WE_INV)
X(cyclonev_oscillator)
X(cyclonev_hps_interface_mpu_general_purpose)
X(MISTRAL_M10K)
X(ADDRSTALLA)
X(ADDRSTALLB)
X(CFG_ABITS)
X(CFG_DBITS)
X(clkout)
X(clkout1)
X(compress_rbf)

36
mistral/delay.cc
View File

@ -57,6 +57,17 @@ TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, in
} else if (port.in(id_B1DATA)) {
return TMG_COMB_OUTPUT;
}
} else if (cell->type == id_MISTRAL_M10K) {
if (port == id_CLK1) {
return TMG_CLOCK_INPUT;
} else if (port.in(id_A1DATA, id_A1EN, id_B1EN) || port.str(this).find("A1ADDR") == 0) {
clockInfoCount = 1;
return TMG_REGISTER_INPUT;
} else if (port.str(this).find("B1ADDR") == 0) {
return TMG_REGISTER_INPUT;
} else if (port.in(id_B1DATA)) {
return TMG_REGISTER_OUTPUT;
}
}
return TMG_IGNORE;
}
@ -87,6 +98,31 @@ TimingClockingInfo Arch::getPortClockingInfo(const CellInfo *cell, IdString port
timing.clockToQ = DelayQuad{};
}
return timing;
} else if (cell->type == id_MISTRAL_M10K) {
timing.clock_port = id_CLK1;
timing.edge = RISING_EDGE;
if (port.str(this).find("A1ADDR") == 0 || port.str(this).find("B1ADDR") == 0) {
timing.setup = DelayPair{125, 125};
timing.hold = DelayPair{42, 42};
timing.clockToQ = DelayQuad{};
} else if (port == id_A1DATA) {
timing.setup = DelayPair{97, 97};
timing.hold = DelayPair{42, 42};
timing.clockToQ = DelayQuad{};
} else if (port == id_A1EN) {
timing.setup = DelayPair{140, 140};
timing.hold = DelayPair{42, 42};
timing.clockToQ = DelayQuad{};
} else if (port == id_B1EN) {
timing.setup = DelayPair{161, 161};
timing.hold = DelayPair{42, 42};
timing.clockToQ = DelayQuad{};
} else if (port == id_B1DATA) {
timing.setup = DelayPair{};
timing.hold = DelayPair{};
timing.clockToQ = DelayQuad{1004};
}
return timing;
}
NPNR_ASSERT_FALSE("unreachable");
}

61
mistral/m10k.cc Normal file
View File

@ -0,0 +1,61 @@
/*
* nextpnr -- Next Generation Place and Route
*
* Copyright (C) 2021 Lofty <dan.ravensloft@gmail.com>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "nextpnr.h"
#include "util.h"
NEXTPNR_NAMESPACE_BEGIN
void Arch::create_m10k(int x, int y)
{
BelId bel = add_bel(x, y, id_MISTRAL_M10K, id_MISTRAL_M10K);
add_bel_pin(bel, id_ADDRSTALLA, PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::ADDRSTALLA, 0));
add_bel_pin(bel, id_ADDRSTALLB, PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::ADDRSTALLB, 0));
for (int z = 0; z < 2; z++) {
add_bel_pin(bel, id(stringf("BYTEENABLEA[%d]", z)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::BYTEENABLEA, z));
add_bel_pin(bel, id(stringf("BYTEENABLEB[%d]", z)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::BYTEENABLEB, z));
add_bel_pin(bel, id(stringf("ACLR[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::ACLR, z));
add_bel_pin(bel, id(stringf("RDEN[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::RDEN, z));
add_bel_pin(bel, id(stringf("WREN[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::WREN, z));
add_bel_pin(bel, id(stringf("CLKIN[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::CLKIN, z));
add_bel_pin(bel, id(stringf("CLKIN[%d]", z + 6)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::CLKIN, z + 6));
}
for (int z = 0; z < 4; z++) {
add_bel_pin(bel, id(stringf("ENABLE[%d]", z)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::ENABLE, z));
}
for (int z = 0; z < 12; z++) {
add_bel_pin(bel, id(stringf("ADDRA[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::ADDRA, z));
add_bel_pin(bel, id(stringf("ADDRB[%d]", z)), PORT_IN, get_port(CycloneV::M10K, x, y, -1, CycloneV::ADDRB, z));
}
for (int z = 0; z < 20; z++) {
add_bel_pin(bel, id(stringf("DATAAIN[%d]", z)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::DATAAIN, z));
add_bel_pin(bel, id(stringf("DATABIN[%d]", z)), PORT_IN,
get_port(CycloneV::M10K, x, y, -1, CycloneV::DATABIN, z));
add_bel_pin(bel, id(stringf("DATAAOUT[%d]", z)), PORT_OUT,
get_port(CycloneV::M10K, x, y, -1, CycloneV::DATAAOUT, z));
add_bel_pin(bel, id(stringf("DATABOUT[%d]", z)), PORT_OUT,
get_port(CycloneV::M10K, x, y, -1, CycloneV::DATABOUT, z));
}
}
NEXTPNR_NAMESPACE_END

81
mistral/pack.cc
View File

@ -382,6 +382,86 @@ struct MistralPacker
}
}
void setup_m10ks()
{
for (auto &cell : ctx->cells) {
CellInfo *ci = cell.second.get();
if (ci->type != id_MISTRAL_M10K)
continue;
auto abits = ci->params.at(id_CFG_ABITS).as_int64();
auto dbits = ci->params.at(id_CFG_DBITS).as_int64();
NPNR_ASSERT(abits >= 7 && abits <= 13);
NPNR_ASSERT(dbits == 1 || dbits == 2 || dbits == 5 || dbits == 10 || dbits == 20);
// Quartus doesn't seem to generate ADDRSTALL[AB], BYTEENABLE[AB][01].
// It *does* generate ACLR[01] but leaves them unconnected if unused.
// Enables.
// RDEN[1] and WREN[0] are left unconnected.
ci->pin_data[ctx->id("A1EN")].bel_pins = {ctx->id("WREN[1]")};
ci->pin_data[ctx->id("B1EN")].bel_pins = {ctx->id("RDEN[0]")};
// Clocks.
ci->pin_data[ctx->id("CLK1")].bel_pins = {ctx->id("CLKIN[0]")};
// Enables left unconnected.
// Address lines.
int addr_offset = std::max(12 - std::max(abits, int64_t{9}), 0l);
int bit_offset = 0;
if (abits == 13) {
ci->pin_data[ctx->id("A1ADDR[0]")].bel_pins = {ctx->id("DATAAIN[4]")};
ci->pin_data[ctx->id("B1ADDR[0]")].bel_pins = {ctx->id("DATABIN[19]")};
bit_offset = 1;
}
for (int bit = bit_offset; bit < abits; bit++) {
ci->pin_data[ctx->id(stringf("A1ADDR[%d]", bit))].bel_pins = {
ctx->id(stringf("ADDRA[%d]", bit + addr_offset))};
ci->pin_data[ctx->id(stringf("B1ADDR[%d]", bit))].bel_pins = {
ctx->id(stringf("ADDRB[%d]", bit + addr_offset))};
}
// Data lines
std::vector<int> offsets;
offsets.push_back(0);
if (abits >= 10 && dbits <= 10) {
offsets.push_back(10);
}
if (abits >= 11 && dbits <= 5) {
offsets.push_back(5);
offsets.push_back(15);
}
if (abits >= 12 && dbits <= 2) {
offsets.push_back(2);
offsets.push_back(7);
offsets.push_back(12);
offsets.push_back(17);
}
if (abits == 13 && dbits == 1) {
offsets.push_back(1);
offsets.push_back(3);
offsets.push_back(6);
offsets.push_back(8);
offsets.push_back(11);
offsets.push_back(13);
offsets.push_back(16);
offsets.push_back(18);
}
for (int bit = 0; bit < dbits; bit++) {
for (int offset : offsets) {
ci->pin_data[ctx->id(stringf("A1DATA[%d]", bit))].bel_pins.push_back(
ctx->id(stringf("DATAAIN[%d]", bit + offset)));
}
}
for (int bit = 0; bit < dbits; bit++) {
ci->pin_data[ctx->id(stringf("B1DATA[%d]", bit))].bel_pins = {ctx->id(stringf("DATABOUT[%d]", bit))};
}
}
}
void run()
{
init_constant_nets();
@ -389,6 +469,7 @@ struct MistralPacker
pack_io();
constrain_carries();
constrain_lutram();
setup_m10ks();
}
};
}; // namespace