perf: add branch_misses perf event support

This patch adds support and documentation
for the branch_misses perf event.

Signed-off-by: Nitesh Konkar <nitkon12@linux.vnet.ibm.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 9218eecba0216f7e3b3a9f6d06a338701d5dd1c7..086af551d4713dc8ff533cae80ce7208b9680e68 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1928,6 +1928,7 @@
   <event name='cache_references' enabled='no'/>
   <event name='cache_misses' enabled='no'/>
   <event name='branch_instructions' enabled='no'/>
+  <event name='branch_misses' enabled='no'/>
 </perf>
 ...
 </pre>
@@ -1978,6 +1979,11 @@
       <td>the count of branch instructions by applications running on the platform</td>
       <td><code>perf.branch_instructions</code></td>
     </tr>
+    <tr>
+      <td><code>branch_misses</code></td>
+      <td>the count of branch misses by applications running on the platform</td>
+      <td><code>perf.branch_misses</code></td>
+    </tr>
   </table>
 
     <h3><a name="elementsDevices">Devices</a></h3>

diff --git a/docs/news.html.in b/docs/news.html.in
index 96c9bbe6d259ca4aa48f3d9423ac9e1a0fbb049e..c160411a44f454b0e7c649adaf47e9d29dfd98b5 100644 (file)
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -29,9 +29,9 @@
       </li>
       <li><strong>Improvements</strong>
         <ul>
-          <li>perf: Add perf.branch_instructions<br/>
+          <li>perf: Add more perf statistics<br/>
           Add support to get the count of branch instructions executed
-          by applications running on the platform
+          and branch misses by applications running on the platform
           </li>
         </ul>
       </li>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index c004233e75acd32c8517b1dfbf7024fb0591803d..bf8818dc0067216b78dced76ce76da710f1ec8e7 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -428,6 +428,7 @@
               <value>cache_references</value>
               <value>cache_misses</value>
               <value>branch_instructions</value>
+              <value>branch_misses</value>
             </choice>
           </attribute>
           <attribute name="enabled">

diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index f43c9765a1c1717d3f614702c0d35eca620d6bf1..3290b10ea82b9f2d3c918ac4d517a85f26f4ef19 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2135,6 +2135,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats);
  */
 # define VIR_PERF_PARAM_BRANCH_INSTRUCTIONS "branch_instructions"
 
+/**
+ * VIR_PERF_PARAM_BRANCH_MISSES:
+ *
+ * Macro for typed parameter name that represents branch_misses
+ * perf event which can be used to measure the count of branch misses
+ * by applications running on the platform. It corresponds to the
+ * "perf.branch_misses" field in the *Stats APIs.
+ */
+# define VIR_PERF_PARAM_BRANCH_MISSES "branch_misses"
+
 int virDomainGetPerfEvents(virDomainPtr dom,
                            virTypedParameterPtr *params,
                            int *nparams,

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 8b4e814fea7aba5458541b60049297afa94b8f9f..b287a396ec20cdb5d402b9ce0155fb200c23c64f 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -11232,6 +11232,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
  *     "perf.branch_instructions" - The count of branch instructions as
  *                                  unsigned long long. It is produced by
  *                                  branch_instructions perf event.
+ *     "perf.branch_misses" - The count of branch misses as unsigned long
+ *                            long. It is produced by branch_misses perf event.
  *
  * 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 70e64630af7ddf5f06787b2b31cebd9a7fa100d8..88778d491d0234738d01adc5eef306a2b30b6f6a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9853,6 +9853,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom,
                                VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN,
                                VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN,
                                VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN,
+                               VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN,
                                NULL) < 0)
         return -1;
 

diff --git a/src/util/virperf.c b/src/util/virperf.c
index 635faf1ca14eb5f95b6f870f62ac433613331854..7f630da0f746153c26591281e76e12ca61dc3dcf 100644 (file)
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -41,7 +41,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST,
               "cmt", "mbmt", "mbml",
               "cpu_cycles", "instructions",
               "cache_references", "cache_misses",
-              "branch_instructions");
+              "branch_instructions", "branch_misses");
 
 struct virPerfEvent {
     int type;
@@ -89,6 +89,9 @@ static struct virPerfEventAttr attrs[] = {
     {.type = VIR_PERF_EVENT_BRANCH_INSTRUCTIONS,
      .attrType = PERF_TYPE_HARDWARE,
      .attrConfig = PERF_COUNT_HW_BRANCH_INSTRUCTIONS},
+    {.type = VIR_PERF_EVENT_BRANCH_MISSES,
+     .attrType = PERF_TYPE_HARDWARE,
+     .attrConfig = PERF_COUNT_HW_BRANCH_MISSES},
 };
 typedef struct virPerfEventAttr *virPerfEventAttrPtr;
 

diff --git a/src/util/virperf.h b/src/util/virperf.h
index 8ebc03cbb20ff1505210c2351749410a454820ae..7049a5b47e3f51fbacd985c14facb6a297b3a902 100644 (file)
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -38,6 +38,7 @@ typedef enum {
     VIR_PERF_EVENT_CACHE_MISSES,     /* Cache misses by applications */
     VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions
                                            for applications */
+    VIR_PERF_EVENT_BRANCH_MISSES,  /* Count of branch misses for applications */
 
     VIR_PERF_EVENT_LAST
 } virPerfEventType;

diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml
index 92e584762d33f4b2553b22b676253c3291595726..a1e4e1c968a6359b6c3431bf9bbdc07e7b058fb2 100644 (file)
--- a/tests/genericxml2xmlindata/generic-perf.xml
+++ b/tests/genericxml2xmlindata/generic-perf.xml
@@ -21,6 +21,7 @@
     <event name='cache_references' enabled='no'/>
     <event name='cache_misses' enabled='no'/>
     <event name='branch_instructions' enabled='yes'/>
+    <event name='branch_misses' enabled='yes'/>
   </perf>
   <devices>
   </devices>

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 869062aa5aef241afdcbfb0e41c8c7f3322cff67..74c05c935cb9e699b3b6145949f504e66bbc4fef 100644 (file)
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -946,7 +946,8 @@ I<--perf> returns the statistics of all enabled perf events:
 "perf.instructions" - the count of instructions,
 "perf.cache_references" - the count of cache hits,
 "perf.cache_misses" - the count of caches misses,
-"perf.branch_instructions" - the count of application branch instructions
+"perf.branch_instructions" - the count of branch instructions,
+"perf.branch_misses" - the count of branch misses
 
 See the B<perf> command for more details about each event.
 
@@ -2296,6 +2297,8 @@ B<Valid perf event names>
   branch_instructions - Provides the count of branch instructions
                         executed by applications running on the
                         platform.
+  branch_misses    - Provides the count of branch misses executed
+                     by applications running on the platform.
 
 B<Note>: The statistics can be retrieved using the B<domstats> command using
 the I<--perf> flag.