This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
openmp/runtime/test/ompt/
-
runtime/
-
test/
-
ompt/
-
callback.h

Differential D153031

[OpenMP][OMPT] Add missing ompt_mutex_t kinds to callback.h
ClosedPublic

Authored by Thyre on Jun 15 2023, 7:48 AM.

Download Raw Diff

Details

Reviewers

protze.joachim
tianshilei1992
jdoerfert
hbae
MaskRay

Summary

The callback header used for OMPT testing was missing the kinds
ompt_mutex_test_lock and ompt_mutex_test_nest_lock in the callback
functions on_ompt_callback_mutex_acquired and
on_ompt_callback_mutex_acquire. Added those two kinds.

Depends on D153028

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

Thyre created this revision.Jun 15 2023, 7:48 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 15 2023, 7:48 AM

Herald added subscribers: sunshaoce, guansong, yaxunl. · View Herald Transcript

Thyre requested review of this revision.Jun 15 2023, 7:48 AM

Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 15 2023, 7:48 AM

Herald added subscribers: openmp-commits, jplehr, sstefan1. · View Herald Transcript

Thyre added a child revision: D153032: [OpenMP][OMPT] Change OMPT kind for OpenMP test lock functions.Jun 15 2023, 7:50 AM

Harbormaster completed remote builds in B239133: Diff 531753.Jun 15 2023, 7:51 AM

Thyre added reviewers: hbae, MaskRay.Jun 26 2023, 12:17 AM

lgtm

This revision is now accepted and ready to land.Jun 26 2023, 12:59 AM

Thyre mentioned this in D153032: [OpenMP][OMPT] Change OMPT kind for OpenMP test lock functions.Jun 26 2023, 1:41 AM

Joachim Jenke <jenke@itc.rwth-aachen.de> mentioned this in rG124d36e09332: [OpenMP][OMPT] Change OMPT kind for OpenMP test lock functions.Jul 7 2023, 5:50 AM

Looks like a single commit cannot close multiple reviews.

Revision Contents

Path

Size

openmp/

runtime/

test/

ompt/

callback.h

24 lines

Diff 531753

openmp/runtime/test/ompt/callback.h

Show First 20 Lines • Show All 266 Lines • ▼ Show 20 Lines	on_ompt_callback_mutex_acquire(
switch(kind)		switch(kind)
{		{
case ompt_mutex_lock:		case ompt_mutex_lock:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_wait_lock: wait_id=%" PRIu64 ", hint=%" PRIu32		" ompt_event_wait_lock: wait_id=%" PRIu64 ", hint=%" PRIu32
", impl=%" PRIu32 ", codeptr_ra=%p \n",		", impl=%" PRIu32 ", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);		ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);
break;		break;
		case ompt_mutex_test_lock:
		printf("%" PRIu64 ":" _TOOL_PREFIX
		" ompt_event_wait_test_lock: wait_id=%" PRIu64 ", hint=%" PRIu32
		", impl=%" PRIu32 ", codeptr_ra=%p \n",
		ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);
		break;
case ompt_mutex_nest_lock:		case ompt_mutex_nest_lock:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_wait_nest_lock: wait_id=%" PRIu64 ", hint=%" PRIu32		" ompt_event_wait_nest_lock: wait_id=%" PRIu64 ", hint=%" PRIu32
", impl=%" PRIu32 ", codeptr_ra=%p \n",		", impl=%" PRIu32 ", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);		ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);
break;		break;
		case ompt_mutex_test_nest_lock:
		printf("%" PRIu64 ":" _TOOL_PREFIX
		" ompt_event_wait_test_nest_lock: wait_id=%" PRIu64
		", hint=%" PRIu32 ", impl=%" PRIu32 ", codeptr_ra=%p \n",
		ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);
		break;
case ompt_mutex_critical:		case ompt_mutex_critical:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_wait_critical: wait_id=%" PRIu64 ", hint=%" PRIu32		" ompt_event_wait_critical: wait_id=%" PRIu64 ", hint=%" PRIu32
", impl=%" PRIu32 ", codeptr_ra=%p \n",		", impl=%" PRIu32 ", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);		ompt_get_thread_data()->value, wait_id, hint, impl, codeptr_ra);
break;		break;
case ompt_mutex_atomic:		case ompt_mutex_atomic:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
Show All 20 Lines
{		{
switch(kind)		switch(kind)
{		{
case ompt_mutex_lock:		case ompt_mutex_lock:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_acquired_lock: wait_id=%" PRIu64 ", codeptr_ra=%p \n",		" ompt_event_acquired_lock: wait_id=%" PRIu64 ", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, codeptr_ra);		ompt_get_thread_data()->value, wait_id, codeptr_ra);
break;		break;
		case ompt_mutex_test_lock:
		printf("%" PRIu64 ":" _TOOL_PREFIX
		" ompt_event_acquired_test_lock: wait_id=%" PRIu64
		", codeptr_ra=%p \n",
		ompt_get_thread_data()->value, wait_id, codeptr_ra);
		break;
case ompt_mutex_nest_lock:		case ompt_mutex_nest_lock:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_acquired_nest_lock_first: wait_id=%" PRIu64		" ompt_event_acquired_nest_lock_first: wait_id=%" PRIu64
", codeptr_ra=%p \n",		", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, codeptr_ra);		ompt_get_thread_data()->value, wait_id, codeptr_ra);
break;		break;
		case ompt_mutex_test_nest_lock:
		printf("%" PRIu64 ":" _TOOL_PREFIX
		" ompt_event_acquired_test_nest_lock_first: wait_id=%" PRIu64
		", codeptr_ra=%p \n",
		ompt_get_thread_data()->value, wait_id, codeptr_ra);
		break;
case ompt_mutex_critical:		case ompt_mutex_critical:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
" ompt_event_acquired_critical: wait_id=%" PRIu64		" ompt_event_acquired_critical: wait_id=%" PRIu64
", codeptr_ra=%p \n",		", codeptr_ra=%p \n",
ompt_get_thread_data()->value, wait_id, codeptr_ra);		ompt_get_thread_data()->value, wait_id, codeptr_ra);
break;		break;
case ompt_mutex_atomic:		case ompt_mutex_atomic:
printf("%" PRIu64 ":" _TOOL_PREFIX		printf("%" PRIu64 ":" _TOOL_PREFIX
▲ Show 20 Lines • Show All 943 Lines • Show Last 20 Lines