@@ -66,24 +66,40 @@ file = pmu.flat
groups = pmu
extra_params = -append 'cycle-counter 0'
-[pmu-event-introspection]
+[pmu-event-introspection-kvm]
file = pmu.flat
groups = pmu
arch = arm64
+accel = kvm
extra_params = -append 'pmu-event-introspection'
+[pmu-event-introspection-tcg]
+file = pmu.flat
+groups = pmu
+arch = arm64
+accel = tcg
+extra_params = -append 'pmu-event-introspection' -icount shift=1
+
[pmu-event-counter-config]
file = pmu.flat
groups = pmu
arch = arm64
extra_params = -append 'pmu-event-counter-config'
-[pmu-basic-event-count]
+[pmu-basic-event-count-kvm]
file = pmu.flat
groups = pmu
arch = arm64
+accel = kvm
extra_params = -append 'pmu-basic-event-count'
+[pmu-basic-event-count-tcg]
+file = pmu.flat
+groups = pmu
+arch = arm64
+accel = tcg
+extra_params = -append 'pmu-basic-event-count' -icount shift=1
+
[pmu-mem-access]
file = pmu.flat
groups = pmu
QEMU is able to give a counter for instructions retired under TCG but you need to enable -icount for it to work. Split the tests into kvm/tcg variants to support this. [AJB: I wonder if the solution is to have a totally separate unittests.cfg for TCG mode here?] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- arm/unittests.cfg | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -- 2.20.1