Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Gantt: Subtract common start in slowpath to reduce collection measurement error.

Browse Source
This commit is contained in:
Wilson Snyder 2021-09-23 19:43:02 -04:00
parent 0defb61a18
commit 68f1432a68
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/verilated_threads.cpp
View File

@ -146,7 +146,7 @@ void VlThreadPool::profileAppendAll(const VlProfileRec& rec) VL_MT_SAFE_EXCLUDES
} }
} }
void VlThreadPool::profileDump(const char* filenamep, vluint64_t ticksElapsed) void VlThreadPool::profileDump(const char* filenamep, vluint64_t tickStart, vluint64_t tickEnd)
VL_MT_SAFE_EXCLUDES(m_mutex) { VL_MT_SAFE_EXCLUDES(m_mutex) {
const VerilatedLockGuard lock{m_mutex}; const VerilatedLockGuard lock{m_mutex};
VL_DEBUG_IF(VL_DBG_MSGF("+prof+threads writing to '%s'\n", filenamep);); VL_DEBUG_IF(VL_DBG_MSGF("+prof+threads writing to '%s'\n", filenamep););
@ -194,14 +194,14 @@ void VlThreadPool::profileDump(const char* filenamep, vluint64_t ticksElapsed)
"VLPROF mtask %d" "VLPROF mtask %d"
" start %" VL_PRI64 "u end %" VL_PRI64 "u elapsed %" VL_PRI64 "u" " start %" VL_PRI64 "u end %" VL_PRI64 "u elapsed %" VL_PRI64 "u"
" predict_time %u cpu %u on thread %u\n", " predict_time %u cpu %u on thread %u\n",
ei.m_mtaskId, ei.m_startTime, ei.m_endTime, ei.m_mtaskId, ei.m_startTime - tickStart, ei.m_endTime - tickStart,
(ei.m_endTime - ei.m_startTime), ei.m_predictTime, ei.m_cpu, thread_id); (ei.m_endTime - ei.m_startTime), ei.m_predictTime, ei.m_cpu, thread_id);
break; break;
default: assert(false); break; // LCOV_EXCL_LINE default: assert(false); break; // LCOV_EXCL_LINE
} }
} }
} }
fprintf(fp, "VLPROF stat ticks %" VL_PRI64 "u\n", ticksElapsed); fprintf(fp, "VLPROF stat ticks %" VL_PRI64 "u\n", tickEnd - tickStart);
std::fclose(fp); std::fclose(fp);
} }

3
include/verilated_threads.h
View File

@ -292,7 +292,8 @@ public:
return &(t_profilep->back()); return &(t_profilep->back());
} }
void profileAppendAll(const VlProfileRec& rec) VL_MT_SAFE_EXCLUDES(m_mutex); void profileAppendAll(const VlProfileRec& rec) VL_MT_SAFE_EXCLUDES(m_mutex);
void profileDump(const char* filenamep, vluint64_t ticksElapsed) VL_MT_SAFE_EXCLUDES(m_mutex); void profileDump(const char* filenamep, vluint64_t tickStart, vluint64_t tickEnd)
VL_MT_SAFE_EXCLUDES(m_mutex);
// In profiling mode, each executing thread must call // In profiling mode, each executing thread must call
// this once to setup profiling state: // this once to setup profiling state:
void setupProfilingClientThread() VL_MT_SAFE_EXCLUDES(m_mutex); void setupProfilingClientThread() VL_MT_SAFE_EXCLUDES(m_mutex);

9
src/V3EmitCModel.cpp
View File

@ -435,10 +435,11 @@ class EmitCModel final : public EmitCFunc {
puts(/**/ "}\n"); puts(/**/ "}\n");
puts(/**/ "else if (vlSymsp->__Vm_profile_window_ct == 0) {\n"); puts(/**/ "else if (vlSymsp->__Vm_profile_window_ct == 0) {\n");
// Ending file. // Ending file.
puts(/****/ "vluint64_t elapsed" puts(/****/ "vluint64_t tick_end = VL_RDTSC_Q();\n");
" = VL_RDTSC_Q() - vlSymsp->__Vm_profile_cycle_start;\n"); puts(/****/ "vlSymsp->__Vm_threadPoolp->profileDump("
puts(/****/ "vlSymsp->__Vm_threadPoolp->profileDump(vlSymsp->_vm_contextp__->" "vlSymsp->_vm_contextp__->profThreadsFilename().c_str(), "
"profThreadsFilename().c_str(), elapsed);\n"); "vlSymsp->__Vm_profile_cycle_start, "
"tick_end);\n");
// This turns off the test to enter the profiling code, but still // This turns off the test to enter the profiling code, but still
// allows the user to collect another profile by changing // allows the user to collect another profile by changing
// profThreadsStart // profThreadsStart

6
src/V3Partition.cpp
View File

@ -2711,8 +2711,7 @@ static void addMTaskToFunction(const ThreadSchedule& schedule, const uint32_t th
// Leave this if() here, as don't want to call VL_RDTSC_Q unless profiling // Leave this if() here, as don't want to call VL_RDTSC_Q unless profiling
addStrStmt("if (VL_UNLIKELY(vlSymsp->__Vm_profile_cycle_start)) {\n" + // addStrStmt("if (VL_UNLIKELY(vlSymsp->__Vm_profile_cycle_start)) {\n" + //
recName + " = vlSymsp->__Vm_threadPoolp->profileAppend();\n" + // recName + " = vlSymsp->__Vm_threadPoolp->profileAppend();\n" + //
recName + "->startRecord(VL_RDTSC_Q() - vlSymsp->__Vm_profile_cycle_start," recName + "->startRecord(VL_RDTSC_Q()," + //
+ //
" " + cvtToStr(mtaskp->id()) + "," + // " " + cvtToStr(mtaskp->id()) + "," + //
" " + cvtToStr(mtaskp->cost()) + ");\n" + // " " + cvtToStr(mtaskp->cost()) + ");\n" + //
"}\n"); "}\n");
@ -2727,8 +2726,7 @@ static void addMTaskToFunction(const ThreadSchedule& schedule, const uint32_t th
if (v3Global.opt.profThreads()) { if (v3Global.opt.profThreads()) {
// Leave this if() here, as don't want to call VL_RDTSC_Q unless profiling // Leave this if() here, as don't want to call VL_RDTSC_Q unless profiling
addStrStmt("if (VL_UNLIKELY(" + recName + ")) {\n" + // addStrStmt("if (VL_UNLIKELY(" + recName + ")) {\n" + //
recName + "->endRecord(VL_RDTSC_Q() - vlSymsp->__Vm_profile_cycle_start);\n" recName + "->endRecord(VL_RDTSC_Q());\n" + "}\n");
+ "}\n");
} }
// Flush message queue // Flush message queue