From 8d46a1619f346226a98aa749e7f162554c7dded9 Mon Sep 17 00:00:00 2001
From: Jeff Ng <jeffng@precisioninno.com>
Date: Tue, 27 May 2025 21:23:59 +0000
Subject: [PATCH] Re-ordered VERILOG_FILES for cva6 to satisfy Verific

Signed-off-by: Jeff Ng <jeffng@precisioninno.com>
---
 flow/designs/asap7/cva6/config.mk | 60 ++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/flow/designs/asap7/cva6/config.mk b/flow/designs/asap7/cva6/config.mk
index 8a83b75ebf..dadcda6776 100644
--- a/flow/designs/asap7/cva6/config.mk
+++ b/flow/designs/asap7/cva6/config.mk
@@ -2,26 +2,68 @@ export PLATFORM               = asap7
 
 export DESIGN_NAME            = cva6
 
+# Some files are listed specifically vs. sorted wildcard to control the order
+# (makes Verific happy)
 export SRC_HOME = $(DESIGN_HOME)/src/$(DESIGN_NICKNAME)
 export VERILOG_FILES          = $(sort $(wildcard $(SRC_HOME)/common/local/util/*.sv)) \
+	$(SRC_HOME)/core/include/config_pkg.sv \
+	$(SRC_HOME)/core/include/cv32a65x_config_pkg.sv \
+	$(SRC_HOME)/core/include/riscv_pkg.sv \
+	$(SRC_HOME)/core/include/ariane_pkg.sv \
+	$(SRC_HOME)/core/include/build_config_pkg.sv \
+	$(SRC_HOME)/core/include/std_cache_pkg.sv \
+	$(SRC_HOME)/core/include/wt_cache_pkg.sv \
+	$(sort $(wildcard $(SRC_HOME)/vendor/pulp-platform/common_cells/src/*.sv)) \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_pkg.sv \
+	$(sort $(wildcard $(SRC_HOME)/vendor/pulp-platform/axi/src/*.sv)) \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_cast_multi.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_classifier.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_divsqrt_multi.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_fma.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_fma_multi.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_noncomp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_opgroup_block.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_opgroup_fmt_slice.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_opgroup_multifmt_slice.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_rounding.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpnew_top.sv \
 	$(sort $(wildcard $(SRC_HOME)/core/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/pmp/src/*.sv)) \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_pkg.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_amo.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_cmo.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_core_arbiter.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_ctrl.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_ctrl_pe.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_flush.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_memctrl.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_miss_handler.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_mshr.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_rtab.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_uncached.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_victim_plru.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_victim_random.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_victim_sel.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hpdcache_wbuf.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hwpf_stride/hwpf_stride_pkg.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hwpf_stride/hwpf_stride.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hwpf_stride/hwpf_stride_arb.sv \
+	$(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hwpf_stride/hwpf_stride_wrapper.sv \
 	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/common/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/common/macros/blackbox/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/hwpf_stride/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/hpdcache/rtl/src/utils/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/cache_subsystem/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/cva6_mmu/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/cvfpu/src/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/*.sv)) \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/defs_div_sqrt_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/control_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/div_sqrt_top_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/iteration_div_sqrt_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/norm_div_sqrt_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/nrbd_nrsc_mvp.sv \
+	$(SRC_HOME)/core/cvfpu/src/fpu_div_sqrt_mvp/hdl/preprocess_mvp.sv \
 	$(SRC_HOME)/core/cvxif_example/include/cvxif_instr_pkg.sv \
-	$(sort $(wildcard $(SRC_HOME)/core/cvxif_example/*.sv)) \
 	$(sort $(wildcard $(SRC_HOME)/core/frontend/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/core/include/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/vendor/pulp-platform/axi/src/*.sv)) \
-	$(sort $(wildcard $(SRC_HOME)/vendor/pulp-platform/common_cells/src/*.sv)) \
 	$(SRC_HOME)/vendor/pulp-platform/tech_cells_generic/src/rtl/tc_sram.sv \
 	$(PLATFORM_DIR)/verilog/fakeram7_256x32.sv