On 07/16/2016 04:15 AM, Qiaowei Ren wrote:
> With current perf framework, this patch adds support to more perf
> events, including cache misses, cache references, cpu cycles,
> instrctions, etc..
>
> Signed-off-by: Qiaowei Ren <qiaowei.ren@xxxxxxxxx>
> ---
> docs/formatdomain.html.in | 24 ++++++++++++++++++
> docs/schemas/domaincommon.rng | 4 +++
> include/libvirt/libvirt-domain.h | 39 +++++++++++++++++++++++++++++
> src/libvirt-domain.c | 8 ++++++
> src/qemu/qemu_driver.c | 4 +++
> src/util/virperf.c | 16 +++++++++++-
> src/util/virperf.h | 5 ++++
> tests/genericxml2xmlindata/generic-perf.xml | 4 +++
> 8 files changed, 103 insertions(+), 1 deletion(-)
>
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index 59a8bb9..53a0809 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -1842,6 +1842,10 @@
> <event name='cmt' enabled='yes'/>
> <event name='mbmt' enabled='no'/>
> <event name='mbml' enabled='yes'/>
> + <event name='cpu_cycles' enabled='no'/>
> + <event name='instructions' enabled='yes'/>
> + <event name='cache_references' enabled='no'/>
> + <event name='cache_misses' enabled='no'/>
> </perf>
> ...
> </pre>
> @@ -1867,6 +1871,26 @@
> <td>bandwidth of memory traffic for a memory controller</td>
> <td><code>perf.mbml</code></td>
> </tr>
> + <tr>
> + <td><code>cpu_cycles</code></td>
> + <td>the number of cpu cycles one instruction needs</td>
> + <td><code>perf.cpu_cycles</code></td>
> + </tr>
> + <tr>
> + <td><code>instructions</code></td>
> + <td>the count of instructions by applications running on the platform</td>
> + <td><code>perf.instructions</code></td>
> + </tr>
> + <tr>
> + <td><code>cache_references</code></td>
> + <td>the count of cache hits by applications running on the platform</td>
> + <td><code>perf.cache_references</code></td>
> + </tr>
> + <tr>
> + <td><code>cache_misses</code></td>
> + <td>the count of cache misses by applications running on the platform</td>
> + <td><code>perf.cache_misses</code></td>
> + </tr>
> </table>
>
> <h3><a name="elementsDevices">Devices</a></h3>
> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
> index 348dbfe..be8ebb5 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -414,6 +414,10 @@
> <value>cmt</value>
> <value>mbmt</value>
> <value>mbml</value>
> + <value>cpu_cycles</value>
> + <value>instructions</value>
> + <value>cache_references</value>
> + <value>cache_misses</value>
> </choice>
> </attribute>
> <attribute name="enabled">
> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
> index 7ea93aa..0002d99 100644
> --- a/include/libvirt/libvirt-domain.h
> +++ b/include/libvirt/libvirt-domain.h
> @@ -1947,6 +1947,45 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
> */
> # define VIR_PERF_PARAM_MBML "mbml"
>
> +/**
> + * VIR_PERF_PARAM_CACHE_MISSES:
> + *
> + * Macro for typed parameter name that represents cache_misses perf
> + * event which can be used to measure the count of cache misses by
> + * applications running on the platform. It corresponds to the
> + * "perf.cache_misses" field in the *Stats APIs.
> + */
> +# define VIR_PERF_PARAM_CACHE_MISSES "cache_misses"
> +
> +/**
> + * VIR_PERF_PARAM_CACHE_REFERENCES:
> + *
> + * Macro for typed parameter name that represents cache_references
> + * perf event which can be used to measure the count of cache hits
> + * by applications running on the platform. It corresponds to the
> + * "perf.cache_references" field in the *Stats APIs.
> + */
> +# define VIR_PERF_PARAM_CACHE_REFERENCES "cache_references"
> +
> +/**
> + * VIR_PERF_PARAM_INSTRUCTIONS:
> + *
> + * Macro for typed parameter name that represents instructions perf
> + * event which can be used to measure the count of instructions
> + * by applications running on the platform. It corresponds to the
> + * "perf.instructions" field in the *Stats APIs.
> + */
> +# define VIR_PERF_PARAM_INSTRUCTIONS "instructions"
> +
> +/**
> + * VIR_PERF_PARAM_CPU_CYCLES:
> + *
> + * Macro for typed parameter name that represents cpu_cycles perf event
> + * which can be used to measure how many cpu cycles one instruction needs.
> + * It corresponds to the "perf.cpu_cycles" field in the *Stats APIs.
> + */
> +# define VIR_PERF_PARAM_CPU_CYCLES "cpu_cycles"
> +
> int virDomainGetPerfEvents(virDomainPtr dom,
> virTypedParameterPtr *params,
> int *nparams,
> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
> index 4e71a94..b383cbb 100644
> --- a/src/libvirt-domain.c
> +++ b/src/libvirt-domain.c
> @@ -11452,6 +11452,14 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
> * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller
> * on the socket as unsigned long long. It is produced by mbml
> * perf event.
> + * "perf.cache_misses" - the count of cache misses as unsigned long long.
> + * It is produced by cache_misses perf event.
> + * "perf.cache_references" - the count of cache hits as unsigned long long.
> + * It is produced by cache_references perf event.
> + * "perf.instructions" - the count of instructions as unsigned long long.
> + * It is produced by instructions perf event.
> + * "perf.cpu_cycles" - the number of cpu cycles one instruction needs as unsigned
> + * long long. It is produced by cpu_cycles perf event.
These needed some formatting tweaks to follow the first 3...
> *
> * Note that entire stats groups or individual stat fields may be missing from
> * the output in case they are not supported by the given hypervisor, are not
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 1fdb7b8..25985b2 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -9616,6 +9616,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
> VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN,
> VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN,
> VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN,
> + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN,
> + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN,
> + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN,
> + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN,
> NULL) < 0)
> return -1;
>
> diff --git a/src/util/virperf.c b/src/util/virperf.c
> index 01c7c70..f9c6a1b 100644
> --- a/src/util/virperf.c
> +++ b/src/util/virperf.c
> @@ -38,7 +38,9 @@ VIR_LOG_INIT("util.perf");
> #define VIR_FROM_THIS VIR_FROM_PERF
>
> VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
> - "cmt", "mbmt", "mbml");
> + "cmt", "mbmt", "mbml",
> + "cpu_cycles", "instructions",
> + "cache_references", "cache_misses");
>
> struct virPerfEvent {
> int type;
> @@ -107,6 +109,18 @@ static struct virPerfEventAttr {
> {.type = VIR_PERF_EVENT_CMT, .attrType = 0, .attrConfig = 1},
> {.type = VIR_PERF_EVENT_MBMT, .attrType = 0, .attrConfig = 2},
> {.type = VIR_PERF_EVENT_MBML, .attrType = 0, .attrConfig = 3},
> + {.type = VIR_PERF_EVENT_CPU_CYCLES,
> + .attrType = PERF_TYPE_HARDWARE,
> + .attrConfig = PERF_COUNT_HW_CPU_CYCLES},
> + {.type = VIR_PERF_EVENT_INSTRUCTIONS,
> + .attrType = PERF_TYPE_HARDWARE,
> + .attrConfig = PERF_COUNT_HW_INSTRUCTIONS},
> + {.type = VIR_PERF_EVENT_CACHE_REFERENCES,
> + .attrType = PERF_TYPE_HARDWARE,
> + .attrConfig = PERF_COUNT_HW_CACHE_REFERENCES},
> + {.type = VIR_PERF_EVENT_CACHE_MISSES,
> + .attrType = PERF_TYPE_HARDWARE,
> + .attrConfig = PERF_COUNT_HW_CACHE_MISSES},
> };
> typedef struct virPerfEventAttr *virPerfEventAttrPtr;
>
> diff --git a/src/util/virperf.h b/src/util/virperf.h
> index acb59ab..bca49f7 100644
> --- a/src/util/virperf.h
> +++ b/src/util/virperf.h
> @@ -35,6 +35,11 @@ typedef enum {
> VIR_PERF_EVENT_MBMT,
> VIR_PERF_EVENT_MBML,
>
> + VIR_PERF_EVENT_CPU_CYCLES,
> + VIR_PERF_EVENT_INSTRUCTIONS,
> + VIR_PERF_EVENT_CACHE_REFERENCES,
> + VIR_PERF_EVENT_CACHE_MISSES,
> +
Added some comments for each.
John
> VIR_PERF_EVENT_LAST
> } virPerfEventType;
>
> diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml
> index 394d2a6..a914133 100644
> --- a/tests/genericxml2xmlindata/generic-perf.xml
> +++ b/tests/genericxml2xmlindata/generic-perf.xml
> @@ -16,6 +16,10 @@
> <event name='cmt' enabled='yes'/>
> <event name='mbmt' enabled='no'/>
> <event name='mbml' enabled='yes'/>
> + <event name='cpu_cycles' enabled='no'/>
> + <event name='instructions' enabled='yes'/>
> + <event name='cache_references' enabled='no'/>
> + <event name='cache_misses' enabled='no'/>
> </perf>
> <devices>
> </devices>
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list