Skip to content

Add detailed timers for gathering and delivering secondary events #3097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heplesser merged 1 commit into from
Feb 14, 2024
Merged

Add detailed timers for gathering and delivering secondary events #3097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nestkernel/nest_names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,9 @@ const Name time_communicate_spike_data( "time_communicate_spike_data" );
const Name time_communicate_target_data( "time_communicate_target_data" );
const Name time_construction_connect( "time_construction_connect" );
const Name time_construction_create( "time_construction_create" );
const Name time_deliver_secondary_data( "time_deliver_secondary_data" );
const Name time_deliver_spike_data( "time_deliver_spike_data" );
const Name time_gather_secondary_data( "time_gather_secondary_data" );
const Name time_gather_spike_data( "time_gather_spike_data" );
const Name time_gather_target_data( "time_gather_target_data" );
const Name time_in_steps( "time_in_steps" );
Expand Down
2 changes: 2 additions & 0 deletions nestkernel/nest_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,9 @@ extern const Name time_communicate_spike_data;
extern const Name time_communicate_target_data;
extern const Name time_construction_connect;
extern const Name time_construction_create;
extern const Name time_deliver_secondary_data;
extern const Name time_deliver_spike_data;
extern const Name time_gather_secondary_data;
extern const Name time_gather_spike_data;
extern const Name time_gather_target_data;
extern const Name time_in_steps;
Expand Down
22 changes: 22 additions & 0 deletions nestkernel/simulation_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ nest::SimulationManager::reset_timers_for_dynamics()
sw_simulate_.reset();
#ifdef TIMER_DETAILED
sw_gather_spike_data_.reset();
sw_gather_secondary_data_.reset();
sw_update_.reset();
sw_deliver_spike_data_.reset();
sw_deliver_secondary_data_.reset();
#endif
}

Expand Down Expand Up @@ -443,9 +445,11 @@ nest::SimulationManager::get_status( DictionaryDatum& d )
def< double >( d, names::time_communicate_prepare, sw_communicate_prepare_.elapsed() );
#ifdef TIMER_DETAILED
def< double >( d, names::time_gather_spike_data, sw_gather_spike_data_.elapsed() );
def< double >( d, names::time_gather_secondary_data, sw_gather_secondary_data_.elapsed() );
def< double >( d, names::time_update, sw_update_.elapsed() );
def< double >( d, names::time_gather_target_data, sw_gather_target_data_.elapsed() );
def< double >( d, names::time_deliver_spike_data, sw_deliver_spike_data_.elapsed() );
def< double >( d, names::time_deliver_secondary_data, sw_deliver_secondary_data_.elapsed() );
#endif
}

Expand Down Expand Up @@ -841,7 +845,19 @@ nest::SimulationManager::update_()
}
if ( kernel().connection_manager.secondary_connections_exist() )
{
#ifdef TIMER_DETAILED
if ( tid == 0 )
{
sw_deliver_secondary_data_.start();
}
#endif
kernel().event_delivery_manager.deliver_secondary_events( tid, false );
#ifdef TIMER_DETAILED
if ( tid == 0 )
{
sw_deliver_secondary_data_.stop();
}
#endif
}


Expand Down Expand Up @@ -1044,8 +1060,14 @@ nest::SimulationManager::update_()
}
if ( kernel().connection_manager.secondary_connections_exist() )
{
#ifdef TIMER_DETAILED
sw_gather_secondary_data_.start();
#endif
kernel().event_delivery_manager.gather_secondary_events( true );
}
#ifdef TIMER_DETAILED
sw_gather_secondary_data_.stop();
#endif
}


Expand Down
2 changes: 2 additions & 0 deletions nestkernel/simulation_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,11 @@ class SimulationManager : public ManagerInterface
#ifdef TIMER_DETAILED
// intended for internal core developers, not for use in the public API
Stopwatch sw_gather_spike_data_;
Stopwatch sw_gather_secondary_data_;
Stopwatch sw_update_;
Stopwatch sw_gather_target_data_;
Stopwatch sw_deliver_spike_data_;
Stopwatch sw_deliver_secondary_data_;
#endif
};

Expand Down