|
 |
f7ba02 |
commit b78d7665bc02a0ce17adc6c09ab052064a940937
|
|
|
f7ba02 |
Author: Masahiko, Yamada <yamada.masahiko@fujitsu.com>
|
|
|
f7ba02 |
Date: Wed Dec 8 19:39:44 2021 +0900
|
|
|
f7ba02 |
|
|
|
f7ba02 |
Improve the papi_xml_event_info command.
|
|
|
f7ba02 |
|
|
|
f7ba02 |
Modify the papi_xml_event_info command as follows:.
|
|
|
f7ba02 |
- Test only the event name even if the event has a unit mask.
|
|
|
f7ba02 |
- Test other unit masks in the event even if
|
|
|
f7ba02 |
there is an error in one unit mask in the event.
|
|
|
f7ba02 |
|
|
|
f7ba02 |
Signed-off-by: Masahiko, Yamada <yamada.masahiko@fujitsu.com>
|
|
|
f7ba02 |
|
|
|
f7ba02 |
diff --git a/src/utils/papi_xml_event_info.c b/src/utils/papi_xml_event_info.c
|
|
|
f7ba02 |
index 2a777a9fe..c024cc036 100644
|
|
|
f7ba02 |
--- a/src/utils/papi_xml_event_info.c
|
|
|
f7ba02 |
+++ b/src/utils/papi_xml_event_info.c
|
|
|
f7ba02 |
@@ -226,9 +226,6 @@ enum_native_events( FILE * f, int cidx)
|
|
|
f7ba02 |
k = i;
|
|
|
f7ba02 |
if ( PAPI_enum_cmp_event( &k, PAPI_NTV_ENUM_UMASKS, cidx ) == PAPI_OK ) {
|
|
|
f7ba02 |
|
|
|
f7ba02 |
- /* Test if event can be added */
|
|
|
f7ba02 |
- if ( test_event( k ) == PAPI_OK ) {
|
|
|
f7ba02 |
-
|
|
|
f7ba02 |
/* add the event */
|
|
|
f7ba02 |
xmlize_event( f, &info, num );
|
|
|
f7ba02 |
|
|
|
f7ba02 |
@@ -237,13 +234,12 @@ enum_native_events( FILE * f, int cidx)
|
|
|
f7ba02 |
retval = PAPI_get_event_info( k, &info );
|
|
|
f7ba02 |
if ( retval == PAPI_OK ) {
|
|
|
f7ba02 |
if ( test_event( k )!=PAPI_OK ) {
|
|
|
f7ba02 |
- break;
|
|
|
f7ba02 |
+ continue;
|
|
|
f7ba02 |
}
|
|
|
f7ba02 |
xmlize_event( f, &info, -1 );
|
|
|
f7ba02 |
}
|
|
|
f7ba02 |
} while ( PAPI_enum_cmp_event( &k, PAPI_NTV_ENUM_UMASKS, cidx ) == PAPI_OK);
|
|
|
f7ba02 |
fprintf( f, " </event>\n" );
|
|
|
f7ba02 |
- }
|
|
|
f7ba02 |
} else {
|
|
|
f7ba02 |
/* this event has no unit masks; test & write the event */
|
|
|
f7ba02 |
if ( test_event( i ) == PAPI_OK ) {
|