Merge pull request #2471 from XavierAubert/cv32e40p/fix_2123

Added behavior discussed in Issue 2123 for USE_ISS
openhwgroup · Jun 21, 2024 · 96c6960 · 96c6960
2 parents 41ccf8f + 93ab85f
commit 96c6960
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/mk/core/core.mk b/mk/core/core.mk
@@ -48,8 +48,15 @@ UVM_PLUSARGS ?=
 CV_SIMULATOR ?= unsim
 SIMULATOR    ?= $(CV_SIMULATOR)
 
-# Optionally exclude the OVPsim (not recommended)
-USE_ISS      ?= YES
+# If USE_ISS is not specified, it will decide by default to enable the ISS if imperas_home is defined
+ifndef USE_ISS
+ifneq ($(IMPERAS_HOME),)
+USE_ISS = YES
+else
+USE_ISS = NO
+endif
+$(info Info: USE_ISS is not specified when invoking make command, defaulting USE_ISS to $(USE_ISS) (check for IMPERAS_HOME in your environment))
+endif
 
 # Common configuration variables
 CFG             ?= default

diff --git a/mk/uvmt/uvmt.mk b/mk/uvmt/uvmt.mk
@@ -70,8 +70,15 @@ UVM_PLUSARGS ?=
 CV_SIMULATOR ?= unsim
 SIMULATOR    ?= $(CV_SIMULATOR)
 
-# Optionally exclude the OVPsim (not recommended)
-USE_ISS      ?= YES
+# If USE_ISS is not specified, it will decide by default to enable the ISS if imperas_home is defined
+ifndef USE_ISS
+ifneq ($(IMPERAS_HOME),)
+USE_ISS = YES
+else
+USE_ISS = NO
+endif
+$(info Info: USE_ISS is not specified when invoking make command, defaulting USE_ISS to $(USE_ISS) (check for IMPERAS_HOME in your environment))
+endif
 
 # Common configuration variables
 CFG          ?= default