mirror of https://github.com/YosysHQ/yosys.git
macc_v2: Fix v2 omissions
This commit is contained in:
parent
aabb4ea1df
commit
6c76dcec3e
|
@ -554,8 +554,8 @@ struct TechmapWorker
|
||||||
|
|
||||||
if (extmapper_name == "maccmap") {
|
if (extmapper_name == "maccmap") {
|
||||||
log("Creating %s with maccmap.\n", log_id(extmapper_module));
|
log("Creating %s with maccmap.\n", log_id(extmapper_module));
|
||||||
if (extmapper_cell->type != ID($macc))
|
if (!extmapper_cell->type.in(ID($macc), ID($macc_v2)))
|
||||||
log_error("The maccmap mapper can only map $macc (not %s) cells!\n", log_id(extmapper_cell->type));
|
log_error("The maccmap mapper can only map $macc/$macc_v2 (not %s) cells!\n", log_id(extmapper_cell->type));
|
||||||
maccmap(extmapper_module, extmapper_cell);
|
maccmap(extmapper_module, extmapper_cell);
|
||||||
extmapper_module->remove(extmapper_cell);
|
extmapper_module->remove(extmapper_cell);
|
||||||
}
|
}
|
||||||
|
@ -600,8 +600,8 @@ struct TechmapWorker
|
||||||
}
|
}
|
||||||
|
|
||||||
if (extmapper_name == "maccmap") {
|
if (extmapper_name == "maccmap") {
|
||||||
if (cell->type != ID($macc))
|
if (!cell->type.in(ID($macc), ID($macc_v2)))
|
||||||
log_error("The maccmap mapper can only map $macc (not %s) cells!\n", log_id(cell->type));
|
log_error("The maccmap mapper can only map $macc/$macc_v2 (not %s) cells!\n", log_id(cell->type));
|
||||||
maccmap(module, cell);
|
maccmap(module, cell);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -290,7 +290,7 @@ module _90_alu (A, B, CI, BI, X, Y, CO);
|
||||||
endmodule
|
endmodule
|
||||||
|
|
||||||
(* techmap_maccmap *)
|
(* techmap_maccmap *)
|
||||||
(* techmap_celltype = "$macc" *)
|
(* techmap_celltype = "$macc $macc_v2" *)
|
||||||
module _90_macc;
|
module _90_macc;
|
||||||
endmodule
|
endmodule
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue