From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: drjones@redhat.com, andrew.murray@arm.com,
andre.przywara@arm.com, peter.maydell@linaro.org,
alexandru.elisei@arm.com
Subject: [kvm-unit-tests PATCH v2 4/9] arm: pmu: Check Required Event Support
Date: Thu, 30 Jan 2020 12:25:05 +0100 [thread overview]
Message-ID: <20200130112510.15154-5-eric.auger@redhat.com> (raw)
In-Reply-To: <20200130112510.15154-1-eric.auger@redhat.com>
If event counters are implemented check the common events
required by the PMUv3 are implemented.
Some are unconditionally required (SW_INCR, CPU_CYCLES,
either INST_RETIRED or INST_SPEC). Some others only are
required if the implementation implements some other features.
Check those wich are unconditionally required.
This test currently fails on TCG as neither INST_RETIRED
or INST_SPEC are supported.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v1 -> v2:
- fix is_event_supported()
- fix boolean condition for PMU v4
- fix PMCEID0 definition
RFC ->v1:
- add a comment to explain the PMCEID0/1 splits
---
arm/pmu.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
arm/unittests.cfg | 6 +++++
2 files changed, 68 insertions(+)
diff --git a/arm/pmu.c b/arm/pmu.c
index d24857e..4a26a76 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -101,6 +101,10 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr), [z] "r" (0)
: "cc");
}
+
+/* event counter tests only implemented for aarch64 */
+static void test_event_introspection(void) {}
+
#elif defined(__aarch64__)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
@@ -139,6 +143,61 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr)
: "cc");
}
+
+#define PMCEID1_EL0 sys_reg(3, 3, 9, 12, 7)
+
+static bool is_event_supported(uint32_t n, bool warn)
+{
+ uint64_t pmceid0 = read_sysreg(pmceid0_el0);
+ uint64_t pmceid1 = read_sysreg_s(PMCEID1_EL0);
+ bool supported;
+ uint64_t reg;
+
+ /*
+ * The low 32-bits of PMCEID0/1 respectly describe
+ * event support for events 0-31/32-63. Their High
+ * 32-bits describe support for extended events
+ * starting at 0x4000, using the same split.
+ */
+ if (n >= 0x0 && n <= 0x3F)
+ reg = (pmceid0 & 0xFFFFFFFF) | ((pmceid1 & 0xFFFFFFFF) << 32);
+ else if (n >= 0x4000 && n <= 0x403F)
+ reg = (pmceid0 >> 32) | ((pmceid1 >> 32) << 32);
+ else
+ abort();
+
+ supported = reg & (1UL << (n & 0x3F));
+
+ if (!supported && warn)
+ report_info("event %d is not supported", n);
+ return supported;
+}
+
+static void test_event_introspection(void)
+{
+ bool required_events;
+
+ if (!pmu.nb_implemented_counters) {
+ report_skip("No event counter, skip ...");
+ return;
+ }
+
+ /* PMUv3 requires an implementation includes some common events */
+ required_events = is_event_supported(0x0, true) /* SW_INCR */ &&
+ is_event_supported(0x11, true) /* CPU_CYCLES */ &&
+ (is_event_supported(0x8, true) /* INST_RETIRED */ ||
+ is_event_supported(0x1B, true) /* INST_PREC */);
+
+ if (pmu.version == 0x4) {
+ /* ARMv8.1 PMU: STALL_FRONTEND and STALL_BACKEND are required */
+ required_events = required_events &&
+ is_event_supported(0x23, true) &&
+ is_event_supported(0x24, true);
+ }
+
+ report(required_events, "Check required events are implemented");
+}
+
#endif
/*
@@ -326,6 +385,9 @@ int main(int argc, char *argv[])
"Monotonically increasing cycle count");
report(check_cpi(cpi), "Cycle/instruction ratio");
pmccntr64_test();
+ } else if (strcmp(argv[1], "event-introspection") == 0) {
+ report_prefix_push(argv[1]);
+ test_event_introspection();
} else {
report_abort("Unknown sub-test '%s'", argv[1]);
}
diff --git a/arm/unittests.cfg b/arm/unittests.cfg
index 79f0d7a..4433ef3 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -66,6 +66,12 @@ file = pmu.flat
groups = pmu
extra_params = -append 'cycle-counter 0'
+[pmu-event-introspection]
+file = pmu.flat
+groups = pmu
+arch = arm64
+extra_params = -append 'event-introspection'
+
# Test PMU support (TCG) with -icount IPC=1
#[pmu-tcg-icount-1]
#file = pmu.flat
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, andrew.murray@arm.com,
drjones@redhat.com, alexandru.elisei@arm.com,
andre.przywara@arm.com
Subject: [kvm-unit-tests PATCH v2 4/9] arm: pmu: Check Required Event Support
Date: Thu, 30 Jan 2020 12:25:05 +0100 [thread overview]
Message-ID: <20200130112510.15154-5-eric.auger@redhat.com> (raw)
In-Reply-To: <20200130112510.15154-1-eric.auger@redhat.com>
If event counters are implemented check the common events
required by the PMUv3 are implemented.
Some are unconditionally required (SW_INCR, CPU_CYCLES,
either INST_RETIRED or INST_SPEC). Some others only are
required if the implementation implements some other features.
Check those wich are unconditionally required.
This test currently fails on TCG as neither INST_RETIRED
or INST_SPEC are supported.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v1 -> v2:
- fix is_event_supported()
- fix boolean condition for PMU v4
- fix PMCEID0 definition
RFC ->v1:
- add a comment to explain the PMCEID0/1 splits
---
arm/pmu.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
arm/unittests.cfg | 6 +++++
2 files changed, 68 insertions(+)
diff --git a/arm/pmu.c b/arm/pmu.c
index d24857e..4a26a76 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -101,6 +101,10 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr), [z] "r" (0)
: "cc");
}
+
+/* event counter tests only implemented for aarch64 */
+static void test_event_introspection(void) {}
+
#elif defined(__aarch64__)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
@@ -139,6 +143,61 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr)
: "cc");
}
+
+#define PMCEID1_EL0 sys_reg(3, 3, 9, 12, 7)
+
+static bool is_event_supported(uint32_t n, bool warn)
+{
+ uint64_t pmceid0 = read_sysreg(pmceid0_el0);
+ uint64_t pmceid1 = read_sysreg_s(PMCEID1_EL0);
+ bool supported;
+ uint64_t reg;
+
+ /*
+ * The low 32-bits of PMCEID0/1 respectly describe
+ * event support for events 0-31/32-63. Their High
+ * 32-bits describe support for extended events
+ * starting at 0x4000, using the same split.
+ */
+ if (n >= 0x0 && n <= 0x3F)
+ reg = (pmceid0 & 0xFFFFFFFF) | ((pmceid1 & 0xFFFFFFFF) << 32);
+ else if (n >= 0x4000 && n <= 0x403F)
+ reg = (pmceid0 >> 32) | ((pmceid1 >> 32) << 32);
+ else
+ abort();
+
+ supported = reg & (1UL << (n & 0x3F));
+
+ if (!supported && warn)
+ report_info("event %d is not supported", n);
+ return supported;
+}
+
+static void test_event_introspection(void)
+{
+ bool required_events;
+
+ if (!pmu.nb_implemented_counters) {
+ report_skip("No event counter, skip ...");
+ return;
+ }
+
+ /* PMUv3 requires an implementation includes some common events */
+ required_events = is_event_supported(0x0, true) /* SW_INCR */ &&
+ is_event_supported(0x11, true) /* CPU_CYCLES */ &&
+ (is_event_supported(0x8, true) /* INST_RETIRED */ ||
+ is_event_supported(0x1B, true) /* INST_PREC */);
+
+ if (pmu.version == 0x4) {
+ /* ARMv8.1 PMU: STALL_FRONTEND and STALL_BACKEND are required */
+ required_events = required_events &&
+ is_event_supported(0x23, true) &&
+ is_event_supported(0x24, true);
+ }
+
+ report(required_events, "Check required events are implemented");
+}
+
#endif
/*
@@ -326,6 +385,9 @@ int main(int argc, char *argv[])
"Monotonically increasing cycle count");
report(check_cpi(cpi), "Cycle/instruction ratio");
pmccntr64_test();
+ } else if (strcmp(argv[1], "event-introspection") == 0) {
+ report_prefix_push(argv[1]);
+ test_event_introspection();
} else {
report_abort("Unknown sub-test '%s'", argv[1]);
}
diff --git a/arm/unittests.cfg b/arm/unittests.cfg
index 79f0d7a..4433ef3 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -66,6 +66,12 @@ file = pmu.flat
groups = pmu
extra_params = -append 'cycle-counter 0'
+[pmu-event-introspection]
+file = pmu.flat
+groups = pmu
+arch = arm64
+extra_params = -append 'event-introspection'
+
# Test PMU support (TCG) with -icount IPC=1
#[pmu-tcg-icount-1]
#file = pmu.flat
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com, maz@kernel.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: andrew.murray@arm.com, andre.przywara@arm.com
Subject: [kvm-unit-tests PATCH v2 4/9] arm: pmu: Check Required Event Support
Date: Thu, 30 Jan 2020 12:25:05 +0100 [thread overview]
Message-ID: <20200130112510.15154-5-eric.auger@redhat.com> (raw)
In-Reply-To: <20200130112510.15154-1-eric.auger@redhat.com>
If event counters are implemented check the common events
required by the PMUv3 are implemented.
Some are unconditionally required (SW_INCR, CPU_CYCLES,
either INST_RETIRED or INST_SPEC). Some others only are
required if the implementation implements some other features.
Check those wich are unconditionally required.
This test currently fails on TCG as neither INST_RETIRED
or INST_SPEC are supported.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v1 -> v2:
- fix is_event_supported()
- fix boolean condition for PMU v4
- fix PMCEID0 definition
RFC ->v1:
- add a comment to explain the PMCEID0/1 splits
---
arm/pmu.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
arm/unittests.cfg | 6 +++++
2 files changed, 68 insertions(+)
diff --git a/arm/pmu.c b/arm/pmu.c
index d24857e..4a26a76 100644
--- a/arm/pmu.c
+++ b/arm/pmu.c
@@ -101,6 +101,10 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr), [z] "r" (0)
: "cc");
}
+
+/* event counter tests only implemented for aarch64 */
+static void test_event_introspection(void) {}
+
#elif defined(__aarch64__)
#define ID_AA64DFR0_PERFMON_SHIFT 8
#define ID_AA64DFR0_PERFMON_MASK 0xf
@@ -139,6 +143,61 @@ static inline void precise_instrs_loop(int loop, uint32_t pmcr)
: [pmcr] "r" (pmcr)
: "cc");
}
+
+#define PMCEID1_EL0 sys_reg(3, 3, 9, 12, 7)
+
+static bool is_event_supported(uint32_t n, bool warn)
+{
+ uint64_t pmceid0 = read_sysreg(pmceid0_el0);
+ uint64_t pmceid1 = read_sysreg_s(PMCEID1_EL0);
+ bool supported;
+ uint64_t reg;
+
+ /*
+ * The low 32-bits of PMCEID0/1 respectly describe
+ * event support for events 0-31/32-63. Their High
+ * 32-bits describe support for extended events
+ * starting at 0x4000, using the same split.
+ */
+ if (n >= 0x0 && n <= 0x3F)
+ reg = (pmceid0 & 0xFFFFFFFF) | ((pmceid1 & 0xFFFFFFFF) << 32);
+ else if (n >= 0x4000 && n <= 0x403F)
+ reg = (pmceid0 >> 32) | ((pmceid1 >> 32) << 32);
+ else
+ abort();
+
+ supported = reg & (1UL << (n & 0x3F));
+
+ if (!supported && warn)
+ report_info("event %d is not supported", n);
+ return supported;
+}
+
+static void test_event_introspection(void)
+{
+ bool required_events;
+
+ if (!pmu.nb_implemented_counters) {
+ report_skip("No event counter, skip ...");
+ return;
+ }
+
+ /* PMUv3 requires an implementation includes some common events */
+ required_events = is_event_supported(0x0, true) /* SW_INCR */ &&
+ is_event_supported(0x11, true) /* CPU_CYCLES */ &&
+ (is_event_supported(0x8, true) /* INST_RETIRED */ ||
+ is_event_supported(0x1B, true) /* INST_PREC */);
+
+ if (pmu.version == 0x4) {
+ /* ARMv8.1 PMU: STALL_FRONTEND and STALL_BACKEND are required */
+ required_events = required_events &&
+ is_event_supported(0x23, true) &&
+ is_event_supported(0x24, true);
+ }
+
+ report(required_events, "Check required events are implemented");
+}
+
#endif
/*
@@ -326,6 +385,9 @@ int main(int argc, char *argv[])
"Monotonically increasing cycle count");
report(check_cpi(cpi), "Cycle/instruction ratio");
pmccntr64_test();
+ } else if (strcmp(argv[1], "event-introspection") == 0) {
+ report_prefix_push(argv[1]);
+ test_event_introspection();
} else {
report_abort("Unknown sub-test '%s'", argv[1]);
}
diff --git a/arm/unittests.cfg b/arm/unittests.cfg
index 79f0d7a..4433ef3 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -66,6 +66,12 @@ file = pmu.flat
groups = pmu
extra_params = -append 'cycle-counter 0'
+[pmu-event-introspection]
+file = pmu.flat
+groups = pmu
+arch = arm64
+extra_params = -append 'event-introspection'
+
# Test PMU support (TCG) with -icount IPC=1
#[pmu-tcg-icount-1]
#file = pmu.flat
--
2.20.1
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2020-01-30 11:25 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 11:25 [kvm-unit-tests PATCH v2 0/9] KVM: arm64: PMUv3 Event Counter Tests Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 1/9] arm64: Provide read/write_sysreg_s Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 2/9] arm: pmu: Let pmu tests take a sub-test parameter Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-03-04 18:01 ` Andre Przywara
2020-03-04 18:01 ` Andre Przywara
2020-03-04 18:01 ` Andre Przywara
2020-03-05 8:44 ` Andrew Jones
2020-03-05 8:44 ` Andrew Jones
2020-03-05 8:44 ` Andrew Jones
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 3/9] arm: pmu: Add a pmu struct Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-03-04 18:02 ` Andre Przywara
2020-03-04 18:02 ` Andre Przywara
2020-03-04 18:02 ` Andre Przywara
2020-03-04 18:21 ` Auger Eric
2020-03-04 18:21 ` Auger Eric
2020-03-04 18:21 ` Auger Eric
2020-03-05 8:53 ` Andrew Jones
2020-03-05 8:53 ` Andrew Jones
2020-03-05 8:53 ` Andrew Jones
2020-01-30 11:25 ` Eric Auger [this message]
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 4/9] arm: pmu: Check Required Event Support Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-02-11 15:33 ` Peter Maydell
2020-02-11 15:33 ` Peter Maydell
2020-02-11 15:33 ` Peter Maydell
2020-02-11 18:08 ` Auger Eric
2020-02-11 18:08 ` Auger Eric
2020-02-11 18:08 ` Auger Eric
2020-02-11 16:28 ` Peter Maydell
2020-02-11 16:28 ` Peter Maydell
2020-02-11 16:28 ` Peter Maydell
2020-02-11 18:32 ` Auger Eric
2020-02-11 18:32 ` Auger Eric
2020-02-11 18:32 ` Auger Eric
2020-03-04 18:02 ` Andre Przywara
2020-03-04 18:02 ` Andre Przywara
2020-03-04 18:02 ` Andre Przywara
2020-03-05 9:04 ` Andrew Jones
2020-03-05 9:04 ` Andrew Jones
2020-03-05 9:04 ` Andrew Jones
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 5/9] arm: pmu: Basic event counter Tests Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-02-11 16:27 ` Peter Maydell
2020-02-11 16:27 ` Peter Maydell
2020-02-11 16:27 ` Peter Maydell
2020-02-11 18:31 ` Auger Eric
2020-02-11 18:31 ` Auger Eric
2020-03-04 18:03 ` Andre Przywara
2020-03-04 18:03 ` Andre Przywara
2020-03-04 18:03 ` Andre Przywara
2020-03-05 9:33 ` Andrew Jones
2020-03-05 9:33 ` Andrew Jones
2020-03-05 9:33 ` Andrew Jones
2020-03-12 11:19 ` Auger Eric
2020-03-12 11:19 ` Auger Eric
2020-03-12 11:19 ` Auger Eric
2020-03-05 9:42 ` Andrew Jones
2020-03-05 9:42 ` Andrew Jones
2020-03-05 9:42 ` Andrew Jones
2020-03-12 11:16 ` Auger Eric
2020-03-12 11:16 ` Auger Eric
2020-03-12 11:16 ` Auger Eric
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 6/9] arm: pmu: Test chained counter Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-02-11 16:24 ` Peter Maydell
2020-02-11 16:24 ` Peter Maydell
2020-02-11 16:24 ` Peter Maydell
2020-02-11 18:30 ` Auger Eric
2020-02-11 18:30 ` Auger Eric
2020-02-11 18:30 ` Auger Eric
2020-03-05 9:37 ` Andrew Jones
2020-03-05 9:37 ` Andrew Jones
2020-03-05 9:37 ` Andrew Jones
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 7/9] arm: pmu: test 32-bit <-> 64-bit transitions Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-03-05 9:50 ` Andrew Jones
2020-03-05 9:50 ` Andrew Jones
2020-03-05 9:50 ` Andrew Jones
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 8/9] arm: gic: Provide per-IRQ helper functions Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-03-05 9:55 ` Andrew Jones
2020-03-05 9:55 ` Andrew Jones
2020-03-05 9:55 ` Andrew Jones
2020-03-05 11:10 ` Alexandru Elisei
2020-03-05 11:10 ` Alexandru Elisei
2020-03-05 11:10 ` Alexandru Elisei
2020-01-30 11:25 ` [kvm-unit-tests PATCH v2 9/9] arm: pmu: Test overflow interrupts Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-01-30 11:25 ` Eric Auger
2020-03-05 10:17 ` Andrew Jones
2020-03-05 10:17 ` Andrew Jones
2020-03-05 10:17 ` Andrew Jones
2020-02-11 15:42 ` [kvm-unit-tests PATCH v2 0/9] KVM: arm64: PMUv3 Event Counter Tests Peter Maydell
2020-02-11 15:42 ` Peter Maydell
2020-02-11 15:42 ` Peter Maydell
2020-02-11 16:07 ` Andrew Jones
2020-02-11 16:07 ` Andrew Jones
2020-02-11 16:07 ` Andrew Jones
2020-02-11 18:23 ` Auger Eric
2020-02-11 18:23 ` Auger Eric
2020-02-11 18:23 ` Auger Eric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200130112510.15154-5-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=andrew.murray@arm.com \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.