Tests: Fix modelsim driver, pull 5.

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>
Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
This commit is contained in:
Matthew Ballance 2019-11-19 21:53:17 -05:00 committed by Wilson Snyder
parent 0f6b625db8
commit 7a413a121d
2 changed files with 8 additions and 1 deletions

View File

@ -17,6 +17,7 @@ Kanad Kanhere
Kevin Kiningham
Lukasz Dalek
Maarten De Braekeleer
Matthew Ballance
Mike Popoloski
Patrick Stewart
Philipp Wagner

View File

@ -110,7 +110,7 @@ if (! GetOptions(
"atsim|athdl!"=> sub { $opt_scenarios{atsim} = $_[1]; },
"dist!" => sub { $opt_scenarios{dist} = $_[1]; },
"ghdl!" => sub { $opt_scenarios{ghdl} = $_[1]; },
"iverilog!" => sub { $opt_scenarios{iverilog} = $_[1]; },
"iv!" => sub { $opt_scenarios{iv} = $_[1]; },
"ms!" => sub { $opt_scenarios{ms} = $_[1]; },
"nc!" => sub { $opt_scenarios{nc} = $_[1]; },
"vlt!" => sub { $opt_scenarios{vlt} = $_[1]; },
@ -585,6 +585,7 @@ sub new {
ms => 0,
ms_flags => [split(/\s+/,("-sv -work $self->{obj_dir}/work"))],
ms_flags2 => [], # Overridden in some sim files
ms_pli => 1, # need to use pli
ms_run_flags => [split(/\s+/,"-lib $self->{obj_dir}/work -c -do 'run -all;quit' ")],
# XSim
xsim => 0,
@ -1152,11 +1153,16 @@ sub execute {
);
}
elsif ($param{ms}) {
my @pli_opt=();
if ($param{ms_pli}) {
unshift @pli_opt, "-pli $self->{obj_dir}/libvpi.so";
}
$self->_run(logfile=>"$self->{obj_dir}/ms_sim.log",
fails=>$param{fails},
cmd=>["echo q | ".$run_env.($ENV{VERILATOR_MODELSIM}||"vsim"),
@{$param{ms_run_flags}},
@{$param{all_run_flags}},
@{pli_opt},
(" top")
],
%param,