This is an archive of the discontinued LLVM Phabricator instance.

Correct an incorrect OMPT ifdef
ClosedPublic

Authored by jmellorcrummey on Sep 16 2015, 12:25 PM.

Reviewers

openmp-commits
omalyshe

Commits

Summary

An ifdef for OMPT_TRACE needs to be OMPT_BLAME so that both instances of a callback are controlled by the same ifdef.

jmellorcrummey retitled this revision from to Correct an incorrect OMPT ifdef .

jmellorcrummey updated this object.

jmellorcrummey set the repository for this revision to rL LLVM.

LGTM.

This revision is now accepted and ready to land.Sep 17 2015, 2:11 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

openmp/

trunk/

runtime/

src/

2 lines

	Show First 20 Lines • Show All 1,508 Lines • ▼ Show 20 Lines
	#endif /* KMP_DEBUG */			#endif /* KMP_DEBUG */

	// TODO now, mark worker threads as done so they may be disbanded			// TODO now, mark worker threads as done so they may be disbanded
	KMP_MB(); // Flush all pending memory write invalidates.			KMP_MB(); // Flush all pending memory write invalidates.
	KA_TRACE(10, ("__kmp_join_barrier: T#%d(%d:%d) leaving\n", gtid, team_id, tid));			KA_TRACE(10, ("__kmp_join_barrier: T#%d(%d:%d) leaving\n", gtid, team_id, tid));

	#if OMPT_SUPPORT			#if OMPT_SUPPORT
	if (ompt_status & ompt_status_track) {			if (ompt_status & ompt_status_track) {
	#if OMPT_TRACE			#if OMPT_BLAME
	if ((ompt_status == ompt_status_track_callback) &&			if ((ompt_status == ompt_status_track_callback) &&
	ompt_callbacks.ompt_callback(ompt_event_barrier_end)) {			ompt_callbacks.ompt_callback(ompt_event_barrier_end)) {
	ompt_callbacks.ompt_callback(ompt_event_barrier_end)(			ompt_callbacks.ompt_callback(ompt_event_barrier_end)(
	team->t.ompt_team_info.parallel_id,			team->t.ompt_team_info.parallel_id,
	team->t.t_implicit_task_taskdata[tid].ompt_task_info.task_id);			team->t.t_implicit_task_taskdata[tid].ompt_task_info.task_id);
	}			}
	#endif			#endif

	▲ Show 20 Lines • Show All 216 Lines • Show Last 20 Lines