From 2168813da018f52a8781ee3e0e851bea5207a597 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 21 Aug 2020 13:56:14 -0700 Subject: [PATCH] Add help string | Fix emulator CC to not conflict with --vpi --- .../src/main/resources/csrc/emulator.cc | 18 ------------------ sims/verilator/Makefile | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/generators/utilities/src/main/resources/csrc/emulator.cc b/generators/utilities/src/main/resources/csrc/emulator.cc index e92c4688..5e0ea38b 100644 --- a/generators/utilities/src/main/resources/csrc/emulator.cc +++ b/generators/utilities/src/main/resources/csrc/emulator.cc @@ -20,8 +20,6 @@ #include #include #include -// needed for s_vpi_vlog_info, which is needed for multithreading -#include // 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 @@ -56,18 +54,6 @@ double sc_time_stamp() 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) { printf("Usage: %s [EMULATOR OPTION]... [VERILOG PLUSARG]... [HOST OPTION]... BINARY [TARGET OPTION]...\n", @@ -272,10 +258,6 @@ done_processing: return 1; } - // set argc/v in vpi_get_vlog_info - htif_argc = argc; - htif_argv = argv; - if (verbose) fprintf(stderr, "using random seed %u\n", random_seed); diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index f945cb01..3cc7c18b 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -53,6 +53,7 @@ HELP_COMPILATION_VARIABLES += \ " VERILATOR_PROFILE = 'none' if no verilator profiling (default)" \ " 'all' if full verilator runtime profiling" \ " '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" #########################################################################################