Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/khuck/xpress-apex into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@khuck
khuck committed Jun 29, 2018
2 parents b6c5622 + 0128cbd commit d555ebc
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 16 deletions.
84 changes: 69 additions & 15 deletions src/apex/otf2_listener.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,13 @@ namespace apex {
parent_guid_ref, parent_name_ref, parent_desc_ref, OTF2_TYPE_UINT64);
}

inline void convert_upper(std::string& str, std::string& converted)
{
for(size_t i = 0; i < str.size(); ++i) {
converted += toupper(str[i]);
}
}

void otf2_listener::write_otf2_regions(void) {
// only write these out once!
static APEX_NATIVE_TLS bool written = false;
Expand All @@ -437,14 +444,26 @@ namespace apex {
string id = i.first;
uint64_t idx = i.second;
OTF2_GlobalDefWriter_WriteString( global_def_writer, get_string_index(id), id.c_str() );
size_t found = id.find(string("UNRESOLVED"));
OTF2_Paradigm paradigm = OTF2_PARADIGM_USER;
string uppercase;
convert_upper(id, uppercase);
size_t found = uppercase.find(string("APEX"));
if (found != std::string::npos) { paradigm = OTF2_PARADIGM_MEASUREMENT_SYSTEM; }
found = uppercase.find(string("UNRESOLVED"));
if (found != std::string::npos) { paradigm = OTF2_PARADIGM_MEASUREMENT_SYSTEM; }
found = uppercase.find(string("OPENMP"));
if (found != std::string::npos) { paradigm = OTF2_PARADIGM_OPENMP; }
found = uppercase.find(string("PTHREAD"));
if (found != std::string::npos) { paradigm = OTF2_PARADIGM_PTHREAD; }
found = uppercase.find(string("MPI"));
if (found != std::string::npos) { paradigm = OTF2_PARADIGM_MPI; }
OTF2_GlobalDefWriter_WriteRegion( global_def_writer,
idx /* id */,
get_string_index(id) /* region name */,
get_string_index(empty) /* alternative name */,
get_string_index(empty) /* description */,
(found != std::string::npos) ? OTF2_REGION_ROLE_ARTIFICIAL : OTF2_REGION_ROLE_TASK,
(found != std::string::npos) ? OTF2_PARADIGM_MEASUREMENT_SYSTEM : OTF2_PARADIGM_USER,
paradigm,
OTF2_REGION_FLAG_NONE,
get_string_index(empty) /* source file */,
get_string_index(empty) /* begin lno */,
Expand Down Expand Up @@ -812,6 +831,24 @@ namespace apex {
return;
}

#if APEX_HAVE_PAPI
void otf2_listener::write_papi_counters(OTF2_EvtWriter* writer, profiler* prof, uint64_t stamp) {
// create a union for storing the value
OTF2_MetricValue omv[1];
// tell the union what type this is
OTF2_Type omt[1];
omt[0]=OTF2_TYPE_DOUBLE;
int i = 0;
uint64_t idx = 0L;
for (auto metric : apex::instance()->the_profiler_listener->get_metric_names()) {
omv[0].floating_point = prof->papi_start_values[i++];
idx = get_metric_index(metric);
// write our counter into the event stream
OTF2_EC(OTF2_EvtWriter_Metric( writer, NULL, stamp, idx, 1, omt, omv ));
}
}
#endif

bool otf2_listener::on_start(std::shared_ptr<task_wrapper> &tt_ptr) {
task_identifier * id = tt_ptr->get_task_id();
// don't close the archive on us!
Expand All @@ -826,8 +863,9 @@ namespace apex {
// create an attribute
OTF2_AttributeList_AddUint64( al, 0, tt_ptr->guid );
OTF2_AttributeList_AddUint64( al, 1, tt_ptr->parent_guid );
uint64_t idx = get_region_index(id);
uint64_t stamp = 0L;
if (thread_instance::get_id() == 0) {
uint64_t idx = get_region_index(id);
// Because the event writer for thread 0 is also
// used for communication events and sampled values,
// we have to get a lock for it.
Expand All @@ -836,11 +874,19 @@ namespace apex {
// profiler object. bummer. it has to be taken after
// the lock is acquired, so that events happen on
// thread 0 in monotonic order.
uint64_t stamp = get_time();
stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Enter( local_evt_writer, al, stamp, idx /* region */ ));
#if APEX_HAVE_PAPI
// write PAPI metrics!
write_papi_counters(local_evt_writer, tt_ptr->prof, stamp);
#endif
} else {
uint64_t stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Enter( local_evt_writer, al, stamp, get_region_index(id) /* region */ ));
stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Enter( local_evt_writer, al, stamp, idx /* region */ ));
#if APEX_HAVE_PAPI
// write PAPI metrics!
write_papi_counters(local_evt_writer, tt_ptr->prof, stamp);
#endif
}
// delete the attribute list
OTF2_AttributeList_Delete(al);
Expand All @@ -864,22 +910,30 @@ namespace apex {
OTF2_AttributeList * al = OTF2_AttributeList_New();
// create an attribute
OTF2_AttributeList_AddUint64( al, 0, p->guid );
// unfortunately, we can't use the timestamp from the
// profiler object. bummer. it has to be taken after
// the lock is acquired, so that events happen on
// thread 0 in monotonic order.
uint64_t stamp = 0L;
uint64_t idx = get_region_index(p->get_task_id());
if (thread_instance::get_id() == 0) {
uint64_t idx = get_region_index(p->get_task_id());
// Because the event writer for thread 0 is also
// used for communication events and sampled values,
// we have to get a lock for it.
std::unique_lock<std::mutex> lock(_comm_mutex);
// unfortunately, we can't use the timestamp from the
// profiler object. bummer. it has to be taken after
// the lock is acquired, so that events happen on
// thread 0 in monotonic order.
uint64_t stamp = get_time();
stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Leave( local_evt_writer, al, stamp, idx /* region */ ));
#if APEX_HAVE_PAPI
// write PAPI metrics!
write_papi_counters(local_evt_writer, p.get(), stamp);
#endif
} else {
uint64_t stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Leave( local_evt_writer, al, stamp,
get_region_index(p->get_task_id()) /* region */ ));
stamp = get_time();
OTF2_EC(OTF2_EvtWriter_Leave( local_evt_writer, al, stamp, idx /* region */ ));
#if APEX_HAVE_PAPI
// write PAPI metrics!
write_papi_counters(local_evt_writer, p.get(), stamp);
#endif
}
// delete the attribute list
OTF2_AttributeList_Delete(al);
Expand Down
3 changes: 3 additions & 0 deletions src/apex/otf2_listener.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ namespace apex {
std::map<std::string,uint64_t> reduced_region_map;
std::map<std::string,uint64_t> reduced_metric_map;
std::unique_ptr<std::tuple<std::map<int,int>, std::map<int,std::string> > > reduce_node_properties(std::string&& str);
#if APEX_HAVE_PAPI
void write_papi_counters(OTF2_EvtWriter* writer, profiler* prof, uint64_t stamp);
#endif
public:
otf2_listener (void);
//~otf2_listener (void) { shutdown_event_data data(my_saved_node_id,0); on_shutdown(data); };
Expand Down
2 changes: 1 addition & 1 deletion src/apex/profiler.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class profiler {
guid(0),
is_counter(false),
is_resume(resume),
is_reset(reset), stopped(false) { };
is_reset(reset), stopped(false) { task->prof = this; };
// this constructor is for resetting profile values
profiler(task_identifier * id,
bool resume = false,
Expand Down
3 changes: 3 additions & 0 deletions src/apex/profiler_listener.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ class profiler_listener : public event_listener {
static void consumer_process_profiles_wrapper(void);
void public_process_profile(std::shared_ptr<profiler> &p) { process_profile(p,0); };
bool concurrent_cleanup(int i);
#if APEX_HAVE_PAPI
std::vector<std::string>& get_metric_names(void) { return metric_names; };
#endif
};

}
Expand Down

0 comments on commit d555ebc

Please sign in to comment.