diff --git a/.gitmodules b/.gitmodules index 6dec3c325b..f6bf974d50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "core/cache_subsystem/hpdcache"] path = core/cache_subsystem/hpdcache url = https://github.com/openhwgroup/cv-hpdcache.git +[submodule "verif/sim/dv"] + path = verif/sim/dv + url = https://github.com/google/riscv-dv.git diff --git a/verif/.gitignore b/verif/.gitignore index 993df2a7b3..dd8a824fac 100644 --- a/verif/.gitignore +++ b/verif/.gitignore @@ -39,7 +39,6 @@ tests/riscv-compliance/ tests/riscv-arch-test/ tests/riscv-tests/ tests/riscv-isa-sim/ -sim/dv/ sim/vcs_results sim/verilator_work sim/out_* diff --git a/verif/regress/install-riscv-dv.sh b/verif/regress/install-riscv-dv.sh index e3b458aa70..7e0e3bc9d5 100755 --- a/verif/regress/install-riscv-dv.sh +++ b/verif/regress/install-riscv-dv.sh @@ -20,27 +20,4 @@ export RTL_PATH=$ROOT_PROJECT/ export TB_PATH=$ROOT_PROJECT/verif/tb/core export TESTS_PATH=$ROOT_PROJECT/verif/tests -if [ -z "$DV_REPO" ]; then - export DV_REPO="https://github.com/chipsalliance/riscv-dv.git" - export DV_BRANCH="master" - export DV_HASH="f0c570d11236f94f9c5449870223a5ac717cc580" - export DV_PATCH= -fi -echo "Repo: " $DV_REPO -echo "Branch:" $DV_BRANCH -echo "Hash: " $DV_HASH -echo "Patch: " $DV_PATCH - -mkdir -p verif/sim -if ! [ -d verif/sim/dv ]; then - git clone $DV_REPO -b $DV_BRANCH verif/sim/dv - cd verif/sim/dv; git checkout $DV_HASH; - if [[ -n "$DV_PATCH" && -f "$DV_PATCH" ]]; then - git apply "$DV_PATCH" - fi - cd - - # install riscv-dv dependencies - cd verif/sim/dv; pip3 install -r requirements.txt; cd - -fi - -touch verif/sim/dv/__init__.py +(cd verif/sim/dv; pip3 install -r requirements.txt) diff --git a/verif/sim/dv b/verif/sim/dv new file mode 160000 index 0000000000..f0c570d112 --- /dev/null +++ b/verif/sim/dv @@ -0,0 +1 @@ +Subproject commit f0c570d11236f94f9c5449870223a5ac717cc580