diff --git a/src/V3Const.cpp b/src/V3Const.cpp index e1b990513..3d87a2057 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -98,6 +98,7 @@ class ConstBitOpTreeVisitor final : public AstNVisitor { V3Number m_bitPolarity; // Coefficient of each bit static int widthOfRef(AstVarRef* refp) { if (AstWordSel* selp = VN_CAST(refp->backp(), WordSel)) return selp->width(); + if (AstCCast* castp = VN_CAST(refp->backp(), CCast)) return castp->width(); return refp->width(); } diff --git a/test_regress/t/t_const_opt_cov.pl b/test_regress/t/t_const_opt_cov.pl new file mode 100755 index 000000000..1e0a96b74 --- /dev/null +++ b/test_regress/t/t_const_opt_cov.pl @@ -0,0 +1,26 @@ +#!/usr/bin/env perl +if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } +# DESCRIPTION: Verilator: Verilog Test driver/expect definition +# +# Copyright 2003 by Wilson Snyder. This program is free software; you +# can redistribute it and/or modify it under the terms of either the GNU +# Lesser General Public License Version 3 or the Perl Artistic License +# Version 2.0. +# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 + +scenarios(simulator => 1); + +compile( + verilator_flags2=>["-Wno-UNOPTTHREADS", "--stats", "--coverage"], + ); + +execute( + check_finished => 1, + ); + +if ($Self->{vlt}) { + file_grep($Self->{stats}, qr/Optimizations, Const bit op reduction\s+(\d+)/i, 2); +} + +ok(1); +1; diff --git a/test_regress/t/t_const_opt_cov.v b/test_regress/t/t_const_opt_cov.v new file mode 100644 index 000000000..245309007 --- /dev/null +++ b/test_regress/t/t_const_opt_cov.v @@ -0,0 +1,78 @@ +// DESCRIPTION: Verilator: Verilog Test module +// +// This file ONLY is placed under the Creative Commons Public Domain, for +// any use, without warranty, 2020 Wilson Snyder. +// SPDX-License-Identifier: CC0-1.0 + +module t(/*AUTOARG*/ + // Inputs + clk + ); + input clk; + + integer cyc=0; + reg [63:0] crc; + reg [63:0] sum; + + // Take CRC data and apply to testblock inputs + wire [32:0] in = crc[32:0]; + + logic bank_rd_vec_m3; + always_ff @(posedge clk) bank_rd_vec_m3 <= crc[33]; + + + wire out; + ecc_check_pipe u_bank_data_ecc_check( + .clk (clk), + .bank_rd_m3 (bank_rd_vec_m3), + .data_i (in), + .ecc_err_o (out) + ); + + + + // Aggregate outputs into a single result vector + wire [63:0] result = {63'b0, out}; + + // Test loop + always @ (posedge clk) begin +`ifdef TEST_VERBOSE + $write("[%0t] cyc==%0d crc=%x result=%x\n",$time, cyc, crc, result); +`endif + cyc <= cyc + 1; + crc <= {crc[62:0], crc[63]^crc[2]^crc[0]}; + sum <= result ^ {sum[62:0],sum[63]^sum[2]^sum[0]}; + if (cyc == 0) begin + // Setup + crc <= 64'h5aef0c8d_d70a4497; + sum <= '0; + end + else if (cyc < 10) begin + sum <= '0; + end + else if (cyc == 99) begin + $write("[%0t] cyc==%0d crc=%x sum=%x\n",$time, cyc, crc, sum); + if (crc !== 64'hc77bb9b3784ea091) $stop; + // What checksum will we end up with (above print should match) +`define EXPECTED_SUM 64'h768b162c5835e35b + if (sum !== `EXPECTED_SUM) $stop; + $write("*-* All Finished *-*\n"); + $finish; + end + end + +endmodule + +module ecc_check_pipe ( + input logic clk, + input logic bank_rd_m3, + input logic [32:0] data_i, + output logic ecc_err_o + ); + logic [3:0] check_group_6_0; + logic check_group_6_0_q; + + always_comb check_group_6_0 = {data_i[0], data_i[2], data_i[4], data_i[7] }; + always_ff @(posedge clk) if (bank_rd_m3) check_group_6_0_q <=^check_group_6_0; + assign ecc_err_o = check_group_6_0_q; +endmodule