From 68a11c30a65c8555da1397f728ea8ded0cf4d0c4 Mon Sep 17 00:00:00 2001 From: Stefan Mach <33124232+stmach@users.noreply.github.com> Date: Wed, 10 Jul 2019 23:27:23 +0200 Subject: [PATCH] fpu: Bump to fix divsqrt freezing bug (#277) * :arrow_up: [fpu] Bump to fix divsqrt freezing bug * :wrench: Fix Verilator for FPU Warnings about blocking/nonblocking assignments added to ignore list --- Bender.yml | 6 ------ Flist.ariane | 7 ------- Makefile | 1 + src/fpu | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Bender.yml b/Bender.yml index 208387e8..40500715 100644 --- a/Bender.yml +++ b/Bender.yml @@ -60,21 +60,15 @@ sources: - src/mult.sv - src/load_unit.sv - src/issue_read_operands.sv - - src/fpu/src/fpnew_f2icast.sv - src/fpu/src/fpnew_fma.sv - src/fpu/src/fpnew_opgroup_fmt_slice.sv - src/fpu/src/fpnew_divsqrt_multi.sv - - src/fpu/src/fpnew_f2fcast.sv - src/fpu/src/fpnew_fma_multi.sv - - src/fpu/src/fpnew_pipe_out.sv - src/fpu/src/fpnew_opgroup_multifmt_slice.sv - src/fpu/src/fpnew_classifier.sv - src/fpu/src/fpnew_noncomp.sv - src/fpu/src/fpnew_cast_multi.sv - src/fpu/src/fpnew_opgroup_block.sv - - src/fpu/src/fpnew_i2fcast.sv - - src/fpu/src/fpnew_pipe_in.sv - - src/fpu/src/fpnew_pipe_fma_inside.sv - src/fpu/src/fpnew_rounding.sv - src/fpu/src/fpnew_top.sv - src/fpu/src/fpu_div_sqrt_mvp/hdl/iteration_div_sqrt_mvp.sv diff --git a/Flist.ariane b/Flist.ariane index ed30e8df..a786ce41 100644 --- a/Flist.ariane +++ b/Flist.ariane @@ -46,19 +46,12 @@ src/fpu/src/fpu_div_sqrt_mvp/hdl/preprocess_mvp.sv src/fpu/src/fpnew_cast_multi.sv src/fpu/src/fpnew_classifier.sv src/fpu/src/fpnew_divsqrt_multi.sv -src/fpu/src/fpnew_f2fcast.sv -src/fpu/src/fpnew_f2icast.sv src/fpu/src/fpnew_fma_multi.sv src/fpu/src/fpnew_fma.sv -src/fpu/src/fpnew_i2fcast.sv src/fpu/src/fpnew_noncomp.sv src/fpu/src/fpnew_opgroup_block.sv src/fpu/src/fpnew_opgroup_fmt_slice.sv src/fpu/src/fpnew_opgroup_multifmt_slice.sv -src/fpu/src/fpnew_pipe_in.sv -src/fpu/src/fpnew_pipe_out.sv -src/fpu/src/fpnew_pipe_inside_fma.sv -src/fpu/src/fpnew_pipe_inside_cast.sv src/fpu/src/fpnew_rounding.sv src/fpu/src/fpnew_top.sv src/axi/src/axi_pkg.sv diff --git a/Makefile b/Makefile index f63a7f0f..01bc3d9f 100644 --- a/Makefile +++ b/Makefile @@ -361,6 +361,7 @@ verilate_command := $(verilator) -Wno-DECLFILENAME \ -Wno-UNUSED \ -Wno-UNOPTFLAT \ + -Wno-BLKANDNBLK \ -Wno-style \ $(if $(PROFILE),--stats --stats-vars --profile-cfuncs,) \ $(if $(DEBUG),--trace --trace-structs,) \ diff --git a/src/fpu b/src/fpu index 120f7f51..4a241d48 160000 --- a/src/fpu +++ b/src/fpu @@ -1 +1 @@ -Subproject commit 120f7f5184fa392d9a1ac1b4952de95eb6baa41a +Subproject commit 4a241d48e7e16ebd146423769828fdcd7e90de61 -- GitLab