github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 20:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Fix spacing and style of v4 changes. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder 2018-08-23 05:09:12 -04:00
parent 0b84222500
commit 8f838433df
32 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/verilator_gantt
View File

@ -21,8 +21,8 @@ our %Global;
autoflush STDOUT 1; autoflush STDOUT 1;
autoflush STDERR 1; autoflush STDERR 1;
Getopt::Long::config ("no_auto_abbrev"); Getopt::Long::config("no_auto_abbrev");
if (! GetOptions ( if (! GetOptions(
"help" => \&usage, "help" => \&usage,
"scale=i" => \$Opt_Time_Per_Char, "scale=i" => \$Opt_Time_Per_Char,
"debug" => sub { $Debug = 1; }, "debug" => sub { $Debug = 1; },
@ -156,8 +156,8 @@ sub report {
# of synchronization and scheduling should not.) # of synchronization and scheduling should not.)
print "\nAnalysis:\n"; print "\nAnalysis:\n";
printf " Total threads = %d\n", $nthreads; printf " Total threads = %d\n", $nthreads;
printf " Total mtasks = %d\n", scalar (keys %Mtasks); printf " Total mtasks = %d\n", scalar(keys %Mtasks);
printf " Total cpus used = %d\n", scalar (keys %{$Global{cpus}}); printf " Total cpus used = %d\n", scalar(keys %{$Global{cpus}});
printf " Total yields = %d\n", $Global{stats}{yields}; printf " Total yields = %d\n", $Global{stats}{yields};
printf " Total eval time = %d rdtsc ticks\n", $Global{last_end}; printf " Total eval time = %d rdtsc ticks\n", $Global{last_end};
printf " Longest mtask time = %d rdtsc ticks\n", $long_mtask_time; printf " Longest mtask time = %d rdtsc ticks\n", $long_mtask_time;

4
include/verilated_vcd_c.h
View File

@ -305,8 +305,8 @@ public:
*m_writep++=' '; printCode(code); *m_writep++='\n'; *m_writep++=' '; printCode(code); *m_writep++='\n';
bufferCheck(); bufferCheck();
} }
inline void fullQuadX(vluint32_t code, int bits) { fullBusX (code, bits); } inline void fullQuadX(vluint32_t code, int bits) { fullBusX(code, bits); }
inline void fullArrayX(vluint32_t code, int bits) { fullBusX (code, bits); } inline void fullArrayX(vluint32_t code, int bits) { fullBusX(code, bits); }
/// Inside dumping routines, dump one signal if it has changed /// Inside dumping routines, dump one signal if it has changed
inline void chgBit(vluint32_t code, const vluint32_t newval) { inline void chgBit(vluint32_t code, const vluint32_t newval) {

2
src/V3Error.cpp
View File

@ -162,7 +162,7 @@ string V3Error::warnMore() {
return msgPrefix(); return msgPrefix();
} }
void V3Error::v3errorEnd (std::ostringstream& sstr) { void V3Error::v3errorEnd(std::ostringstream& sstr) {
#if defined(__COVERITY__) || defined(__cppcheck__) #if defined(__COVERITY__) || defined(__cppcheck__)
if (s_errorCode==V3ErrorCode::EC_FATAL) __coverity_panic__(x); if (s_errorCode==V3ErrorCode::EC_FATAL) __coverity_panic__(x);
#endif #endif

2
src/V3Reloop.cpp
View File

@ -260,7 +260,7 @@ public:
void V3Reloop::reloopAll(AstNetlist* nodep) { void V3Reloop::reloopAll(AstNetlist* nodep) {
UINFO(2,__FUNCTION__<<": "<<endl); UINFO(2,__FUNCTION__<<": "<<endl);
{ {
ReloopVisitor visitor (nodep); ReloopVisitor visitor(nodep);
} // Destruct before checking } // Destruct before checking
V3Global::dumpCheckGlobalTree("reloop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6); V3Global::dumpCheckGlobalTree("reloop", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 6);
} }

4
src/V3Split.cpp
View File

@ -1002,14 +1002,14 @@ private:
void V3Split::splitReorderAll(AstNetlist* nodep) { void V3Split::splitReorderAll(AstNetlist* nodep) {
UINFO(2,__FUNCTION__<<": "<<endl); UINFO(2,__FUNCTION__<<": "<<endl);
{ {
ReorderVisitor visitor (nodep); ReorderVisitor visitor(nodep);
} // Destruct before checking } // Destruct before checking
V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); V3Global::dumpCheckGlobalTree("reorder", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
} }
void V3Split::splitAlwaysAll(AstNetlist* nodep) { void V3Split::splitAlwaysAll(AstNetlist* nodep) {
UINFO(2,__FUNCTION__<<": "<<endl); UINFO(2,__FUNCTION__<<": "<<endl);
{ {
SplitVisitor visitor (nodep); SplitVisitor visitor(nodep);
} // Destruct before checking } // Destruct before checking
V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3); V3Global::dumpCheckGlobalTree("split", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 3);
} }

2
src/V3StatsReport.cpp
View File

@ -206,7 +206,7 @@ StatsReport::StatColl StatsReport::s_allStats;
//###################################################################### //######################################################################
// V3Statstic class // V3Statstic class
void V3Statistic::dump (std::ofstream& os) const { void V3Statistic::dump(std::ofstream& os) const {
if (perf()) { if (perf()) {
os<<" "<<std::right<<std::fixed<<std::setprecision(6)<<std::setw(9)<<count(); os<<" "<<std::right<<std::fixed<<std::setprecision(6)<<std::setw(9)<<count();
} else { } else {

2
src/V3Task.cpp
View File

@ -1140,7 +1140,7 @@ private:
AstVarScope* outvscp = NULL; AstVarScope* outvscp = NULL;
if (nodep->taskp()->isFunction()) { if (nodep->taskp()->isFunction()) {
// Not that it's a FUNCREF, but that we're calling a function (perhaps as a task) // Not that it's a FUNCREF, but that we're calling a function (perhaps as a task)
outvscp = createVarScope (VN_CAST(nodep->taskp()->fvarp(), Var), outvscp = createVarScope(VN_CAST(nodep->taskp()->fvarp(), Var),
namePrefix+"__Vfuncout"); namePrefix+"__Vfuncout");
} }
// Create cloned statements // Create cloned statements

2
src/V3Unknown.cpp
View File

@ -187,7 +187,7 @@ private:
// If we got ==1'bx it can never be true (but 1'bx==1'bx can be!) // If we got ==1'bx it can never be true (but 1'bx==1'bx can be!)
if (((VN_IS(lhsp, Const) && VN_CAST(lhsp, Const)->num().isFourState()) if (((VN_IS(lhsp, Const) && VN_CAST(lhsp, Const)->num().isFourState())
|| (VN_IS(rhsp, Const) && VN_CAST(rhsp, Const)->num().isFourState()))) { || (VN_IS(rhsp, Const) && VN_CAST(rhsp, Const)->num().isFourState()))) {
V3Number num (nodep->fileline(), 1, (VN_IS(nodep, EqCase) ? 0:1)); V3Number num(nodep->fileline(), 1, (VN_IS(nodep, EqCase) ? 0:1));
newp = new AstConst (nodep->fileline(), num); newp = new AstConst (nodep->fileline(), num);
lhsp->deleteTree(); VL_DANGLING(lhsp); lhsp->deleteTree(); VL_DANGLING(lhsp);
rhsp->deleteTree(); VL_DANGLING(rhsp); rhsp->deleteTree(); VL_DANGLING(rhsp);

8
src/VlcTop.cpp
View File

@ -32,7 +32,7 @@
void VlcTop::readCoverage(const string& filename, bool nonfatal) { void VlcTop::readCoverage(const string& filename, bool nonfatal) {
UINFO(2,"readCoverage "<<filename<<endl); UINFO(2,"readCoverage "<<filename<<endl);
std::ifstream is (filename.c_str()); std::ifstream is(filename.c_str());
if (!is) { if (!is) {
if (!nonfatal) v3fatal("Can't read "<<filename); if (!nonfatal) v3fatal("Can't read "<<filename);
return; return;
@ -69,7 +69,7 @@ void VlcTop::readCoverage(const string& filename, bool nonfatal) {
void VlcTop::writeCoverage(const string& filename) { void VlcTop::writeCoverage(const string& filename) {
UINFO(2,"writeCoverage "<<filename<<endl); UINFO(2,"writeCoverage "<<filename<<endl);
std::ofstream os (filename.c_str()); std::ofstream os(filename.c_str());
if (!os) { if (!os) {
v3fatal("Can't write "<<filename); v3fatal("Can't write "<<filename);
return; return;
@ -203,13 +203,13 @@ void VlcTop::annotateOutputFiles(const string& dirname) {
UINFO(1,"annotateOutputFile "<<filename<<" -> "<<outfilename<<endl); UINFO(1,"annotateOutputFile "<<filename<<" -> "<<outfilename<<endl);
std::ifstream is (filename.c_str()); std::ifstream is(filename.c_str());
if (!is) { if (!is) {
v3error("Can't read "<<filename); v3error("Can't read "<<filename);
return; return;
} }
std::ofstream os (outfilename.c_str()); std::ofstream os(outfilename.c_str());
if (!os) { if (!os) {
v3fatal("Can't write "<<outfilename); v3fatal("Can't write "<<outfilename);
return; return;

10
test_regress/t/t_alw_noreorder.pl
View File

@ -10,18 +10,18 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1); scenarios(vlt_all => 1);
top_filename("t/t_alw_reorder.v"); top_filename("t/t_alw_reorder.v");
compile ( compile(
verilator_flags2 => ["--stats -Or"], verilator_flags2 => ["--stats -Or"],
); );
file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
# Here we should see some dly vars since reorder is disabled. # Here we should see some dly vars since reorder is disabled.
# (Whereas our twin test, t_alw_reorder, should see no dly vars # (Whereas our twin test, t_alw_reorder, should see no dly vars
# since it enables the reorder step.) # since it enables the reorder step.)
file_grep ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v1/i); file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v1/i);
file_grep ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v2/i); file_grep("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp", qr/dly__t__DOT__v2/i);
execute ( execute(
check_finished=>1, check_finished=>1,
); );

6
test_regress/t/t_alw_nosplit.pl
View File

@ -9,15 +9,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(simulator => 1); scenarios(simulator => 1);
compile ( compile(
verilator_flags2 => ["--stats"], verilator_flags2 => ["--stats"],
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
} }
execute ( execute(
check_finished=>1, check_finished=>1,
); );

6
test_regress/t/t_alw_reorder.pl
View File

@ -9,11 +9,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
scenarios(vlt_all => 1); scenarios(vlt_all => 1);
compile ( compile(
verilator_flags2 => ["--stats"], verilator_flags2 => ["--stats"],
); );
file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 0);
# Important: if reorder succeeded, we should see no dly vars. # Important: if reorder succeeded, we should see no dly vars.
# Equally important: twin test t_alw_noreorder should see dly vars, # Equally important: twin test t_alw_noreorder should see dly vars,
# is identical to this test except for disabling the reorder step. # is identical to this test except for disabling the reorder step.
@ -24,7 +24,7 @@ foreach my $file ("$Self->{obj_dir}/$Self->{VM_PREFIX}.cpp",
file_grep_not($file, qr/dly__t__DOT__v3/i); file_grep_not($file, qr/dly__t__DOT__v3/i);
} }
execute ( execute(
check_finished=>1, check_finished=>1,
); );

2
test_regress/t/t_alw_split.pl
View File

@ -14,7 +14,7 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep ($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 3); file_grep($Self->{stats}, qr/Optimizations, Split always\s+(\d+)/i, 3);
} }
execute( execute(

4
test_regress/t/t_case_huge.pl
View File

@ -14,8 +14,8 @@ compile(
); );
if ($Self->{vlt_all}) { if ($Self->{vlt_all}) {
file_grep ($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10); file_grep($Self->{stats}, qr/Optimizations, Tables created\s+(\d+)/i, 10);
file_grep ($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i, file_grep($Self->{stats}, qr/Optimizations, Combined CFuncs\s+(\d+)/i,
($Self->{vltmt} ? 0 : 8)); ($Self->{vltmt} ? 0 : 8));
} }