riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sensitive to direct inst of $__ICE40_CARRY_WRAPPER; recreate SB_LUT4

This commit is contained in:
Eddie Hung 2019-12-09 12:45:22 -08:00
parent e05372778a
commit 500ed9b501
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passes/pmgen/ice40_wrapcarry.cc
View File

@ -111,20 +111,24 @@ struct Ice40WrapCarryPass : public Pass {
auto carry = module->addCell(NEW_ID, ID(SB_CARRY)); auto carry = module->addCell(NEW_ID, ID(SB_CARRY));
carry->setPort(ID(I0), cell->getPort(ID(A))); carry->setPort(ID(I0), cell->getPort(ID(A)));
carry->setPort(ID(I1), cell->getPort(ID(B))); carry->setPort(ID(I1), cell->getPort(ID(B)));
carry->setPort(ID(CI), cell->getPort(ID(CO))); carry->setPort(ID(CI), cell->getPort(ID(CI)));
carry->setPort(ID(CO), cell->getPort(ID(CO)));
module->swap_names(carry, cell); module->swap_names(carry, cell);
auto lut = module->addCell(cell->attributes.at(ID(SB_LUT4.name)).decode_string(), ID(SB_LUT4)); auto lut_name = cell->attributes.at(ID(SB_LUT4.name), Const(NEW_ID.str())).decode_string();
lut->setParam(ID(WIDTH), 4); auto lut = module->addCell(lut_name, ID(SB_LUT4));
lut->setParam(ID(LUT), cell->getParam(ID(LUT))); lut->setParam(ID(LUT_INIT), cell->getParam(ID(LUT)));
lut->setPort(ID(A), { cell->getPort(ID(I0)), cell->getPort(ID(A)), cell->getPort(ID(B)), cell->getPort(ID(I3)) }); lut->setPort(ID(I0), cell->getPort(ID(I0)));
lut->setPort(ID(Y), cell->getPort(ID(O))); lut->setPort(ID(I1), cell->getPort(ID(A)));
lut->setPort(ID(I2), cell->getPort(ID(B)));
lut->setPort(ID(I3), cell->getPort(ID(I3)));
lut->setPort(ID(O), cell->getPort(ID(O)));
for (const auto &a : cell->attributes) for (const auto &a : cell->attributes)
if (a.first.begins_with("\\SB_CARRY.\\")) if (a.first.begins_with("\\SB_CARRY.\\"))
carry->attributes[a.first.c_str() + strlen("\\SB_CARRY.")] = a.second; carry->attributes[a.first.c_str() + strlen("\\SB_CARRY.")] = a.second;
else if (a.first.begins_with("\\SB_LUT4.\\")) else if (a.first.begins_with("\\SB_LUT4.\\"))
lut->attributes[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second; lut->attributes[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second;
else if (a.first.in(ID(SB_LUT4.name), ID::keep)) else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID(module_not_derived), ID(src)))
continue; continue;
else else
log_abort(); log_abort();

2
techlibs/ice40/arith_map.v
View File

@ -50,7 +50,7 @@ module _80_ice40_alu (A, B, CI, BI, X, Y, CO);
// A[2]: 1111 0000 1111 0000 // A[2]: 1111 0000 1111 0000
// A[3]: 1111 1111 0000 0000 // A[3]: 1111 1111 0000 0000
.LUT(16'b 0110_1001_1001_0110) .LUT(16'b 0110_1001_1001_0110)
) fadd ( ) carry (
.A(AA[i]), .A(AA[i]),
.B(BB[i]), .B(BB[i]),
.CI(C[i]), .CI(C[i]),