diff options
Diffstat (limited to 'tests/benchmarks/corelib')
7 files changed, 103 insertions, 93 deletions
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp index 4818be5389..3a605c89c8 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -70,16 +70,6 @@ private slots: void isRegisteredCustom(); void isRegisteredNotRegistered(); - void constructCoreType_data(); - void constructCoreType(); - void constructCoreTypeStaticLess_data(); - void constructCoreTypeStaticLess(); - void constructCoreTypeCopy_data(); - void constructCoreTypeCopy(); - - void constructCustomType_data(); - void constructCustomType(); - void constructInPlace_data(); void constructInPlace(); void constructInPlaceCopy_data(); @@ -250,91 +240,15 @@ void tst_QMetaType::isRegisteredNotRegistered() } } -void tst_QMetaType::constructCoreType_data() +void tst_QMetaType::constructInPlace_data() { QTest::addColumn<int>("typeId"); for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) if (i != QMetaType::Void) QTest::newRow(QMetaType::typeName(i)) << i; - // GUI types are tested in tst_QGuiMetaType. -} - -// Tests how fast QMetaType can default-construct and destroy a Qt -// core type. The purpose of this benchmark is to measure the overhead -// of using type id-based creation compared to creating the type -// directly (i.e. "T *t = new T(); delete t;"). -void tst_QMetaType::constructCoreType() -{ - QFETCH(int, typeId); - QBENCHMARK { - for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::create(typeId, (void *)0); - QMetaType::destroy(typeId, data); - } - } -} - -void tst_QMetaType::constructCoreTypeStaticLess_data() -{ - constructCoreType_data(); -} - -void tst_QMetaType::constructCoreTypeStaticLess() -{ - QFETCH(int, typeId); - QBENCHMARK { - QMetaType type(typeId); - for (int i = 0; i < 100000; ++i) { - void *data = type.create((void *)0); - type.destroy(data); - } - } -} - -void tst_QMetaType::constructCoreTypeCopy_data() -{ - constructCoreType_data(); -} - -// Tests how fast QMetaType can copy-construct and destroy a Qt core -// type. The purpose of this benchmark is to measure the overhead of -// using type id-based creation compared to creating the type directly -// (i.e. "T *t = new T(other); delete t;"). -void tst_QMetaType::constructCoreTypeCopy() -{ - QFETCH(int, typeId); - QVariant other(typeId, (void *)0); - const void *copy = other.constData(); - QBENCHMARK { - for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::create(typeId, copy); - QMetaType::destroy(typeId, data); - } - } -} - -void tst_QMetaType::constructCustomType_data() -{ - QTest::addColumn<int>("typeId"); - QTest::newRow("BigClass") << qMetaTypeId<BigClass>(); -} - -void tst_QMetaType::constructCustomType() -{ - QFETCH(int, typeId); - QBENCHMARK { - for (int i = 0; i < 100000; ++i) { - void *data = QMetaType::create(typeId, (void *)0); - QMetaType::destroy(typeId, data); - } - } -} - -void tst_QMetaType::constructInPlace_data() -{ - constructCoreType_data(); QTest::newRow("custom") << qMetaTypeId<BigClass>(); + // GUI types are tested in tst_QGuiMetaType. } void tst_QMetaType::constructInPlace() diff --git a/tests/benchmarks/corelib/tools/qdatetime/main.cpp b/tests/benchmarks/corelib/tools/qdatetime/main.cpp index 1eb423c8e7..34815af646 100644 --- a/tests/benchmarks/corelib/tools/qdatetime/main.cpp +++ b/tests/benchmarks/corelib/tools/qdatetime/main.cpp @@ -48,7 +48,11 @@ class tst_QDateTime : public QObject { Q_OBJECT - enum { + enum +#if defined(Q_COMPILER_CLASS_ENUM) || (defined(Q_CC_MSVC) && _MSC_VER >= 1700) + : qint64 +#endif + { SECS_PER_DAY = 86400, MSECS_PER_DAY = 86400000, JULIAN_DAY_1950 = 2433283, diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index 74544519f3..d194d2b698 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -11,7 +11,7 @@ qtHaveModule(script):!pcre { QT += script } -exists( /usr/include/boost/regex.hpp ){ +exists($$[QT_SYSROOT]/usr/include/boost/regex.hpp) { DEFINES+=HAVE_BOOST LIBS+=-lboost_regex } diff --git a/tests/benchmarks/corelib/tools/qringbuffer/main.cpp b/tests/benchmarks/corelib/tools/qringbuffer/main.cpp new file mode 100644 index 0000000000..ebc87aa0cb --- /dev/null +++ b/tests/benchmarks/corelib/tools/qringbuffer/main.cpp @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <private/qringbuffer_p.h> +#include <QByteArray> + +#include <qtest.h> + +class tst_qringbuffer : public QObject +{ + Q_OBJECT +private slots: + void reserveAndRead(); + void free(); +}; + +void tst_qringbuffer::reserveAndRead() +{ + QRingBuffer ringBuffer; + QBENCHMARK { + for (int i = 1; i < 256; ++i) + ringBuffer.reserve(i); + + for (int i = 1; i < 256; ++i) + ringBuffer.read(0, i); + } +} + +void tst_qringbuffer::free() +{ + QRingBuffer ringBuffer; + QBENCHMARK { + ringBuffer.reserve(4096); + ringBuffer.reserve(2048); + ringBuffer.append(QByteArray("01234", 5)); + + ringBuffer.free(1); + ringBuffer.free(4096); + ringBuffer.free(48); + ringBuffer.free(2000); + } +} + +QTEST_MAIN(tst_qringbuffer) + +#include "main.moc" diff --git a/tests/benchmarks/corelib/tools/qringbuffer/qringbuffer.pro b/tests/benchmarks/corelib/tools/qringbuffer/qringbuffer.pro new file mode 100644 index 0000000000..21b50e10e5 --- /dev/null +++ b/tests/benchmarks/corelib/tools/qringbuffer/qringbuffer.pro @@ -0,0 +1,7 @@ +TEMPLATE = app +TARGET = tst_bench_qringbuffer + +QT = core-private testlib +CONFIG += release + +SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 6101cfe8fb..b94d9f5d66 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -2388,7 +2388,7 @@ int fromUtf8_sse2_trusted_no_bom(ushort *qch, const char *chars, int len) } #endif -#ifdef __ARM_NEON__ +#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__)) int fromUtf8_latin1_neon(ushort *dst, const char *chars, int len) { fromLatin1_neon_improved(dst, chars, len); @@ -2521,7 +2521,7 @@ void tst_QString::fromUtf8Alternatives_data() const QTest::newRow("sse2-optimized-for-ascii") << &fromUtf8_sse2_optimised_for_ascii; QTest::newRow("sse2-trusted-no-bom") << &fromUtf8_sse2_trusted_no_bom; #endif -#ifdef __ARM_NEON__ +#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__)) QTest::newRow("neon") << &fromUtf8_neon; QTest::newRow("neon-trusted-no-bom") << &fromUtf8_neon_trusted; #endif @@ -2531,7 +2531,7 @@ void tst_QString::fromUtf8Alternatives_data() const QTest::newRow("latin1-sse2-qt4.7") << &fromUtf8_latin1_qt47; QTest::newRow("latin1-sse2-improved") << &fromUtf8_latin1_sse2_improved; #endif -#ifdef __ARM_NEON__ +#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__)) QTest::newRow("latin1-neon-improved") << &fromUtf8_latin1_neon; #endif } diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro index 08570aadb9..00abd75839 100644 --- a/tests/benchmarks/corelib/tools/tools.pro +++ b/tests/benchmarks/corelib/tools/tools.pro @@ -11,6 +11,7 @@ SUBDIRS = \ qmap \ qrect \ qregexp \ + qringbuffer \ qstring \ qstringbuilder \ qstringlist \ |