Remove some pointless perf metrics

2 files changed, 17 insertions, 31 deletions

diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index 01ac878..3da52d8 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -44,32 +44,24 @@
 
 QT_BEGIN_NAMESPACE
 Q_DEFINE_PERFORMANCE_LOG(QFxPerf, "QFx") {
-    Q_DEFINE_PERFORMANCE_METRIC(QmlParsing, "QML Parsing");
-    Q_DEFINE_PERFORMANCE_METRIC(Compile, "QML Compilation");
-    Q_DEFINE_PERFORMANCE_METRIC(CompileRun, "QML Compilation Run");
-    Q_DEFINE_PERFORMANCE_METRIC(CreateComponent, "Component creation");
+    Q_DEFINE_PERFORMANCE_METRIC(QmlParsing, "Compilation: QML Parsing");
+    Q_DEFINE_PERFORMANCE_METRIC(Compilation, "             QML Compilation");
+    Q_DEFINE_PERFORMANCE_METRIC(VMEExecution, "Execution:   QML VME Execution");
     Q_DEFINE_PERFORMANCE_METRIC(BindInit, "BindValue Initialization");
-    Q_DEFINE_PERFORMANCE_METRIC(BindCompile, "BindValue compile");
     Q_DEFINE_PERFORMANCE_METRIC(BindValue, "BindValue execution");
     Q_DEFINE_PERFORMANCE_METRIC(BindValueSSE, "BindValue execution SSE");
     Q_DEFINE_PERFORMANCE_METRIC(BindValueQt, "BindValue execution QtScript");
-    Q_DEFINE_PERFORMANCE_METRIC(ContextQuery, "QtScript: Query Context");
-    Q_DEFINE_PERFORMANCE_METRIC(ContextProperty, "QtScript: Context Property");
-    Q_DEFINE_PERFORMANCE_METRIC(ObjectQuery, "QtScript: Query Object");
-    Q_DEFINE_PERFORMANCE_METRIC(ObjectProperty, "QtScript: Object Property");
-    Q_DEFINE_PERFORMANCE_METRIC(ObjectSetProperty, "QtScript: Set Object Property");
     Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QmlBindableValue::update");
     Q_DEFINE_PERFORMANCE_METRIC(PixmapLoad, "Pixmap loading");
-    Q_DEFINE_PERFORMANCE_METRIC(MetaProperty, "Meta property resolution");
-    Q_DEFINE_PERFORMANCE_METRIC(PathCache, "Path cache");
-    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "Particle creation");
     Q_DEFINE_PERFORMANCE_METRIC(FontDatabase, "Font database creation");
-    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "QFxItem::componentComplete");
-    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "QFxImage::componentComplete");
-    Q_DEFINE_PERFORMANCE_METRIC(ComponentInstanceComponentComplete, "QFxComponentInstance::componentComplete");
-    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "QFxBaseLayout::componentComplete");
-    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "QFxText::componentComplete");
-    Q_DEFINE_PERFORMANCE_METRIC(QFxText_setText, "QFxText::setText");
+    Q_DEFINE_PERFORMANCE_METRIC(QFxPathViewPathCache, "FX Items:    QFxPathView: Path cache");
+    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "             QFxParticles: Particle creation");
+    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "             QFxItem::componentComplete");
+    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "             QFxImage::componentComplete");
+    Q_DEFINE_PERFORMANCE_METRIC(ComponentInstanceComponentComplete, "             QFxComponentInstance::componentComplete");
+    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "             QFxBaseLayout::componentComplete");
+    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "             QFxText::componentComplete");
+    Q_DEFINE_PERFORMANCE_METRIC(QFxText_setText, "             QFxText::setText");
     Q_DEFINE_PERFORMANCE_METRIC(AddScript, "QmlScript::addScriptToEngine");
 }
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qfxperf.h b/src/declarative/util/qfxperf.h
index 23de8b5..9fcf1d6 100644
--- a/src/declarative/util/qfxperf.h
+++ b/src/declarative/util/qfxperf.h
@@ -51,25 +51,19 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 Q_DECLARE_PERFORMANCE_LOG(QFxPerf) {
     Q_DECLARE_PERFORMANCE_METRIC(QmlParsing)
-    Q_DECLARE_PERFORMANCE_METRIC(Compile)
-    Q_DECLARE_PERFORMANCE_METRIC(CompileRun)
-    Q_DECLARE_PERFORMANCE_METRIC(CreateComponent)
+
+    Q_DECLARE_PERFORMANCE_METRIC(Compilation)
+    Q_DECLARE_PERFORMANCE_METRIC(VMEExecution)
+
     Q_DECLARE_PERFORMANCE_METRIC(BindInit)
-    Q_DECLARE_PERFORMANCE_METRIC(BindCompile)
     Q_DECLARE_PERFORMANCE_METRIC(BindValue)
     Q_DECLARE_PERFORMANCE_METRIC(BindValueSSE)
     Q_DECLARE_PERFORMANCE_METRIC(BindValueQt)
-    Q_DECLARE_PERFORMANCE_METRIC(ContextQuery)
-    Q_DECLARE_PERFORMANCE_METRIC(ContextProperty)
-    Q_DECLARE_PERFORMANCE_METRIC(ObjectQuery)
-    Q_DECLARE_PERFORMANCE_METRIC(ObjectProperty)
-    Q_DECLARE_PERFORMANCE_METRIC(ObjectSetProperty)
     Q_DECLARE_PERFORMANCE_METRIC(BindableValueUpdate)
     Q_DECLARE_PERFORMANCE_METRIC(PixmapLoad)
-    Q_DECLARE_PERFORMANCE_METRIC(MetaProperty)
-    Q_DECLARE_PERFORMANCE_METRIC(PathCache)
-    Q_DECLARE_PERFORMANCE_METRIC(CreateParticle)
     Q_DECLARE_PERFORMANCE_METRIC(FontDatabase)
+    Q_DECLARE_PERFORMANCE_METRIC(QFxPathViewPathCache)
+    Q_DECLARE_PERFORMANCE_METRIC(CreateParticle)
     Q_DECLARE_PERFORMANCE_METRIC(ItemComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(ImageComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(ComponentInstanceComponentComplete)