From 3566c595e5a59266d604895180982ed12978419c Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Thu, 1 Apr 2010 16:09:53 +1000 Subject: Test cost of importing and resolving types (but not creating objects). Currently, by far the biggest chunk is QUrl hashing :-( --- .../declarative/typeimports/data/QmlTestType1.qml | 2 + .../declarative/typeimports/data/QmlTestType2.qml | 2 + .../declarative/typeimports/data/QmlTestType3.qml | 2 + .../declarative/typeimports/data/QmlTestType4.qml | 2 + .../declarative/typeimports/data/cpp.qml | 15 +++ .../declarative/typeimports/data/qml.qml | 13 ++ .../declarative/typeimports/tst_typeimports.cpp | 138 +++++++++++++++++++++ .../declarative/typeimports/typeimports.pro | 15 +++ 8 files changed, 189 insertions(+) create mode 100644 tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml create mode 100644 tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml create mode 100644 tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml create mode 100644 tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml create mode 100644 tests/benchmarks/declarative/typeimports/data/cpp.qml create mode 100644 tests/benchmarks/declarative/typeimports/data/qml.qml create mode 100644 tests/benchmarks/declarative/typeimports/tst_typeimports.cpp create mode 100644 tests/benchmarks/declarative/typeimports/typeimports.pro diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml new file mode 100644 index 0000000..f359b85 --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType1.qml @@ -0,0 +1,2 @@ +import Qt.test 2.0 +TestType1 { } diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml new file mode 100644 index 0000000..b6fabe6 --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType2.qml @@ -0,0 +1,2 @@ +import Qt.test 2.0 +TestType2 { } diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml new file mode 100644 index 0000000..6a30887 --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType3.qml @@ -0,0 +1,2 @@ +import Qt.test 2.0 +TestType3 { } diff --git a/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml b/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml new file mode 100644 index 0000000..5cc8a6b --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/QmlTestType4.qml @@ -0,0 +1,2 @@ +import Qt.test 2.0 +TestType4 { } diff --git a/tests/benchmarks/declarative/typeimports/data/cpp.qml b/tests/benchmarks/declarative/typeimports/data/cpp.qml new file mode 100644 index 0000000..11ee4e6 --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/cpp.qml @@ -0,0 +1,15 @@ +import Qt.test 2.0 + +TestType1 { + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } + TestType1 { } TestType2 { } TestType3 { } TestType4 { } +} diff --git a/tests/benchmarks/declarative/typeimports/data/qml.qml b/tests/benchmarks/declarative/typeimports/data/qml.qml new file mode 100644 index 0000000..d776bcf --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/data/qml.qml @@ -0,0 +1,13 @@ +QmlTestType1 { + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } + QmlTestType1 { } QmlTestType2 { } QmlTestType3 { } QmlTestType4 { } +} diff --git a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp new file mode 100644 index 0000000..b92ab46 --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp @@ -0,0 +1,138 @@ +/**************************************************************************** +** +** Copyright (C) 2010 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$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include + +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +// Application private dir is default serach path for files, so SRCDIR can be set to empty +#define SRCDIR "" +#endif + +class tst_typeimports : public QObject +{ + Q_OBJECT +public: + tst_typeimports(); + +private slots: + void cpp(); + void qml(); + +private: + QDeclarativeEngine engine; +}; + +class TestType1 : public QObject +{ + Q_OBJECT + Q_PROPERTY(QDeclarativeListProperty resources READ resources); + Q_CLASSINFO("DefaultProperty", "resources"); +public: + TestType1(QObject *parent = 0) : QObject(parent) {} + + QDeclarativeListProperty resources() { + return QDeclarativeListProperty(this, 0, resources_append); + } + + static void resources_append(QDeclarativeListProperty *p, QObject *o) { + o->setParent(p->object); + } +}; + +class TestType2 : public TestType1 +{ + Q_OBJECT +public: + TestType2(QObject *parent = 0) : TestType1(parent) {} +}; + + +class TestType3 : public TestType1 +{ + Q_OBJECT +public: + TestType3(QObject *parent = 0) : TestType1(parent) {} +}; + +class TestType4 : public TestType1 +{ + Q_OBJECT +public: + TestType4(QObject *parent = 0) : TestType1(parent) {} +}; + + +tst_typeimports::tst_typeimports() +{ + qmlRegisterType("Qt.test", 1, 0, "TestType1"); + qmlRegisterType("Qt.test", 1, 0, "TestType2"); + qmlRegisterType("Qt.test", 2, 0, "TestType3"); + qmlRegisterType("Qt.test", 2, 0, "TestType4"); +} + +inline QUrl TEST_FILE(const QString &filename) +{ + return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); +} + +void tst_typeimports::cpp() +{ + QBENCHMARK { + QDeclarativeComponent component(&engine, TEST_FILE("cpp.qml")); + QVERIFY(component.isReady()); + } +} + +void tst_typeimports::qml() +{ + QBENCHMARK { + QDeclarativeComponent component(&engine, TEST_FILE("qml.qml")); + QVERIFY(component.isReady()); + } +} + +QTEST_MAIN(tst_typeimports) + +#include "tst_typeimports.moc" diff --git a/tests/benchmarks/declarative/typeimports/typeimports.pro b/tests/benchmarks/declarative/typeimports/typeimports.pro new file mode 100644 index 0000000..8a74e0d --- /dev/null +++ b/tests/benchmarks/declarative/typeimports/typeimports.pro @@ -0,0 +1,15 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_typeimports +QT += declarative +macx:CONFIG -= app_bundle + +SOURCES += tst_typeimports.cpp + +symbian* { + data.sources = data/* + data.path = data + DEPLOYMENT += addFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} \ No newline at end of file -- cgit v0.12