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

Check for overflow, remove obsolete code, fix test

This commit is contained in:
Alain Dargelas 2024-12-18 20:47:03 -08:00
parent 24c012aa6d
commit cd9e45d1f5
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
passes/pmgen/peepopt_muldiv_c.pmg
View File

@ -55,6 +55,7 @@ code
int c_const_int = c_const.as_int(c_const_signed); int c_const_int = c_const.as_int(c_const_signed);
int b_const_int_shifted = b_const_int << offset; int b_const_int_shifted = b_const_int << offset;
// Integer values should be lesser than 64 bits
if (mul->getParam(ID::B_WIDTH).size() > 64) if (mul->getParam(ID::B_WIDTH).size() > 64)
reject; reject;
if (b_const.size() > 64) if (b_const.size() > 64)
@ -62,6 +63,11 @@ code
if (c_const.size() > 64) if (c_const.size() > 64)
reject; reject;
// Check for potential mult overflow
if (b_const.size() + a.size() > mul_y.size()) {
reject;
}
// Check that there are only zeros before offset // Check that there are only zeros before offset
if (offset < 0 || !div_a.extract(0, offset).is_fully_zero()) if (offset < 0 || !div_a.extract(0, offset).is_fully_zero())
reject; reject;
@ -70,13 +76,6 @@ code
if (b_const_int_shifted % c_const_int != 0) if (b_const_int_shifted % c_const_int != 0)
reject; reject;
// Check that every single output bit of the multiplier is connected consecutively to the div operator (offset accounted for)
for (int i = 0; i < mul_y.size(); i++) {
if (sigmap(mul_y[i]) != sigmap(div_a[i + offset])) {
reject;
}
}
// Rewire to only keep multiplier // Rewire to only keep multiplier
mul->setPort(\B, Const(b_const_int_shifted / c_const_int, b_const_width)); mul->setPort(\B, Const(b_const_int_shifted / c_const_int, b_const_width));
mul->setPort(\Y, div_y); mul->setPort(\Y, div_y);

8
tests/peepopt/multdiv_c.ys
View File

@ -4,7 +4,7 @@ design -reset
read_verilog <<EOF read_verilog <<EOF
module top ( module top (
input wire [11:0] a, input wire [11:0] a,
output wire [31:0] y output wire [11:0] y
); );
assign y = (a * 16'd5140) / (257 * 2); assign y = (a * 16'd5140) / (257 * 2);
endmodule endmodule
@ -26,10 +26,10 @@ module top (
output wire signed [31:0] y, output wire signed [31:0] y,
output wire probe output wire probe
); );
wire [44:0] tmp = (a * 16'd5140); wire [28:0] tmp = (a * 16'd5140);
assign probe = tmp[44]; assign probe = tmp[28];
assign y = tmp[43:0] / (257 * 2); assign y = tmp[27:0] / (257 * 2);
endmodule endmodule
EOF EOF
check -assert check -assert