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

Progress in Verific bindings

This commit is contained in:
Clifford Wolf 2014-03-15 22:51:12 +01:00
parent fc2c821407
commit 0ebee4c8e7
1 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
frontends/verific/verific.cc
View File

@ -278,19 +278,22 @@ static bool import_netlist_instance_cells(RTLIL::Module *module, std::map<Net*,
return true; return true;
} }
#if 0
// FIXME: tests/simple/sincos.v exposes a bug in this operator
if (inst->Type() == OPER_SHIFT_LEFT) { if (inst->Type() == OPER_SHIFT_LEFT) {
module->addShl(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED); module->addShl(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, false);
return true; return true;
} }
if (inst->Type() == OPER_SHIFT_RIGHT) { if (inst->Type() == OPER_SHIFT_RIGHT) {
module->addShr(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED); Net *net_cin = inst->GetCin();
Net *net_a_msb = inst->GetInput1Bit(0);
if (const_map.count(net_cin) && const_map.at(net_cin) == RTLIL::State::S0)
module->addShr(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, false);
else if (net_cin == net_a_msb)
module->addSshr(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, true);
else
log_error("Can't import Verific OPER_SHIFT_RIGHT instance %s: carry_in is neither 0 nor msb of left input\n", inst->Name());
return true; return true;
} }
#endif
if (inst->Type() == OPER_REDUCE_AND) { if (inst->Type() == OPER_REDUCE_AND) {
module->addReduceAnd(RTLIL::escape_id(inst->Name()), IN, net_map.at(inst->GetOutput()), SIGNED); module->addReduceAnd(RTLIL::escape_id(inst->Name()), IN, net_map.at(inst->GetOutput()), SIGNED);
@ -307,33 +310,21 @@ static bool import_netlist_instance_cells(RTLIL::Module *module, std::map<Net*,
return true; return true;
} }
if (inst->Type() == OPER_REDUCE_NAND) {
RTLIL::SigSpec tmp = module->new_wire(inst->OutputSize(), NEW_ID);
module->addReduceAnd(NEW_ID, IN, tmp, SIGNED);
module->addNot(RTLIL::escape_id(inst->Name()), tmp, net_map.at(inst->GetOutput()));
return true;
}
if (inst->Type() == OPER_REDUCE_NOR) {
RTLIL::SigSpec tmp = module->new_wire(inst->OutputSize(), NEW_ID);
module->addReduceOr(NEW_ID, IN, tmp, SIGNED);
module->addNot(RTLIL::escape_id(inst->Name()), tmp, net_map.at(inst->GetOutput()));
return true;
}
if (inst->Type() == OPER_REDUCE_XNOR) { if (inst->Type() == OPER_REDUCE_XNOR) {
module->addReduceXnor(RTLIL::escape_id(inst->Name()), IN, net_map.at(inst->GetOutput()), SIGNED); module->addReduceXnor(RTLIL::escape_id(inst->Name()), IN, net_map.at(inst->GetOutput()), SIGNED);
return true; return true;
} }
#if 0
// FIXME: tests/simple/sincos.v exposes a bug in this operator
if (inst->Type() == OPER_LESSTHAN) { if (inst->Type() == OPER_LESSTHAN) {
module->addLt(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED); Net *net_cin = inst->GetCin();
if (const_map.count(net_cin) && const_map.at(net_cin) == RTLIL::State::S0)
module->addLt(RTLIL::escape_id(inst->Name()), IN1, IN2, net_map.at(inst->GetOutput()), SIGNED);
else if (const_map.count(net_cin) && const_map.at(net_cin) == RTLIL::State::S1)
module->addLe(RTLIL::escape_id(inst->Name()), IN1, IN2, net_map.at(inst->GetOutput()), SIGNED);
else
log_error("Can't import Verific OPER_LESSTHAN instance %s: carry_in is neither 0 nor 1\n", inst->Name());
return true; return true;
} }
#endif
if (inst->Type() == OPER_WIDE_AND) { if (inst->Type() == OPER_WIDE_AND) {
module->addAnd(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED); module->addAnd(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED);
@ -350,20 +341,6 @@ static bool import_netlist_instance_cells(RTLIL::Module *module, std::map<Net*,
return true; return true;
} }
if (inst->Type() == OPER_WIDE_NAND) {
RTLIL::SigSpec tmp1 = module->new_wire(inst->OutputSize(), NEW_ID);
module->addAnd(NEW_ID, IN1, IN2, tmp1, SIGNED);
module->addNot(RTLIL::escape_id(inst->Name()), tmp1, OUT, SIGNED);
return true;
}
if (inst->Type() == OPER_WIDE_NOR) {
RTLIL::SigSpec tmp1 = module->new_wire(inst->OutputSize(), NEW_ID);
module->addOr(NEW_ID, IN1, IN2, tmp1, SIGNED);
module->addNot(RTLIL::escape_id(inst->Name()), tmp1, OUT, SIGNED);
return true;
}
if (inst->Type() == OPER_WIDE_XNOR) { if (inst->Type() == OPER_WIDE_XNOR) {
module->addXnor(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED); module->addXnor(RTLIL::escape_id(inst->Name()), IN1, IN2, OUT, SIGNED);
return true; return true;