wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add help string | Fix emulator CC to not conflict with --vpi

Browse Source
This commit is contained in:
abejgonzalez
2020-08-21 13:56:14 -07:00
parent c9791ccbdf
commit 2168813da0
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
generators/utilities/src/main/resources/csrc/emulator.cc
View File

@@ -20,8 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
// needed for s_vpi_vlog_info, which is needed for multithreading
#include <vpi_user.h>
// For option parsing, which is split across this file, Verilog, and // For option parsing, which is split across this file, Verilog, and
// FESVR's HTIF, a few external files must be pulled in. The list of // FESVR's HTIF, a few external files must be pulled in. The list of
@@ -56,18 +54,6 @@ double sc_time_stamp()
return trace_count; return trace_count;
} }
// need to pull htif_argc/htif_argv out here so the thread that calls tick()
// for the HTIF device can initialize properly with the cmdline args. this
// was pulled out here for multithreading to work
static int htif_argc;
static char **htif_argv = NULL;
extern "C" int vpi_get_vlog_info(s_vpi_vlog_info *vlog_info_s)
{
vlog_info_s->argc = htif_argc;
vlog_info_s->argv = htif_argv;
return 1;
}
static void usage(const char * program_name) static void usage(const char * program_name)
{ {
printf("Usage: %s [EMULATOR OPTION]... [VERILOG PLUSARG]... [HOST OPTION]... BINARY [TARGET OPTION]...\n", printf("Usage: %s [EMULATOR OPTION]... [VERILOG PLUSARG]... [HOST OPTION]... BINARY [TARGET OPTION]...\n",
@@ -272,10 +258,6 @@ done_processing:
return 1; return 1;
} }
// set argc/v in vpi_get_vlog_info
htif_argc = argc;
htif_argv = argv;
if (verbose) if (verbose)
fprintf(stderr, "using random seed %u\n", random_seed); fprintf(stderr, "using random seed %u\n", random_seed);

1
sims/verilator/Makefile
View File

@@ -53,6 +53,7 @@ HELP_COMPILATION_VARIABLES += \
" VERILATOR_PROFILE = 'none' if no verilator profiling (default)" \ " VERILATOR_PROFILE = 'none' if no verilator profiling (default)" \
" 'all' if full verilator runtime profiling" \ " 'all' if full verilator runtime profiling" \
" 'threads' if runtime thread profiling only" \ " 'threads' if runtime thread profiling only" \
" VERILATOR_THREADS = how many threads the simulator will use (default 1)" \
" VERILATOR_FST_MODE = enable FST waveform instead of VCD. use with debug build" " VERILATOR_FST_MODE = enable FST waveform instead of VCD. use with debug build"
######################################################################################### #########################################################################################