Initial particle system benchmark

Exposed another function on ParticleSystem in order to work. Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ce852 Reviewed-by: Martin Jones <martin.jones@nokia.com>
sailfishos · Oct 17, 2011 · cec7b67 · cec7b67
1 parent 9470ce5
commit cec7b67
Show file tree

Hide file tree

Showing 7 changed files with 221 additions and 10 deletions.
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
@@ -786,14 +786,15 @@ void QSGParticleSystem::reset()
     }
 
     //### Do affectors need reset too?
-
-    if (m_running) {//reset restarts animation (if running)
+    if (m_animation) {//Animation is explicitly disabled in benchmarks
+        //reset restarts animation (if running)
         if ((m_animation->state() == QAbstractAnimation::Running))
             m_animation->stop();
         m_animation->start();
         if (m_paused)
             m_animation->pause();
     }
+
     initialized = true;
 }
 

diff --git a/src/declarative/particles/qsgparticlesystem_p.h b/src/declarative/particles/qsgparticlesystem_p.h
@@ -284,21 +284,26 @@ private slots:
 public:
     //These can be called multiple times per frame, performance critical
     void emitParticle(QSGParticleData* p);
-    QSGParticleData* newDatum(int groupId, bool respectLimits = true, int sysIdx = -1);//TODO: implement respectLimits in emitters (which means interacting with maxCount?)
+    QSGParticleData* newDatum(int groupId, bool respectLimits = true, int sysIdx = -1);
     void finishNewDatum(QSGParticleData*);
     void moveGroups(QSGParticleData *d, int newGIdx);
     int nextSystemIndex();
 
     //This one only once per painter per frame
     int systemSync(QSGParticlePainter* p);
 
-    //Data members here for ease of related class and auto-test usage. Not "public" API.
+    //Data members here for ease of related class and auto-test usage. Not "public" API. TODO: d_ptrize
     QSet<QSGParticleData*> needsReset;
     QVector<QSGParticleData*> bySysIdx; //Another reference to the data (data owned by group), but by sysIdx
     QHash<QString, int> groupIds;
     QHash<int, QSGParticleGroupData*> groupData;
     QSGStochasticEngine* stateEngine;
 
+    //Also only here for auto-test usage
+    void updateCurrentTime( int currentTime );
+    QSGParticleSystemAnimation* m_animation;
+    bool m_running;
+
     int timeInt;
     bool initialized;
     int particleCount;
@@ -323,7 +328,6 @@ private slots:
 private:
     void initializeSystem();
     void initGroups();
-    bool m_running;
     QList<QPointer<QSGParticleEmitter> > m_emitters;
     QList<QPointer<QSGParticleAffector> > m_affectors;
     QList<QPointer<QSGParticlePainter> > m_painters;
@@ -336,9 +340,6 @@ private slots:
 
     QSignalMapper m_painterMapper;
     QSignalMapper m_emitterMapper;
-    friend class QSGParticleSystemAnimation;
-    void updateCurrentTime( int currentTime );
-    QSGParticleSystemAnimation* m_animation;
     bool m_paused;
     bool m_debugMode;
     bool m_allDead;

diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h
@@ -47,15 +47,25 @@ const qreal EPSILON = 0.0001;
 
 bool extremelyFuzzyCompare(qreal a, qreal b, qreal e)//For cases which can have larger variances
 {
-    return (a + e > b) && (a - e < b);
+    return (a + e >= b) && (a - e <= b);
 }
 
 bool myFuzzyCompare(qreal a, qreal b)//For cases which might be near 0 so qFuzzyCompare fails
 {
     return (a + EPSILON > b) && (a - EPSILON < b);
 }
 
