perf stat: define CHECK_ATTRS for easy attrs checking
PATCH 1/1 perf stat: define CHECK_ATTRS for easy attrs checking
CHECK_ATTRS is useful :
1. for multiple attrs checking
2. avoid repetition of PERF_TYPE_ and PERF_COUNT_ and save space
3. avoids line breakage
--- tools/perf/builtin-stat.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
tools/perf/builtin-stat.c +8 -10
@@ -96,6 +96,10 @@ static u64 walltime_nsecs_noise;static u64 runtime_cycles_avg;static u64 runtime_cycles_noise; +#define CHECK_ATTRS (t, c, counter) \ + (attrs[counter].type == PERF_TYPE_##t && \ + attrs[counter].config == PERF_COUNT_##c) +#define ERR_PERF_OPEN \ "Error: counter %d, sys_perf_counter_open() syscall returned with %d (%s)\n"
@@ -191,11 +195,9 @@ static void read_counter(int counter)/* * Save the full runtime - to allow normalization during printout: */ -if (attrs[counter].type ==PERF_TYPE_SOFTWARE && - attrs[counter].config ==PERF_COUNT_SW_TASK_CLOCK ) +if (CHECK_ATTRS (SOFTWARE ,SW_TASK_CLOCK , counter)) runtime_nsecs[run_idx] = count[0 ]; -if (attrs[counter].type ==PERF_TYPE_HARDWARE && - attrs[counter].config ==PERF_COUNT_HW_CPU_CYCLES ) +if (CHECK_ATTRS (HARDWARE ,HW_CPU_CYCLES , counter)) runtime_cycles[run_idx] = count[0 ]; }
@@ -254,9 +256,7 @@ static void nsec_printout(int counter, u64 *count, u64 *noise)fprintf (stderr," %14.6f %-24s" , msecs,event_name (counter)); -if (attrs[counter].type ==PERF_TYPE_SOFTWARE && - attrs[counter].config ==PERF_COUNT_SW_TASK_CLOCK ) { - +if (CHECK_ATTRS (SOFTWARE ,SW_TASK_CLOCK , counter)) {if (walltime_nsecs_avg)fprintf (stderr," # %10.3f CPUs " , (double )count[0 ] / (double )walltime_nsecs_avg);
@@ -269,9 +269,7 @@ static void abs_printout(int counter, u64 *count, u64 *noise)fprintf (stderr," %14Ld %-24s" , count[0 ],event_name (counter));if (runtime_cycles_avg && - attrs[counter].type ==PERF_TYPE_HARDWARE && - attrs[counter].config ==PERF_COUNT_HW_INSTRUCTIONS ) { - +CHECK_ATTRS (HARDWARE ,HW_INSTRUCTIONS , counter)) {fprintf (stderr," # %10.3f IPC " , (double )count[0 ] / (double )runtime_cycles_avg); }else {
Signature · 1 line
1.6.0.6
Quoted 15 lines · Jaswinder Singh Rajput
CHECK_ATTRSis useful :
1. for multiple attrs checking
2. avoid repetition ofPERF_TYPE_andPERF_COUNT_and save space
3. avoids line breakageSigned-off-by Jaswinder Singh Rajput <[email protected]>--- tools/perf/builtin-stat.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)tools/perf/builtin-stat.c +0
-0
tools/perf/builtin-stat.c static u64 walltime_nsecs_noise; · line 101
Quoted 6 lines
tools/perf/builtin-stat.c +3
-0@@ -96,6 +96,10 @@ static u64 walltime_nsecs_noise;static u64 runtime_cycles_avg;static u64 runtime_cycles_noise; +#define CHECK_ATTRS (t, c, counter) \ + (attrs[counter].type == PERF_TYPE_##t && \ + attrs[counter].config == PERF_COUNT_##c)
looks good except that the name should be something like MATCH_EVENT() not CHECK_ATTRS().
Ingo
Quoted 20 lines · Ingo Molnar
Quoted 18 lines · Jaswinder Singh Rajput
CHECK_ATTRSis useful :
1. for multiple attrs checking
2. avoid repetition ofPERF_TYPE_andPERF_COUNT_and save space
3. avoids line breakageSigned-off-by Jaswinder Singh Rajput <[email protected]>--- tools/perf/builtin-stat.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)tools/perf/builtin-stat.c +0
-0@@ -96,6 +96,10 @@ static u64 walltime_nsecs_noise;static u64 runtime_cycles_avg;static u64 runtime_cycles_noise;
Quoted 7 lines
tools/perf/builtin-stat.c static u64 walltime_nsecs_noise; · line 101
Quoted 3 lines
tools/perf/builtin-stat.c +3
-0+#define CHECK_ATTRS (t, c, counter) \ + (attrs[counter].type == PERF_TYPE_##t && \ + attrs[counter].config == PERF_COUNT_##c)looks good except that the name should be something like
MATCH_EVENT()notCHECK_ATTRS().
[PATCH -tip] perf stat: define MATCH_EVENT for easy attrs checking
MATCH_EVENT is useful :
1. for multiple attrs checking
2. avoid repetition of PERF_TYPE_ and PERF_COUNT_ and save space
3. avoids line breakage
--- tools/perf/builtin-stat.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
tools/perf/builtin-stat.c +8 -10
@@ -96,6 +96,10 @@ static u64 walltime_nsecs_noise;static u64 runtime_cycles_avg;static u64 runtime_cycles_noise; +#define MATCH_EVENT (t, c, counter) \ + (attrs[counter].type == PERF_TYPE_##t && \ + attrs[counter].config == PERF_COUNT_##c) +#define ERR_PERF_OPEN \ "Error: counter %d, sys_perf_counter_open() syscall returned with %d (%s)\n"
@@ -191,11 +195,9 @@ static void read_counter(int counter)/* * Save the full runtime - to allow normalization during printout: */ -if (attrs[counter].type ==PERF_TYPE_SOFTWARE && - attrs[counter].config ==PERF_COUNT_SW_TASK_CLOCK ) +if (MATCH_EVENT (SOFTWARE ,SW_TASK_CLOCK , counter)) runtime_nsecs[run_idx] = count[0 ]; -if (attrs[counter].type ==PERF_TYPE_HARDWARE && - attrs[counter].config ==PERF_COUNT_HW_CPU_CYCLES ) +if (MATCH_EVENT (HARDWARE ,HW_CPU_CYCLES , counter)) runtime_cycles[run_idx] = count[0 ]; }
@@ -254,9 +256,7 @@ static void nsec_printout(int counter, u64 *count, u64 *noise)fprintf (stderr," %14.6f %-24s" , msecs,event_name (counter)); -if (attrs[counter].type ==PERF_TYPE_SOFTWARE && - attrs[counter].config ==PERF_COUNT_SW_TASK_CLOCK ) { - +if (MATCH_EVENT (SOFTWARE ,SW_TASK_CLOCK , counter)) {if (walltime_nsecs_avg)fprintf (stderr," # %10.3f CPUs " , (double )count[0 ] / (double )walltime_nsecs_avg);
@@ -269,9 +269,7 @@ static void abs_printout(int counter, u64 *count, u64 *noise)fprintf (stderr," %14Ld %-24s" , count[0 ],event_name (counter));if (runtime_cycles_avg && - attrs[counter].type ==PERF_TYPE_HARDWARE && - attrs[counter].config ==PERF_COUNT_HW_INSTRUCTIONS ) { - +MATCH_EVENT (HARDWARE ,HW_INSTRUCTIONS , counter)) {fprintf (stderr," # %10.3f IPC " , (double )count[0 ] / (double )runtime_cycles_avg); }else {
Signature · 1 line
1.6.0.6