From ab8960b1b4e11dd166e490adb41d7bc64775172d Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@crimson.no>
Date: Tue, 16 May 2017 15:37:07 +0200
Subject: Revert "Make delegates_item_empty_jscreation & delegates_qobject
 comparable"

These still weren't directly comparable (as they have different count
figures), and the change has been causing significant confusion when
examining results.

At the same time, we introduce apparently regressed QObject array benchmark as
a new test so we can track improvements in that area.

This reverts commit 45da7843d6c7b70ecd37c952fd68dd84f79c23e0.

Change-Id: Id76a0a3ca1bfea2ec18a88a8ffe2cca985992142
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
---
 .../quick.item/delegates_item_empty_jscreation.qml |  2 +-
 .../auto/creation/quick/delegates_qobject.qml      | 11 ++-----
 .../quick/delegates_qobject_large_array.qml        | 36 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 benchmarks/auto/creation/quick/delegates_qobject_large_array.qml

(limited to 'benchmarks')

diff --git a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml b/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml
index 920b4c8..89cded0 100644
--- a/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml
+++ b/benchmarks/auto/creation/quick.item/delegates_item_empty_jscreation.qml
@@ -27,7 +27,7 @@ Benchmark {
         items = [];
 
         for (var i=0; i<root.count; ++i) {
-            var object = component.createObject();
+            var object = component.createObject(root);
             items.push(object);
         }
     }
diff --git a/benchmarks/auto/creation/quick/delegates_qobject.qml b/benchmarks/auto/creation/quick/delegates_qobject.qml
index ee9bc3d..2bd8d52 100644
--- a/benchmarks/auto/creation/quick/delegates_qobject.qml
+++ b/benchmarks/auto/creation/quick/delegates_qobject.qml
@@ -2,13 +2,12 @@ import QtQuick 2.0
 import QmlBench 1.0
 
 // Test allocation of QObject, with no Repeater or anything.
-// Compare with delegates_qobject & delegates_item_empty.
+// Compare with delegates_qobject.
 Benchmark {
     id: root;
     count: 50;
     staticCount: 10000;
 
-    property var items;
     onTChanged: {
         allocate();
     }
@@ -20,15 +19,9 @@ Benchmark {
     }
 
     function allocate() {
-        if (items && items.length) {
-            for (var i=0; i<items.length; ++i)
-                items[i].destroy();
-        }
-        items = [];
-
         for (var i=0; i<root.count; ++i) {
             var object = component.createObject();
-            items.push(object);
+            object.destroy();
         }
     }
 }
diff --git a/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml b/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml
new file mode 100644
index 0000000..01fc3cf
--- /dev/null
+++ b/benchmarks/auto/creation/quick/delegates_qobject_large_array.qml
@@ -0,0 +1,36 @@
+import QtQuick 2.0
+import QmlBench 1.0
+
+// Test allocation of QObject, with no Repeater or anything, stored in a JS
+// array. The array is interesting as it's a large GC'd allocation.
+// Compare with delegates_qobject.
+Benchmark {
+    id: root;
+    count: 50;
+    staticCount: 10000;
+
+    property var items;
+    onTChanged: {
+        allocate();
+    }
+
+    Component {
+        id: component;
+        QtObject {
+        }
+    }
+
+    function allocate() {
+        if (items && items.length) {
+            for (var i=0; i<items.length; ++i)
+                items[i].destroy();
+        }
+        items = [];
+
+        for (var i=0; i<root.count; ++i) {
+            var object = component.createObject();
+            items.push(object);
+        }
+    }
+}
+
-- 
cgit v1.2.3