From 965fd914b2cc79d7ab7720f00850099948be8773 Mon Sep 17 00:00:00 2001
From: CoralieAllioux <140795322+CoralieAllioux@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:07:21 +0100
Subject: [PATCH] Bugfix/riscv dv cyclic dependency (#1853)

---
 verif/env/corev-dv/cva6-files.f   | 7 ++++++-
 verif/env/corev-dv/simulator.yaml | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/verif/env/corev-dv/cva6-files.f b/verif/env/corev-dv/cva6-files.f
index 31ac1e72ef..1d5ab3986a 100644
--- a/verif/env/corev-dv/cva6-files.f
+++ b/verif/env/corev-dv/cva6-files.f
@@ -10,11 +10,16 @@
 // ------------------------------------------------------------------------------ //
 
 // HEADERS
++incdir+${RISCV_DV_ROOT}/src
++incdir+${RISCV_DV_ROOT}/test
 +incdir+${CVA6_DV_ROOT}/
 +incdir+${CVA6_DV_ROOT}/custom
 +incdir+${CVA6_DV_ROOT}/user_extension
 
 // SOURCES
+${RISCV_DV_ROOT}/src/riscv_signature_pkg.sv
+${RISCV_DV_ROOT}/src/riscv_instr_pkg.sv
+${RISCV_DV_ROOT}/test/riscv_instr_test_pkg.sv
 ${CVA6_DV_ROOT}/cva6_signature_pkg.sv
 ${CVA6_DV_ROOT}/cva6_instr_test_pkg.sv
-
+${RISCV_DV_ROOT}/test/riscv_instr_gen_tb_top.sv
diff --git a/verif/env/corev-dv/simulator.yaml b/verif/env/corev-dv/simulator.yaml
index 19cee982dc..57d929c156 100644
--- a/verif/env/corev-dv/simulator.yaml
+++ b/verif/env/corev-dv/simulator.yaml
@@ -23,7 +23,6 @@
       - "vcs -file <cwd>/dv/vcs.compile.option.f
               +incdir+<setting>
               +incdir+<user_extension>
-             -f <cwd>/dv/files.f
              -f <cwd>/../env/corev-dv/cva6-files.f
              -full64
              -l <out>/compile.log