ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

timings: Fix timings when 'prefix' is used

Просмотр исходного кода 
Signed-off-by: Artem Polyakov <artpol84@gmail.com>
(cherry picked from commit 7c17a38c96db6da1c28d6c46d9293124dee6a23c)
Этот коммит содержится в:
Artem Polyakov 2020-03-07 09:16:20 -08:00
родитель 65219ebaa6
Коммит 253502b1b1
2 изменённых файлов: 21 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
ompi/util/timings.h
Просмотреть файл

@ -120,7 +120,7 @@ typedef struct ompi_timing_t {
} \ } \
} while(0) } while(0)
#define OMPI_TIMING_APPEND(filename,func,desc,ts) \ #define OMPI_TIMING_APPEND_PREFIX(filename, _prefix, func,desc,ts) \
do { \ do { \
if (OMPI_TIMING.cur_timing->use >= OMPI_TIMING.size){ \ if (OMPI_TIMING.cur_timing->use >= OMPI_TIMING.size){ \
OMPI_TIMING_ITEM_EXTEND; \ OMPI_TIMING_ITEM_EXTEND; \
@ -130,7 +130,12 @@ typedef struct ompi_timing_t {
if (len >= OPAL_TIMING_STR_LEN) { \ if (len >= OPAL_TIMING_STR_LEN) { \
OMPI_TIMING.error = 1; \ OMPI_TIMING.error = 1; \
} \ } \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].prefix = func; \ if( _prefix[0] ) { \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].prefix = \
func "/" _prefix; \
} else { \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].prefix = func;\
} \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].file = filename; \ OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].file = filename; \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use++].ts = ts; \ OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use++].ts = ts; \
OMPI_TIMING.cnt++; \ OMPI_TIMING.cnt++; \
@ -143,14 +148,14 @@ typedef struct ompi_timing_t {
int i; \ int i; \
double ts; \ double ts; \
OMPI_TIMING.import_cnt++; \ OMPI_TIMING.import_cnt++; \
OPAL_TIMING_ENV_CNT(func, cnt); \ OPAL_TIMING_ENV_CNT_PREFIX(_prefix, func, cnt); \
OPAL_TIMING_ENV_ERROR_PREFIX(_prefix, func, OMPI_TIMING.error); \ OPAL_TIMING_ENV_ERROR_PREFIX(_prefix, func, OMPI_TIMING.error); \
for(i = 0; i < cnt; i++){ \ for(i = 0; i < cnt; i++){ \
char *desc, *filename; \ char *desc, *filename; \
OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].imported= \ OMPI_TIMING.cur_timing->val[OMPI_TIMING.cur_timing->use].imported= \
OMPI_TIMING.import_cnt; \ OMPI_TIMING.import_cnt; \
OPAL_TIMING_ENV_GETDESC_PREFIX(_prefix, &filename, func, i, &desc, ts); \ OPAL_TIMING_ENV_GETDESC_PREFIX(_prefix, &filename, func, i, &desc, ts); \
OMPI_TIMING_APPEND(filename, func, desc, ts); \ OMPI_TIMING_APPEND_PREFIX(filename, _prefix, func, desc, ts); \
} \ } \
} \ } \
} while(0) } while(0)
@ -275,6 +280,8 @@ typedef struct ompi_timing_t {
#define OMPI_TIMING_IMPORT_OPAL(func) #define OMPI_TIMING_IMPORT_OPAL(func)
#define OMPI_TIMING_IMPORT_OPAL_PREFIX(_prefix, func)
#define OMPI_TIMING_FINALIZE #define OMPI_TIMING_FINALIZE
#define OMPI_TIMING_ENABLED 0 #define OMPI_TIMING_ENABLED 0

28
opal/util/timings.h
Просмотреть файл

@ -49,11 +49,11 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
_prefix = ""; \ _prefix = ""; \
} \ } \
(_nm)->error = 0; \ (_nm)->error = 0; \
n = snprintf((_nm)->id, OPAL_TIMING_STR_LEN, "%s%s", _prefix, func); \ n = snprintf((_nm)->id, OPAL_TIMING_STR_LEN, "%s_%s", _prefix, func); \
if( n > OPAL_TIMING_STR_LEN ){ \ if( n > OPAL_TIMING_STR_LEN ){ \
(_nm)->error = 1; \ (_nm)->error = 1; \
} \ } \
n = sprintf((_nm)->cntr_env,"OMPI_TIMING_%s%s_CNT", prefix, (_nm)->id); \ n = sprintf((_nm)->cntr_env,"OMPI_TIMING_%s_CNT", (_nm)->id); \
if( n > OPAL_TIMING_STR_LEN ){ \ if( n > OPAL_TIMING_STR_LEN ){ \
(_nm)->error = 1; \ (_nm)->error = 1; \
} \ } \
@ -77,11 +77,6 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
} \ } \
} while(0) } while(0)
#define OPAL_TIMING_ENV_INIT(name) \
opal_timing_env_t name ## _val, *name = &(name ## _val); \
OPAL_TIMING_ENV_START_TYPE(__func__, name, OPAL_TIMING_AUTOMATIC_TIMER, "");
/* We use function names for identification /* We use function names for identification
* however this might be a problem for the private * however this might be a problem for the private
* functions declared as static as their names may * functions declared as static as their names may
@ -89,10 +84,10 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
* Use prefix to do a finer-grained identification if needed * Use prefix to do a finer-grained identification if needed
*/ */
#define OPAL_TIMING_ENV_INIT_PREFIX(prefix, name) \ #define OPAL_TIMING_ENV_INIT_PREFIX(prefix, name) \
do { \ opal_timing_env_t name ## _val, *name = &(name ## _val); \
opal_timing_env_t name ## _val, *name = &(name ## _val); \ OPAL_TIMING_ENV_START_TYPE(__func__, name, OPAL_TIMING_AUTOMATIC_TIMER, prefix);
*name = OPAL_TIMING_ENV_START_TYPE(__func__, name, OPAL_TIMING_AUTOMATIC_TIMER, prefix); \
} while(0) #define OPAL_TIMING_ENV_INIT(name) OPAL_TIMING_ENV_INIT_PREFIX("", name)
#define OPAL_TIMING_ENV_NEXT(h, ...) \ #define OPAL_TIMING_ENV_NEXT(h, ...) \
do { \ do { \
@ -161,7 +156,7 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
do { \ do { \
char ename[OPAL_TIMING_STR_LEN]; \ char ename[OPAL_TIMING_STR_LEN]; \
char *ptr = NULL; \ char *ptr = NULL; \
int n = snprintf(ename, OPAL_TIMING_STR_LEN, "OMPI_TIMING_%s%s_CNT", prefix, func); \ int n = snprintf(ename, OPAL_TIMING_STR_LEN, "OMPI_TIMING_%s_%s_CNT", prefix, func); \
(_cnt) = 0; \ (_cnt) = 0; \
if ( n <= OPAL_TIMING_STR_LEN ){ \ if ( n <= OPAL_TIMING_STR_LEN ){ \
ptr = getenv(ename); \ ptr = getenv(ename); \
@ -181,18 +176,15 @@ opal_timing_ts_func_t opal_timing_ts_func(opal_timer_type_t type);
} \ } \
} while(0) } while(0)
#define OPAL_TIMING_ENV_CNT(func, _cnt) \
OPAL_TIMING_ENV_CNT_PREFIX("", func, _cnt)
#define OPAL_TIMING_ENV_GETDESC_PREFIX(prefix, filename, func, i, desc, _t) \ #define OPAL_TIMING_ENV_GETDESC_PREFIX(prefix, filename, func, i, desc, _t) \
do { \ do { \
char vname[OPAL_TIMING_STR_LEN]; \ char vname[OPAL_TIMING_STR_LEN]; \
(_t) = 0.0; \ (_t) = 0.0; \
sprintf(vname, "OMPI_TIMING_%s%s_FILE_%d", prefix, func, i); \ sprintf(vname, "OMPI_TIMING_%s_%s_FILE_%d", prefix, func, i); \
*filename = getenv(vname); \ *filename = getenv(vname); \
sprintf(vname, "OMPI_TIMING_%s%s_DESC_%d", prefix, func, i); \ sprintf(vname, "OMPI_TIMING_%s_%s_DESC_%d", prefix, func, i); \
*desc = getenv(vname); \ *desc = getenv(vname); \
sprintf(vname, "OMPI_TIMING_%s%s_VAL_%d", prefix, func, i); \ sprintf(vname, "OMPI_TIMING_%s_%s_VAL_%d", prefix, func, i); \
char *ptr = getenv(vname); \ char *ptr = getenv(vname); \
if ( NULL != ptr ) { \ if ( NULL != ptr ) { \
sscanf(ptr,"%lf", &(_t)); \ sscanf(ptr,"%lf", &(_t)); \