diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 30cb196261e9af329b899b3f587c3e081d171bae..3f7f87524af6cfe571cba7e764f356dd19a17d2f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1937,7 +1937,6 @@ <event name='stalled_cycles_frontend' enabled='no'/> <event name='stalled_cycles_backend' enabled='no'/> <event name='ref_cpu_cycles' enabled='no'/> - <event name='cache_l1d' enabled='no'/> </perf> ... @@ -2016,12 +2015,6 @@ by applications running on the platform perf.ref_cpu_cycles - - cache_l1d - the count of total level 1 data cache by applications running on - the platform - perf.cache_l1d -

Devices

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be0a609abac2ebc6907396ec733a062b9778c08a..4d76315b09fba262abddd8b9bf36eba8a69c73fc 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -433,7 +433,6 @@ stalled_cycles_frontend stalled_cycles_backend ref_cpu_cycles - cache_l1d diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 1e0e74c634a231882613651f28a37c46bb413d2f..e303140a23311d445f6ba18c9fe344c9e8fdc95c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,17 +2188,6 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" -/** - * VIR_PERF_PARAM_CACHE_L1D: - * - * Macro for typed parameter name that represents cache_l1d - * perf event which can be used to measure the count of total - * level 1 data cache by applications running on the platform. - * It corresponds to the "perf.cache_l1d" field in the - * *Stats APIs. - */ -# define VIR_PERF_PARAM_CACHE_L1D "cache_l1d" - int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3023f30876cc4173044ca20efe89911f5042a94b..5b3e842058067a5bd17f8ed8045e61526edcf8bb 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11250,8 +11250,6 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * CPU frequency scaling by applications running * as unsigned long long. It is produced by the * ref_cpu_cycles perf event. - * "perf.cache_l1d" - The count of total level 1 data cache as unsigned - * long long. It is produced by cache_l1d 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 42f9889651096dbe657990622a4989cea2c239eb..d4422f3aa4073054eee6c0e327cc129be3a9b9a3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9877,7 +9877,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_L1D, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 8554723b52ea9f21214cdab6f4bfaa43cac70898..f64692bf39c49ec9edacbd40e8411ec3a898ebed 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -43,8 +43,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cache_references", "cache_misses", "branch_instructions", "branch_misses", "bus_cycles", "stalled_cycles_frontend", - "stalled_cycles_backend", "ref_cpu_cycles", - "cache_l1d"); + "stalled_cycles_backend", "ref_cpu_cycles"); struct virPerfEvent { int type; @@ -113,9 +112,6 @@ static struct virPerfEventAttr attrs[] = { .attrConfig = 0, # endif }, - {.type = VIR_PERF_EVENT_CACHE_L1D, - .attrType = PERF_TYPE_HW_CACHE, - .attrConfig = PERF_COUNT_HW_CACHE_L1D}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 4c562afba18e2627c6c301d7d7205df2629f5c11..1f43c92beb26acb9eabdfb4725a97545403246fe 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -47,7 +47,6 @@ typedef enum { the backend of the instruction processor pipeline */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ - VIR_PERF_EVENT_CACHE_L1D, /* Count of level 1 data cache*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index d1418d08c8f6ed8f0c2171eca5f77c2a7ac1bb28..437cd65ccc99dd855e3635dcd88cee92bc7f58e5 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -26,7 +26,6 @@ - diff --git a/tools/virsh.pod b/tools/virsh.pod index cfa7a24165d856b2f6eb6c8f0f423fa53e094096..0e434c09a7d9abf6c2a758a1a64cc289911e95c7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -945,8 +945,7 @@ I<--perf> returns the statistics of all enabled perf events: "perf.bus_cycles" - the count of bus cycles, "perf.stalled_cycles_frontend" - the count of stalled frontend cpu cycles, "perf.stalled_cycles_backend" - the count of stalled backend cpu cycles, -"perf.ref_cpu_cycles" - the count of ref cpu cycles, -"perf.cache_l1d" - the count of level 1 data cache +"perf.ref_cpu_cycles" - the count of ref cpu cycles See the B command for more details about each event. @@ -2311,8 +2310,6 @@ B ref_cpu_cycles - Provides the count of total cpu cycles not affected by CPU frequency scaling by applications running on the platform. - cache_l1d - Provides the count of total level 1 data cache - by applications running on the platform. B: The statistics can be retrieved using the B command using the I<--perf> flag.