From 77dfbea79094be6b763319fcca03f6b48ab8248e Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 10 Jun 2011 13:46:44 +1000 Subject: Add JavaScript benchmark --- tests/benchmarks/declarative/declarative.pro | 1 + .../declarative/javascript/data/NestedIdObject.qml | 9 ++ .../javascript/data/intQObjectProperty.qml | 13 +++ .../declarative/javascript/data/localId.qml | 13 +++ .../declarative/javascript/data/nestedId.qml | 13 +++ .../javascript/data/stringQObjectProperty.qml | 14 +++ .../declarative/javascript/javascript.pro | 11 ++ .../declarative/javascript/testtypes.cpp | 48 ++++++++ .../benchmarks/declarative/javascript/testtypes.h | 65 +++++++++++ .../declarative/javascript/tst_javascript.cpp | 123 +++++++++++++++++++++ 10 files changed, 310 insertions(+) create mode 100644 tests/benchmarks/declarative/javascript/data/NestedIdObject.qml create mode 100644 tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml create mode 100644 tests/benchmarks/declarative/javascript/data/localId.qml create mode 100644 tests/benchmarks/declarative/javascript/data/nestedId.qml create mode 100644 tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml create mode 100644 tests/benchmarks/declarative/javascript/javascript.pro create mode 100644 tests/benchmarks/declarative/javascript/testtypes.cpp create mode 100644 tests/benchmarks/declarative/javascript/testtypes.h create mode 100644 tests/benchmarks/declarative/javascript/tst_javascript.cpp diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro index a827978d63..f2dfdf971a 100644 --- a/tests/benchmarks/declarative/declarative.pro +++ b/tests/benchmarks/declarative/declarative.pro @@ -3,6 +3,7 @@ TEMPLATE = subdirs SUBDIRS += \ binding \ creation \ + javascript \ holistic \ pointers \ qdeclarativecomponent \ diff --git a/tests/benchmarks/declarative/javascript/data/NestedIdObject.qml b/tests/benchmarks/declarative/javascript/data/NestedIdObject.qml new file mode 100644 index 0000000000..410ee00ddc --- /dev/null +++ b/tests/benchmarks/declarative/javascript/data/NestedIdObject.qml @@ -0,0 +1,9 @@ +import QtQuick 1.0 + +QtObject { + function runtest() { + for (var ii = 0; ii < 5000000; ++ii) { + root + } + } +} diff --git a/tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml b/tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml new file mode 100644 index 0000000000..c3e6ebc16a --- /dev/null +++ b/tests/benchmarks/declarative/javascript/data/intQObjectProperty.qml @@ -0,0 +1,13 @@ +import Qt.test 1.0 + +TestObject { + id: root + + function runtest() { + var r = root; + + for (var ii = 0; ii < 5000000; ++ii) { + r.intValue + } + } +} diff --git a/tests/benchmarks/declarative/javascript/data/localId.qml b/tests/benchmarks/declarative/javascript/data/localId.qml new file mode 100644 index 0000000000..474d0760a3 --- /dev/null +++ b/tests/benchmarks/declarative/javascript/data/localId.qml @@ -0,0 +1,13 @@ +// Benchmarks the cost of accessing an id in the same file as the script. + +import QtQuick 1.0 + +QtObject { + id: root + + function runtest() { + for (var ii = 0; ii < 5000000; ++ii) { + root + } + } +} diff --git a/tests/benchmarks/declarative/javascript/data/nestedId.qml b/tests/benchmarks/declarative/javascript/data/nestedId.qml new file mode 100644 index 0000000000..49c4e3ca43 --- /dev/null +++ b/tests/benchmarks/declarative/javascript/data/nestedId.qml @@ -0,0 +1,13 @@ +// Benchmarks the cost of accessing an id in a parent context of the script. + +import QtQuick 1.0 + +QtObject { + id: root + + property variant object: NestedIdObject {} + function runtest() { + object.runtest(); + } +} + diff --git a/tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml b/tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml new file mode 100644 index 0000000000..ccd8a791b6 --- /dev/null +++ b/tests/benchmarks/declarative/javascript/data/stringQObjectProperty.qml @@ -0,0 +1,14 @@ +import Qt.test 1.0 + +TestObject { + id: root + + function runtest() { + var r = root; + + for (var ii = 0; ii < 5000000; ++ii) { + r.stringValue + } + } +} + diff --git a/tests/benchmarks/declarative/javascript/javascript.pro b/tests/benchmarks/declarative/javascript/javascript.pro new file mode 100644 index 0000000000..7395cef07e --- /dev/null +++ b/tests/benchmarks/declarative/javascript/javascript.pro @@ -0,0 +1,11 @@ +load(qttest_p4) +TEMPLATE = app +TARGET = tst_javascript +QT += declarative +macx:CONFIG -= app_bundle + +SOURCES += tst_javascript.cpp testtypes.cpp +HEADERS += testtypes.h + +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/javascript/testtypes.cpp b/tests/benchmarks/declarative/javascript/testtypes.cpp new file mode 100644 index 0000000000..f490b770fd --- /dev/null +++ b/tests/benchmarks/declarative/javascript/testtypes.cpp @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** 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 "testtypes.h" +#include + +void registerTypes() +{ + qmlRegisterType("Qt.test", 1,0, "TestObject"); +} diff --git a/tests/benchmarks/declarative/javascript/testtypes.h b/tests/benchmarks/declarative/javascript/testtypes.h new file mode 100644 index 0000000000..c89f10757b --- /dev/null +++ b/tests/benchmarks/declarative/javascript/testtypes.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef TESTTYPES_H +#define TESTTYPES_H + +#include + +class TestObject : public QObject +{ + Q_OBJECT + Q_PROPERTY(int intValue READ intValue); + Q_PROPERTY(QString stringValue READ stringValue); + +public: + TestObject() : m_string("Hello world!") {} + + int intValue() const { return 13; } + QString stringValue() const { return m_string; } + +private: + QString m_string; +}; + +void registerTypes(); + +#endif // TESTTYPES_H diff --git a/tests/benchmarks/declarative/javascript/tst_javascript.cpp b/tests/benchmarks/declarative/javascript/tst_javascript.cpp new file mode 100644 index 0000000000..73c1d7c7ad --- /dev/null +++ b/tests/benchmarks/declarative/javascript/tst_javascript.cpp @@ -0,0 +1,123 @@ +/**************************************************************************** +** +** 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 +#include +#include +#include +#include + +#include "testtypes.h" + +class tst_javascript : public QObject +{ + Q_OBJECT + +public: + tst_javascript(); + virtual ~tst_javascript(); + +private slots: + void run_data(); + void run(); + +private: + QDeclarativeEngine engine; +}; + +tst_javascript::tst_javascript() +{ + registerTypes(); +} + +tst_javascript::~tst_javascript() +{ +} + +void tst_javascript::run_data() +{ + QTest::addColumn("file"); + + QDir dir(SRCDIR "/data"); + + QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); + + for (int ii = 0; ii < files.count(); ++ii) { + QString file = files.at(ii); + if (file.endsWith(".qml") && file.at(0).isLower()) { + + QString testName = file.left(file.length() - 4 /* strlen(".qml") */); + QString fileName = QLatin1String(SRCDIR) + QLatin1String("/data/") + file; + + + QTest::newRow(qPrintable(testName)) << fileName; + + } + } +} + +void tst_javascript::run() +{ + QFETCH(QString, file); + + QDeclarativeComponent c(&engine, file); + + if (c.isError()) { + qWarning() << c.errors(); + } + + QVERIFY(!c.isError()); + + QObject *o = c.create(); + QVERIFY(o != 0); + + QMetaMethod method = o->metaObject()->method(o->metaObject()->indexOfMethod("runtest()")); + + QBENCHMARK { + method.invoke(o); + } + + delete o; +} + +QTEST_MAIN(tst_javascript) + +#include "tst_javascript.moc" -- cgit v1.2.3