COMPMID-622 Let the user choose the units for the instruments

Change-Id: Ic6ac4cd6df6970593a5e2e6310b6d61951c88898
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93887
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/tests/framework/instruments/PMUCounter.cpp b/tests/framework/instruments/PMUCounter.cpp
index b962bd9..df059fb 100644
--- a/tests/framework/instruments/PMUCounter.cpp
+++ b/tests/framework/instruments/PMUCounter.cpp
@@ -65,8 +65,8 @@
 {
     return MeasurementsMap
     {
-        { "CPU cycles", Measurement(_cycles, "cycles") },
-        { "CPU instructions", Measurement(_instructions, "instructions") },
+        { "CPU cycles", Measurement(_cycles / _scale_factor, _unit + "cycles") },
+        { "CPU instructions", Measurement(_instructions / _scale_factor, _unit + "instructions") },
     };
 }
 } // namespace framework