Add --instr-count-dpi option, change default to 200
This replaces the former static AstNode::INSTR_COUNT_DPI, and makes it user adjustable to fit the design. Fixes #3068.
This commit is contained in:
parent
deebfa3239
commit
cdeb6e792f
4
Changes
4
Changes
|
|
@ -13,7 +13,9 @@ Verilator 4.211 devel
|
||||||
|
|
||||||
**Minor:**
|
**Minor:**
|
||||||
|
|
||||||
* Support unpackes array localparams in tasks/functions (#3078). [Geza Lore]
|
* Support unpacked array localparams in tasks/functions (#3078). [Geza Lore]
|
||||||
|
* Add --instr-count-dpi to tune assumed DPI import cost for multithreaded
|
||||||
|
model scheduling. Default value changed to 200 (#3068). [Yinan Xu]
|
||||||
* Output files are split based on the set of headers required
|
* Output files are split based on the set of headers required
|
||||||
in order to aid incremental compilation via ccache (#3071). [Geza Lore]
|
in order to aid incremental compilation via ccache (#3071). [Geza Lore]
|
||||||
* Parameter values are now emitted as 'static constexpr' instead of enum.
|
* Parameter values are now emitted as 'static constexpr' instead of enum.
|
||||||
|
|
|
||||||
|
|
@ -333,6 +333,7 @@ detailed descriptions of these arguments.
|
||||||
--if-depth <value> Tune IFDEPTH warning
|
--if-depth <value> Tune IFDEPTH warning
|
||||||
+incdir+<dir> Directory to search for includes
|
+incdir+<dir> Directory to search for includes
|
||||||
--inline-mult <value> Tune module inlining
|
--inline-mult <value> Tune module inlining
|
||||||
|
--instr-count-dpi <value> Assumed dynamic instruction count of DPI imports
|
||||||
-LDFLAGS <flags> Linker pre-object arguments for makefile
|
-LDFLAGS <flags> Linker pre-object arguments for makefile
|
||||||
--l2-name <value> Verilog scope name of the top module
|
--l2-name <value> Verilog scope name of the top module
|
||||||
--language <lang> Default language standard to parse
|
--language <lang> Default language standard to parse
|
||||||
|
|
|
||||||
|
|
@ -536,6 +536,14 @@ Summary:
|
||||||
times, but potentially faster simulation speed. This setting is ignored
|
times, but potentially faster simulation speed. This setting is ignored
|
||||||
for very small modules; they will always be inlined, if allowed.
|
for very small modules; they will always be inlined, if allowed.
|
||||||
|
|
||||||
|
.. option:: --instr-count-dpi <value>
|
||||||
|
|
||||||
|
Assumed dynamic instruction count of the average DPI import. This is used
|
||||||
|
by the partitioning algorithm when creating a multithread model. The
|
||||||
|
default value is 200. Adjusting this to an appropriate value can yield
|
||||||
|
performance improvements in multithreaded models. Ignored when creating a
|
||||||
|
single threaded model.
|
||||||
|
|
||||||
.. option:: -j [<value>]
|
.. option:: -j [<value>]
|
||||||
|
|
||||||
Specify the level of parallelism for :vlopt:`--build`. The <value> must
|
Specify the level of parallelism for :vlopt:`--build`. The <value> must
|
||||||
|
|
@ -1044,6 +1052,8 @@ Summary:
|
||||||
Verilator assumes DPI pure imports are threadsafe, but non-pure DPI
|
Verilator assumes DPI pure imports are threadsafe, but non-pure DPI
|
||||||
imports are not.
|
imports are not.
|
||||||
|
|
||||||
|
See also :vlopt:`--instr-count-dpi` option.
|
||||||
|
|
||||||
.. option:: --threads-max-mtasks <value>
|
.. option:: --threads-max-mtasks <value>
|
||||||
|
|
||||||
Rarely needed. When using :vlopt:`--threads`, specify the number of
|
Rarely needed. When using :vlopt:`--threads`, specify the number of
|
||||||
|
|
|
||||||
|
|
@ -216,6 +216,12 @@ be done by a "main thread". In most cases the eval thread and main thread
|
||||||
are the same thread (i.e. the user's top C++ testbench runs on a single
|
are the same thread (i.e. the user's top C++ testbench runs on a single
|
||||||
thread), but this is not required.
|
thread), but this is not required.
|
||||||
|
|
||||||
|
When making frequent use of DPI imported functions in a multi-threaded
|
||||||
|
model, it may be beneficial to performance to adjust the
|
||||||
|
:vlopt:`--instr-count-dpi` option based on some experimentation. This
|
||||||
|
influences the partitioning of the model by adjusting the assumed execution
|
||||||
|
time of DPI imports.
|
||||||
|
|
||||||
The :vlopt:`--trace-threads` options can be used to produce trace dumps
|
The :vlopt:`--trace-threads` options can be used to produce trace dumps
|
||||||
using multiple threads. If :vlopt:`--trace-threads` is set without
|
using multiple threads. If :vlopt:`--trace-threads` is set without
|
||||||
:vlopt:`--threads`, then :vlopt:`--trace-threads` will imply
|
:vlopt:`--threads`, then :vlopt:`--trace-threads` will imply
|
||||||
|
|
|
||||||
|
|
@ -1524,7 +1524,6 @@ public:
|
||||||
static constexpr int INSTR_COUNT_STR = 100; // String ops
|
static constexpr int INSTR_COUNT_STR = 100; // String ops
|
||||||
static constexpr int INSTR_COUNT_TIME = INSTR_COUNT_CALL + 5; // Determine simulation time
|
static constexpr int INSTR_COUNT_TIME = INSTR_COUNT_CALL + 5; // Determine simulation time
|
||||||
static constexpr int INSTR_COUNT_PLI = 20; // PLI routines
|
static constexpr int INSTR_COUNT_PLI = 20; // PLI routines
|
||||||
static constexpr int INSTR_COUNT_DPI = 1000; // DPI import function
|
|
||||||
|
|
||||||
// ACCESSORS
|
// ACCESSORS
|
||||||
virtual string name() const { return ""; }
|
virtual string name() const { return ""; }
|
||||||
|
|
|
||||||
|
|
@ -8788,7 +8788,9 @@ public:
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
virtual void name(const string& name) override { m_name = name; }
|
virtual void name(const string& name) override { m_name = name; }
|
||||||
virtual int instrCount() const override { return dpiImportPrototype() ? INSTR_COUNT_DPI : 0; }
|
virtual int instrCount() const override {
|
||||||
|
return dpiImportPrototype() ? v3Global.opt.instrCountDpi() : 0;
|
||||||
|
}
|
||||||
VBoolOrUnknown isConst() const { return m_isConst; }
|
VBoolOrUnknown isConst() const { return m_isConst; }
|
||||||
void isConst(bool flag) { m_isConst.setTrueOrFalse(flag); }
|
void isConst(bool flag) { m_isConst.setTrueOrFalse(flag); }
|
||||||
void isConst(VBoolOrUnknown flag) { m_isConst = flag; }
|
void isConst(VBoolOrUnknown flag) { m_isConst = flag; }
|
||||||
|
|
|
||||||
|
|
@ -1101,6 +1101,10 @@ void V3Options::parseOptsList(FileLine* fl, const string& optdir, int argc, char
|
||||||
DECL_OPTION("-if-depth", Set, &m_ifDepth);
|
DECL_OPTION("-if-depth", Set, &m_ifDepth);
|
||||||
DECL_OPTION("-ignc", OnOff, &m_ignc);
|
DECL_OPTION("-ignc", OnOff, &m_ignc);
|
||||||
DECL_OPTION("-inline-mult", Set, &m_inlineMult);
|
DECL_OPTION("-inline-mult", Set, &m_inlineMult);
|
||||||
|
DECL_OPTION("-instr-count-dpi", CbVal, [this, fl](int val) {
|
||||||
|
m_instrCountDpi = val;
|
||||||
|
if (m_instrCountDpi < 0) fl->v3fatal("--instr-count-dpi must be non-negative: " << val);
|
||||||
|
});
|
||||||
|
|
||||||
DECL_OPTION("-LDFLAGS", CbVal, callStrSetter(&V3Options::addLdLibs));
|
DECL_OPTION("-LDFLAGS", CbVal, callStrSetter(&V3Options::addLdLibs));
|
||||||
const auto setLang = [this, fl](const char* valp) {
|
const auto setLang = [this, fl](const char* valp) {
|
||||||
|
|
|
||||||
|
|
@ -289,6 +289,7 @@ private:
|
||||||
int m_gateStmts = 100; // main switch: --gate-stmts
|
int m_gateStmts = 100; // main switch: --gate-stmts
|
||||||
int m_ifDepth = 0; // main switch: --if-depth
|
int m_ifDepth = 0; // main switch: --if-depth
|
||||||
int m_inlineMult = 2000; // main switch: --inline-mult
|
int m_inlineMult = 2000; // main switch: --inline-mult
|
||||||
|
int m_instrCountDpi = 200; // main switch: --instr-count-dpi
|
||||||
VOptionBool m_makeDepend; // main switch: -MMD
|
VOptionBool m_makeDepend; // main switch: -MMD
|
||||||
int m_maxNumWidth = 65536; // main switch: --max-num-width
|
int m_maxNumWidth = 65536; // main switch: --max-num-width
|
||||||
int m_moduleRecursion = 100; // main switch: --module-recursion-depth
|
int m_moduleRecursion = 100; // main switch: --module-recursion-depth
|
||||||
|
|
@ -489,6 +490,7 @@ public:
|
||||||
int gateStmts() const { return m_gateStmts; }
|
int gateStmts() const { return m_gateStmts; }
|
||||||
int ifDepth() const { return m_ifDepth; }
|
int ifDepth() const { return m_ifDepth; }
|
||||||
int inlineMult() const { return m_inlineMult; }
|
int inlineMult() const { return m_inlineMult; }
|
||||||
|
int instrCountDpi() const { return m_instrCountDpi; }
|
||||||
VOptionBool makeDepend() const { return m_makeDepend; }
|
VOptionBool makeDepend() const { return m_makeDepend; }
|
||||||
int maxNumWidth() const { return m_maxNumWidth; }
|
int maxNumWidth() const { return m_maxNumWidth; }
|
||||||
int moduleRecursionDepth() const { return m_moduleRecursion; }
|
int moduleRecursionDepth() const { return m_moduleRecursion; }
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
#!/usr/bin/env perl
|
||||||
|
if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
|
||||||
|
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
|
||||||
|
#
|
||||||
|
# Copyright 2003 by Wilson Snyder. This program is free software; you
|
||||||
|
# can redistribute it and/or modify it under the terms of either the GNU
|
||||||
|
# Lesser General Public License Version 3 or the Perl Artistic License
|
||||||
|
# Version 2.0.
|
||||||
|
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
|
||||||
|
|
||||||
|
scenarios(vlt => 1);
|
||||||
|
|
||||||
|
compile(
|
||||||
|
verilator_flags2 => ["--instr-count-dpi -1"],
|
||||||
|
fails => 1,
|
||||||
|
expect => "%Error: --instr-count-dpi must be non-negative: -1"
|
||||||
|
);
|
||||||
|
|
||||||
|
ok(1);
|
||||||
|
1;
|
||||||
Loading…
Reference in New Issue