Skip to content
Snippets Groups Projects
Commit 8fd46d1f authored by Ondrej Vysocky's avatar Ondrej Vysocky
Browse files

UPD MERIC region end function now requires region name

parent 4fa3946e
No related branches found
No related tags found
No related merge requests found
Pipeline #29162 failed
Stage: env
Stage: compile
Stage: run
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 7 deletions
instrument.h
+ 7
− 7
View file @ 8fd46d1f
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* Only one of the supported libraries can be selected, if none of them is * Only one of the supported libraries can be selected, if none of them is
* selected, then no instrumentation is inserted to the application's code. * selected, then no instrumentation is inserted to the application's code.
* *
* version 4.0 * version 4.1
* 25.03.2019 * 06.12.2022
* Ondrej Vysocky, ondrej.vysocky@vsb.cz * Ondrej Vysocky, ondrej.vysocky [at] vsb.cz
* IT4Innovations national supercomputing center, Czech Republic * IT4Innovations national supercomputing center, Czech Republic
**/ **/
...@@ -310,7 +310,7 @@ inline static double INSTRUMENT_RETURN_ZERO() ...@@ -310,7 +310,7 @@ inline static double INSTRUMENT_RETURN_ZERO()
// #define INSTRUMENT_REGION_DEFINE( handle, name, TAUtype_GEOPMhint, param ) // #define INSTRUMENT_REGION_DEFINE( handle, name, TAUtype_GEOPMhint, param )
#endif #endif
//INSTRUMENT_REGION_START(handle, name, SCOREPtype) //INSTRUMENT_REGION_START(handle, name, SCOREPtype)
#ifdef USE_SCOREP_MANUAL #ifdef USE_SCOREP_MANUAL
#define INSTRUMENT_REGION_START( handle, name, SCOREPtype ) \ #define INSTRUMENT_REGION_START( handle, name, SCOREPtype ) \
SCOREP_USER_REGION_BEGIN( handle, name, SCOREPtype ); SCOREP_USER_REGION_BEGIN( handle, name, SCOREPtype );
...@@ -353,7 +353,7 @@ inline static double INSTRUMENT_RETURN_ZERO() ...@@ -353,7 +353,7 @@ inline static double INSTRUMENT_RETURN_ZERO()
SCOREP_USER_REGION_END( handle ); SCOREP_USER_REGION_END( handle );
#elif defined USE_MERIC #elif defined USE_MERIC
#define INSTRUMENT_REGION_STOP( handle, name ) \ #define INSTRUMENT_REGION_STOP( handle, name ) \
MERIC_MeasureStop(); MERIC_MeasureStop( name );
#elif defined USE_TIMEPROF #elif defined USE_TIMEPROF
#define INSTRUMENT_REGION_STOP( handle, name ) \ #define INSTRUMENT_REGION_STOP( handle, name ) \
TIMEPROF_regionStop ( name ); TIMEPROF_regionStop ( name );
...@@ -395,7 +395,7 @@ inline static double INSTRUMENT_RETURN_ZERO() ...@@ -395,7 +395,7 @@ inline static double INSTRUMENT_RETURN_ZERO()
SCOREP_USER_REGION_BEGIN( start_handle, start_name, SCOREPtype ); SCOREP_USER_REGION_BEGIN( start_handle, start_name, SCOREPtype );
#elif defined USE_MERIC #elif defined USE_MERIC
#define INSTRUMENT_REGION_STOP_START( stop_handle, stop_name, start_handle, start_name, SCOREPtype ) \ #define INSTRUMENT_REGION_STOP_START( stop_handle, stop_name, start_handle, start_name, SCOREPtype ) \
MERIC_MeasureStopStart( start_name ); MERIC_MeasureStopStart( stop_name, start_name );
#elif defined USE_TIMEPROF #elif defined USE_TIMEPROF
#define INSTRUMENT_REGION_STOP_START( stop_handle, stop_name, start_handle, start_name, SCOREPtype ) \ #define INSTRUMENT_REGION_STOP_START( stop_handle, stop_name, start_handle, start_name, SCOREPtype ) \
TIMEPROF_regionStop ( stop_name ); \ TIMEPROF_regionStop ( stop_name ); \
...@@ -483,7 +483,7 @@ inline static double INSTRUMENT_RETURN_ZERO() ...@@ -483,7 +483,7 @@ inline static double INSTRUMENT_RETURN_ZERO()
SCOREP_USER_OA_PHASE_END( handle ); SCOREP_USER_OA_PHASE_END( handle );
#elif defined USE_MERIC #elif defined USE_MERIC
#define INSTRUMENT_PHASE_STOP( handle, name ) \ #define INSTRUMENT_PHASE_STOP( handle, name ) \
MERIC_MeasureStop(); MERIC_MeasureStop( name );
#elif defined USE_TAU #elif defined USE_TAU
#define INSTRUMENT_PHASE_STOP( handle, name ) \ #define INSTRUMENT_PHASE_STOP( handle, name ) \
INSTRUMENT_RETURN_ZERO(); \ INSTRUMENT_RETURN_ZERO(); \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment