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

macc_v2: Fix checks and parameter padding

This commit is contained in:
Martin Povišer 2025-01-27 13:08:19 +01:00
parent 3184b335da
commit aabb4ea1df
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/macc.h
View File

@ -228,6 +228,23 @@ struct Macc
} }
} }
if (a_signed.empty())
a_signed = {RTLIL::Sx};
if (b_signed.empty())
a_signed = {RTLIL::Sx};
if (c_signed.empty())
c_signed = {RTLIL::Sx};
if (a_widths.empty())
a_widths = {RTLIL::Sx};
if (b_widths.empty())
b_widths = {RTLIL::Sx};
if (c_widths.empty())
c_widths = {RTLIL::Sx};
if (product_negated.empty())
product_negated = {RTLIL::Sx};
if (addend_negated.empty())
addend_negated = {RTLIL::Sx};
cell->setParam(ID::NPRODUCTS, nproducts); cell->setParam(ID::NPRODUCTS, nproducts);
cell->setParam(ID::PRODUCT_NEGATED, product_negated); cell->setParam(ID::PRODUCT_NEGATED, product_negated);
cell->setParam(ID::NADDENDS, naddends); cell->setParam(ID::NADDENDS, naddends);

2
kernel/rtlil.cc
View File

@ -1470,7 +1470,7 @@ namespace {
if (cell->type == ID($macc_v2)) { if (cell->type == ID($macc_v2)) {
if (param(ID::NPRODUCTS) <= 0) if (param(ID::NPRODUCTS) <= 0)
error(__LINE__); error(__LINE__);
if (param(ID::NADDENDS) <= 0) if (param(ID::NADDENDS) < 0)
error(__LINE__); error(__LINE__);
param_bits(ID::PRODUCT_NEGATED, max(param(ID::NPRODUCTS), 1)); param_bits(ID::PRODUCT_NEGATED, max(param(ID::NPRODUCTS), 1));
param_bits(ID::ADDEND_NEGATED, max(param(ID::NADDENDS), 1)); param_bits(ID::ADDEND_NEGATED, max(param(ID::NADDENDS), 1));