-QSGView* createView(const QString &filename, int additionalWait)
+bool myFuzzyLEQ(qreal a, qreal b)
+{
+    return (a - EPSILON < b);
+}
+
+bool myFuzzyGEQ(qreal a, qreal b)
+{
+    return (a + EPSILON > b);
+}
+
+QSGView* createView(const QString &filename, int additionalWait=0)
 {
     QSGView *canvas = new QSGView(0);
 

diff --git a/tests/benchmarks/particles/emission/data/basic.qml b/tests/benchmarks/particles/emission/data/basic.qml
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Particles 2.0
+
+Rectangle {
+    color: "black"
+    width: 320
+    height: 320
+
+    ParticleSystem {
+        id: sys
+        objectName: "system"
+        anchors.fill: parent
+        running: false //Benchmark will manage it
+
+        ImageParticle {
+            source: "../../shared/star.png"
+        }
+
+        Emitter{
+            //0,0 position
+            size: 32
+            emitRate: 2000
+            lifeSpan: 500
+        }
+    }
+}
diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TARGET = tst_emission
+SOURCES += tst_emission.cpp
+macx:CONFIG -= app_bundle
+
+testDataFiles.files = data
+testDataFiles.path = .
+DEPLOYMENT += testDataFiles
+
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
diff --git a/tests/benchmarks/particles/emission/tst_emission.cpp b/tests/benchmarks/particles/emission/tst_emission.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include "../../../auto/particles/shared/particlestestsshared.h"
+#include <private/qsgparticlesystem_p.h>
+
+class tst_emission : public QObject
+{
+    Q_OBJECT
+public:
+    tst_emission();
+
+private slots:
+    void test_basic();
+    void test_basic_data();
+};
+
+tst_emission::tst_emission()
+{
+}
+
+void tst_emission::test_basic_data()
+{
+    QTest::addColumn<int> ("dt");
+    QTest::newRow("16ms") << 16;
+    QTest::newRow("32ms") << 32;
+    QTest::newRow("100ms") << 100;
+    QTest::newRow("500ms") << 500;
+    QTest::newRow("1000ms") << 1000;
+    QTest::newRow("10000ms") << 10000;
+}
+
+void tst_emission::test_basic()
+{
+    QFETCH(int, dt);
+    QSGView* view = createView(QCoreApplication::applicationDirPath() + "/data/basic.qml");
+    QSGParticleSystem* system = view->rootObject()->findChild<QSGParticleSystem*>("system");
+    //Pretend we're running, but we manually advance the simulation
+    system->m_running = true;
+    system->m_animation = 0;
+    system->reset();
+
+    int curTime = 1;
+    system->updateCurrentTime(curTime);//Fixed point and get init out of the way.
+
+    while (curTime < 500){//Minimum time needed to get enough alive
+        QBENCHMARK {
+            curTime += dt;
+            system->updateCurrentTime(curTime);
+        }
+    }
+
+    int stillAlive = 0;
+    QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible.
+    foreach (QSGParticleData *d, system->groupData[0]->data) {
+        if (d->t == -1)
+            continue; //Particle data unused
+
+        if (d->stillAlive())
+            stillAlive++;
+        QCOMPARE(d->x, 0.f);
+        QCOMPARE(d->y, 0.f);
+        QCOMPARE(d->vx, 0.f);
+        QCOMPARE(d->vy, 0.f);
+        QCOMPARE(d->ax, 0.f);
+        QCOMPARE(d->ay, 0.f);
+        QCOMPARE(d->lifeSpan, 0.5f);
+        QCOMPARE(d->size, 32.f);
+        QCOMPARE(d->endSize, 32.f);
+        QVERIFY(myFuzzyLEQ(d->t, ((qreal)system->timeInt/1000.0)));
+    }
+    QVERIFY(extremelyFuzzyCompare(stillAlive, 1000, 10));//Small simulation variance is permissible.
+    delete view;
+}
+
+QTEST_MAIN(tst_emission);
+
+#include "tst_emission.moc"
diff --git a/tests/benchmarks/particles/particles.pro b/tests/benchmarks/particles/particles.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+            emission