From cb4f1bec8e83170d94f4e26e4a131f15c09e279a Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Fri, 15 Nov 2024 05:58:30 -0800
Subject: [PATCH] Removed fcovimp support

---
 .gitignore          |  3 ---
 bin/wsim            | 13 ++-----------
 sim/questa/wally.do | 20 --------------------
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31db4f885..64fbbbf23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,9 +105,6 @@ sim/questa/wkdir
 sim/questa/ucdb
 sim/questa/cov
 sim/questa/fcov
-sim/questa/fcovrvvi
-sim/questa/fcovrvvi_logs
-sim/questa/fcovrvvi_ucdb
 sim/questa/fcov_logs
 sim/questa/fcov_ucdb
 sim/questa/riscv.ucdb
diff --git a/bin/wsim b/bin/wsim
index 72ec81a22..2b3849ecc 100755
--- a/bin/wsim
+++ b/bin/wsim
@@ -27,7 +27,6 @@ parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilat
 parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench")
 parser.add_argument("--gui", "-g", help="Simulate with GUI", action="store_true")
 parser.add_argument("--ccov", "-c", help="Code Coverage", action="store_true")
-parser.add_argument("--fcovimp", "-f2", help="Functional Coverage with Imperas licensed riscvISACOV, implies lockstep", action="store_true")
 parser.add_argument("--fcov", "-f", help="Functional Coverage with cvw-arch-verif, implies lockstep", action="store_true")
 parser.add_argument("--args", "-a", help="Optional arguments passed to simulator via $value$plusargs", default="")
 parser.add_argument("--params", "-p", help="Optional top-level parameter overrides of the form param=value", default="")
@@ -70,7 +69,7 @@ if(args.lockstep and not args.testsuite.endswith('.elf') and not args.testsuite
     exit(1)
 
 # Validate arguments
-if (args.gui or args.ccov or args.fcov or args.fcovimp or args.lockstep or args.lockstepverbose):
+if (args.gui or args.ccov or args.fcov or args.lockstep or args.lockstepverbose):
     if args.sim not in ["questa", "vcs"]:
         print("Option only supported for Questa and VCS")
         exit(1)
@@ -88,7 +87,7 @@ if (args.tb == "testbench_fp"):
 if(int(args.locksteplog) >= 1): EnableLog = 1
 else: EnableLog = 0
 prefix = ""
-if (args.lockstep or args.lockstepverbose or args.fcov or args.fcovimp):
+if (args.lockstep or args.lockstepverbose or args.fcov):
     if (args.sim == "questa" or args.sim == "vcs"):
         imperasicPath = os.path.join(WALLY, "config", args.config, "imperas.ic")
         if not os.path.isfile(imperasicPath): # If config is a derivative, look for imperas.ic in derivative configs
@@ -101,12 +100,6 @@ if (args.sim == "questa"):
 if (args.lockstep or args.lockstepverbose):
     if(args.locksteplog != 0): ImperasPlusArgs = " +IDV_TRACE2LOG=" + str(EnableLog) + " +IDV_TRACE2LOG_AFTER=" + str(args.locksteplog)
     else: ImperasPlusArgs = ""
-    if(args.fcovimp):
-        CovEnableStr = "1" if int(args.covlog) > 0  else "0"
-        if(args.covlog >= 1): EnableLog = 1
-        else: EnableLog = 0
-        ImperasPlusArgs = " +IDV_TRACE2COV=" + str(EnableLog) + " +TRACE2LOG_AFTER=" + str(args.covlog) + " +TRACE2COV_ENABLE=" + CovEnableStr
-        suffix = ""
     if(args.fcov):
         CovEnableStr = "1" if int(args.covlog) > 0  else "0";
         if(args.covlog >= 1): EnableLog = 1
@@ -130,8 +123,6 @@ if (args.ccov):
     flags += " --ccov"
 if (args.fcov):
     flags += " --fcov"
-if (args.fcovimp):
-    flags += " --fcovimp"
 
 #  create the output sub-directories.
 regressionDir = WALLY + '/sim/'
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index c692b06e1..6f613c404 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -103,26 +103,6 @@ if {[lcheck lst "--ccov"]} {
     set CoverageVsimArg "-coverage"
 }
 
-# if --fcovimp found set flag and remove from list
-if {[lcheck lst "--fcovimp"]} {
-    set FunctCoverage 1
-    set FCvlog "+define+INCLUDE_TRACE2COV \
-                +define+IDV_INCLUDE_TRACE2COV \
-                +define+COVER_BASE_RV64I \
-                +define+COVER_LEVEL_DV_PR_EXT \
-                +incdir+${IMPERAS_HOME}/ImpProprietary/source/host/riscvISACOV/source"
-    set FCvopt "+TRACE2COV_ENABLE=1 +IDV_TRACE2COV=1"
-    # Uncomment various cover statements below to control which extensions get functional coverage
-    lappend FCdefineCOVER_EXTS "+define+COVER_RV64I"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64M"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64A"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64F"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64D"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64ZICSR"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64C"
-
-}
-
 # if --fcov found set flag and remove from list
 if {[lcheck lst "--fcov"]} {
     set FunctCoverage 1