perf s390-sample-raw: Cache counter names
Ian Rogers
reviewerPATCH v3 1/1 perf s390-sample-raw: Cache counter names
Searching all event names is slower now that legacy names are included. Add a cache to avoid long iterative searches.
---
v3: Fix minor comment typo, add Thomas' tag.
v2: Small tweak to the cache_key, just make it match the wanted event value.
--- tools/perf/util/s390-sample-raw.c | 56 ++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 5 deletions(-)
tools/perf/util/s390-sample-raw.c +51 -5
@@ -19,12 +19,14 @@#include <sys/stat.h> #include <linux/compiler.h> +#include <linux/err.h> #include <asm/byteorder.h> #include "debug.h" #include "session.h" #include "evlist.h" #include "color.h" +#include "hashmap.h" #include "sample-raw.h" #include "s390-cpumcf-kernel.h" #include "util/pmu.h"
@@ -132,8 +134,8 @@ static int get_counterset_start(int setnr) }struct get_counter_name_data { -int wanted; -char *result; +long wanted; +const char *result; };static int get_counter_name_callback (void *vdata,struct pmu_event_info *info)
@@ -151,12 +153,22 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info) rc =sscanf (event_str,"event=%x" , &event_nr);if (rc ==1 && event_nr == data->wanted) { - data->result =strdup (info->name); + data->result = info->name;return 1 ;/* Terminate the search. */ }return 0 ; } +static size_t get_counter_name_hash_fn (long key,void *ctx__maybe_unused ) +{ +return key; +} + +static bool get_counter_name_hashmap_equal_fn (long key1,long key2,void *ctx__maybe_unused ) +{ +return key1 == key2; +} +/* Scan the PMU and extract the logical name of a counter from the event. Input * is the counter set and counter number with in the set. Construct the event * number and use this as key. If they match return the name of this counter.
@@ -164,17 +176,51 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)*/ static char *get_counter_name (int set,int nr,struct perf_pmu *pmu) { +static struct hashmap *cache; +static struct perf_pmu *cache_pmu; +long cache_key =get_counterset_start (set) + nr;struct get_counter_name_data data = { - .wanted =get_counterset_start (set) + nr, + .wanted = cache_key, .result =NULL , }; +char *result =NULL ;if (!pmu)return NULL ; +if (cache_pmu == pmu &&hashmap__find (cache, cache_key, &result)) +return strdup (result); +perf_pmu__for_each_event (pmu,/*skip_duplicate_pmus=*/ true, &data, get_counter_name_callback); -return data.result; + +if (data.result) + result =strdup (data.result); + +if (cache_pmu ==NULL ) { +struct hashmap *tmp =hashmap__new (get_counter_name_hash_fn, + get_counter_name_hashmap_equal_fn, +/*ctx=*/ NULL ); + +if (!IS_ERR (cache)) { + cache = tmp; + cache_pmu = pmu; + } + } + +if (cache_pmu == pmu) { +char *old_value =NULL , *new_value =strdup (result); + +if (new_value) { +hashmap__set (cache, cache_key, new_value,/*old_key=*/ NULL , &old_value); +/* +* Free in case of a race, but resizing would be broken +* in that case. +*/ +free (old_value); + } + } +return result; }static void s390_cpumcfdg_dump (struct perf_pmu *pmu,struct perf_sample *sample)
Signature · 1 line
2.51.1.930.gacf6e81ea2-goog
Namhyung Kim
maintainerHi Ian,
Quoted 91 lines · Ian Rogers
Searching all event names is slower now that legacy names are included. Add a cache to avoid long iterative searches.
Reported-by Thomas Richter <[email protected]>Signed-off-by Ian Rogers <[email protected]>Tested-by Thomas Richter <[email protected]>---
v3: Fix minor comment typo, add Thomas' tag.
v2: Small tweak to thecache_key, just make it match the wanted event value.--- tools/perf/util/s390-sample-raw.c | 56 ++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 5 deletions(-)tools/perf/util/s390-sample-raw.c +23
-5@@ -19,12 +19,14 @@#include <sys/stat.h> #include <linux/compiler.h> +#include <linux/err.h> #include <asm/byteorder.h> #include "debug.h" #include "session.h" #include "evlist.h" #include "color.h" +#include "hashmap.h" #include "sample-raw.h" #include "s390-cpumcf-kernel.h" #include "util/pmu.h" @@ -132,8 +134,8 @@ static int get_counterset_start(int setnr) }struct get_counter_name_data { -int wanted; -char *result; +long wanted; +const char *result; };static int get_counter_name_callback (void *vdata,struct pmu_event_info *info)@@ -151,12 +153,22 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info) rc =sscanf (event_str,"event=%x" , &event_nr);if (rc ==1 && event_nr == data->wanted) { - data->result =strdup (info->name); + data->result = info->name;return 1 ;/* Terminate the search. */ }return 0 ; } +static size_t get_counter_name_hash_fn (long key,void *ctx__maybe_unused ) +{ +return key; +} + +static bool get_counter_name_hashmap_equal_fn (long key1,long key2,void *ctx__maybe_unused ) +{ +return key1 == key2; +} +/* Scan the PMU and extract the logical name of a counter from the event. Input * is the counter set and counter number with in the set. Construct the event * number and use this as key. If they match return the name of this counter. @@ -164,17 +176,51 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)*/ static char *get_counter_name (int set,int nr,struct perf_pmu *pmu) { +static struct hashmap *cache; +static struct perf_pmu *cache_pmu; +long cache_key =get_counterset_start (set) + nr;struct get_counter_name_data data = { - .wanted =get_counterset_start (set) + nr, + .wanted = cache_key, .result =NULL , }; +char *result =NULL ;if (!pmu)return NULL ; +if (cache_pmu == pmu &&hashmap__find (cache, cache_key, &result)) +return strdup (result); +perf_pmu__for_each_event (pmu,/*skip_duplicate_pmus=*/ true, &data, get_counter_name_callback); -return data.result;
tools/perf/util/s390-sample-raw.c static int get_counter_name_callback(void *vdata, struct pmu_event_info *info) · line 205
Quoted 10 lines
tools/perf/util/s390-sample-raw.c +10
-0+ +if (data.result) + result =strdup (data.result); + +if (cache_pmu ==NULL ) { +struct hashmap *tmp =hashmap__new (get_counter_name_hash_fn, + get_counter_name_hashmap_equal_fn, +/*ctx=*/ NULL ); + +if (!IS_ERR (cache)) {
Shouldn't it be if (!IS_ERR(tmp)) ?
And it's not released.
Thanks,
Namhyung
Quoted 24 lines
tools/perf/util/s390-sample-raw.c +18
-0+ cache = tmp; + cache_pmu = pmu; + } + } + +if (cache_pmu == pmu) { +char *old_value =NULL , *new_value =strdup (result); + +if (new_value) { +hashmap__set (cache, cache_key, new_value,/*old_key=*/ NULL , &old_value); +/* +* Free in case of a race, but resizing would be broken +* in that case. +*/ +free (old_value); + } + } +return result; }static void s390_cpumcfdg_dump (struct perf_pmu *pmu,struct perf_sample *sample)Signature · 1 line
2.51.1.930.gacf6e81ea2-goog
Ian Rogers
reviewerQuoted 99 lines · Namhyung Kim
Hi Ian,
Quoted 95 lines · Ian Rogers
Searching all event names is slower now that legacy names are included. Add a cache to avoid long iterative searches.
Reported-by Thomas Richter <[email protected]>Signed-off-by Ian Rogers <[email protected]>Tested-by Thomas Richter <[email protected]>---
v3: Fix minor comment typo, add Thomas' tag.
v2: Small tweak to thecache_key, just make it match the wanted event value.--- tools/perf/util/s390-sample-raw.c | 56 ++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 5 deletions(-)tools/perf/util/s390-sample-raw.c +27
-5@@ -19,12 +19,14 @@#include <sys/stat.h> #include <linux/compiler.h> +#include <linux/err.h> #include <asm/byteorder.h> #include "debug.h" #include "session.h" #include "evlist.h" #include "color.h" +#include "hashmap.h" #include "sample-raw.h" #include "s390-cpumcf-kernel.h" #include "util/pmu.h" @@ -132,8 +134,8 @@ static int get_counterset_start(int setnr) }struct get_counter_name_data { -int wanted; -char *result; +long wanted; +const char *result; };static int get_counter_name_callback (void *vdata,struct pmu_event_info *info)@@ -151,12 +153,22 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info) rc =sscanf (event_str,"event=%x" , &event_nr);if (rc ==1 && event_nr == data->wanted) { - data->result =strdup (info->name); + data->result = info->name;return 1 ;/* Terminate the search. */ }return 0 ; } +static size_t get_counter_name_hash_fn (long key,void *ctx__maybe_unused ) +{ +return key; +} + +static bool get_counter_name_hashmap_equal_fn (long key1,long key2,void *ctx__maybe_unused ) +{ +return key1 == key2; +} +/* Scan the PMU and extract the logical name of a counter from the event. Input * is the counter set and counter number with in the set. Construct the event * number and use this as key. If they match return the name of this counter. @@ -164,17 +176,51 @@ static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)*/ static char *get_counter_name (int set,int nr,struct perf_pmu *pmu) { +static struct hashmap *cache; +static struct perf_pmu *cache_pmu; +long cache_key =get_counterset_start (set) + nr;struct get_counter_name_data data = { - .wanted =get_counterset_start (set) + nr, + .wanted = cache_key, .result =NULL , }; +char *result =NULL ;if (!pmu)return NULL ; +if (cache_pmu == pmu &&hashmap__find (cache, cache_key, &result)) +return strdup (result); +perf_pmu__for_each_event (pmu,/*skip_duplicate_pmus=*/ true, &data, get_counter_name_callback); -return data.result; + +if (data.result) + result =strdup (data.result); +
Quoted 8 lines
tools/perf/util/s390-sample-raw.c static int get_counter_name_callback(void *vdata, struct pmu_event_info *info) · line 205
Quoted 6 lines
tools/perf/util/s390-sample-raw.c +6
-0+if (cache_pmu ==NULL ) { +struct hashmap *tmp =hashmap__new (get_counter_name_hash_fn, + get_counter_name_hashmap_equal_fn, +/*ctx=*/ NULL ); + +if (!IS_ERR (cache)) {Shouldn't it be if (!IS_ERR(tmp)) ?
Yeah, that's me trying to make the code less racy. Will fix in v4.
Quoted 1 line
And it's not released.
It's just a global leak for the sake of performance, similar to pmus, ...
Thanks,
Ian
Quoted 27 lines
Thanks,
NamhyungQuoted 24 lines
tools/perf/util/s390-sample-raw.c +18
-1+ cache = tmp; + cache_pmu = pmu; + } + } + +if (cache_pmu == pmu) { +char *old_value =NULL , *new_value =strdup (result); + +if (new_value) { +hashmap__set (cache, cache_key, new_value,/*old_key=*/ NULL , &old_value); +/* +* Free in case of a race, but resizing would be broken +* in that case. +*/ +free (old_value); + } + } +return result; }static void s390_cpumcfdg_dump (struct perf_pmu *pmu,struct perf_sample *sample) --2.51.1.930.gacf6e81ea2-goog