root
/
XiangShan
mirror of https://github.com/OpenXiangShan/XiangShan.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(difftest): bump and align parseArg return values (#5009) 

* We also add the customized coverage firtool arguments
This commit is contained in:
Yinan Xu 2025-09-08 10:00:02 +08:00 committed by GitHub
parent 61747267a4
commit dcc9cd806f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -88,7 +88,7 @@ MFC_ARGS += --split-verilog --dump-fir
endif
ifneq ($(FIRTOOL),)
MFC_ARGS += --firtool-binary-path $(FIRTOOL)
MFC_ARGS += --firtool-binary-path $(abspath $(FIRTOOL))
endif
# prefix of XSTop or XSNoCTop
@ -201,6 +201,13 @@ else
override SIM_ARGS += $(DEBUG_ARGS)
endif
# Coverage support
ifneq ($(FIRRTL_COVER),)
comma := ,
splitcomma = $(foreach w,$(subst $(comma), ,$1),$(if $(strip $w),$w))
override SIM_ARGS += $(foreach c,$(call splitcomma,$(FIRRTL_COVER)),--extract-$(c)-cover)
endif
# use RELEASE_ARGS for TopMain by default
ifeq ($(PLDM), 1)
TOPMAIN_ARGS += $(PLDM_ARGS)

2
difftest

@ -1 +1 @@
Subproject commit 7f1ff0d039042f60e5e6a72a1e6f5426844324e9
Subproject commit 0af0fec699446f78e9d5d01fb2606987a0540bb6

4
src/main/scala/top/ArgParser.scala
View File

@ -226,7 +226,7 @@ object ArgParser {
nextOption(config, tail)
}
}
val newArgs = DifftestModule.parseArgs(args)
val (newArgs, firtoolOptions) = DifftestModule.parseArgs(args)
val config = nextOption(default, newArgs.toList).alter((site, here, up) => {
case LogUtilsOptionsKey => LogUtilsOptions(
here(DebugOptionsKey).EnableDebug,
@ -240,6 +240,6 @@ object ArgParser {
0
)
})
(config, firrtlOpts, firtoolOpts)
(config, firrtlOpts, firtoolOpts ++ firtoolOptions.map(_.option))
}
}