summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/corelib/tools
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-03-08 12:01:25 +0100
committerJoão Abecasis <joao.abecasis@nokia.com>2012-03-08 12:02:41 +0100
commit79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch)
tree8336143e8c09810dc97324970fed61af27e26a97 /tests/benchmarks/corelib/tools
parent7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff)
parent12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff)
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'tests/benchmarks/corelib/tools')
-rw-r--r--tests/benchmarks/corelib/tools/containers-associative/main.cpp8
-rw-r--r--tests/benchmarks/corelib/tools/containers-sequential/main.cpp16
-rw-r--r--tests/benchmarks/corelib/tools/qhash/main.cpp105
-rw-r--r--tests/benchmarks/corelib/tools/qhash/main.h8
-rw-r--r--tests/benchmarks/corelib/tools/qhash/outofline.cpp48
5 files changed, 87 insertions, 98 deletions
diff --git a/tests/benchmarks/corelib/tools/containers-associative/main.cpp b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
index 7f2e7b68ca..ab1c406708 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
@@ -72,8 +72,8 @@ void tst_associative_containers::insert_data()
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("hash--" + sizeString).constData()) << true << size;
- QTest::newRow(("map--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("map--" + sizeString).constData()) << false << size;
}
}
@@ -104,8 +104,8 @@ void tst_associative_containers::lookup_data()
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("hash--" + sizeString).constData()) << true << size;
- QTest::newRow(("map--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("map--" + sizeString).constData()) << false << size;
}
}
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
index e42a40b110..43eadb6633 100644
--- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
@@ -176,8 +176,8 @@ void tst_vector_vs_std::insert_int_data()
for (int size = 10; size < 20000; size += 100) {
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("std::vector-int--" + sizeString).constData()) << true << size;
- QTest::newRow(("QVector-int--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size;
}
}
@@ -199,8 +199,8 @@ void tst_vector_vs_std::insert_Large_data()
for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
- QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size;
}
}
@@ -222,8 +222,8 @@ void tst_vector_vs_std::lookup_int_data()
for (int size = 10; size < 20000; size += 100) {
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("std::vector-int--" + sizeString).constData()) << true << size;
- QTest::newRow(("QVector-int--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size;
}
}
@@ -245,8 +245,8 @@ void tst_vector_vs_std::lookup_Large_data()
for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
const QByteArray sizeString = QByteArray::number(size);
- QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
- QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
+ QTest::newRow(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size;
+ QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size;
}
}
diff --git a/tests/benchmarks/corelib/tools/qhash/main.cpp b/tests/benchmarks/corelib/tools/qhash/main.cpp
index 18138cbd47..67396ffd57 100644
--- a/tests/benchmarks/corelib/tools/qhash/main.cpp
+++ b/tests/benchmarks/corelib/tools/qhash/main.cpp
@@ -54,72 +54,91 @@ class tst_QHash : public QObject
Q_OBJECT
private slots:
+ void initTestCase();
void qhash_qt4_data() { data(); }
void qhash_qt4();
- void qhash_faster_data() { data(); }
- void qhash_faster();
void javaString_data() { data(); }
void javaString();
private:
void data();
+
+ QStringList smallFilePaths;
+ QStringList uuids;
+ QStringList dict;
+ QStringList numbers;
};
///////////////////// QHash /////////////////////
-void tst_QHash::data()
-{
- QTest::addColumn<QStringList>("items");
- static QStringList smallFilePaths;
-
- {
- // small list of file paths
- if (smallFilePaths.isEmpty()) {
- QFile smallPathsData("paths_small_data.txt");
- QVERIFY(smallPathsData.open(QIODevice::ReadOnly));
- smallFilePaths = QString::fromLatin1(smallPathsData.readAll()).split(QLatin1Char('\n'));
- Q_ASSERT(!smallFilePaths.isEmpty());
- }
+#include <QDebug>
- QTest::newRow("paths-small") << smallFilePaths;
- }
-
- {
- // list of UUIDs
- static QStringList uuids;
- if (uuids.isEmpty()) {
- // guaranteed to be completely random, generated by http://xkcd.com/221/
- QUuid ns = QUuid("{f43d2ef3-2fe9-4563-a6f5-5a0100c2d699}");
- uuids.reserve(smallFilePaths.size());
-
- foreach (const QString &path, smallFilePaths)
- uuids.append(QUuid::createUuidV5(ns, path).toString());
+void tst_QHash::initTestCase()
+{
+ // small list of file paths
+ QFile smallPathsData("paths_small_data.txt");
+ QVERIFY(smallPathsData.open(QIODevice::ReadOnly));
+ smallFilePaths = QString::fromLatin1(smallPathsData.readAll()).split(QLatin1Char('\n'));
+ QVERIFY(!smallFilePaths.isEmpty());
+
+ // list of UUIDs
+ // guaranteed to be completely random, generated by http://xkcd.com/221/
+ QUuid ns = QUuid("{f43d2ef3-2fe9-4563-a6f5-5a0100c2d699}");
+ uuids.reserve(smallFilePaths.size());
+
+ foreach (const QString &path, smallFilePaths)
+ uuids.append(QUuid::createUuidV5(ns, path).toString());
+
+
+ // lots of strings with alphabetical characters, vaguely reminiscent of
+ // a dictionary.
+ //
+ // this programatically generates a series like:
+ // AAAAAA
+ // AAAAAB
+ // AAAAAC
+ // ...
+ // AAAAAZ
+ // AAAABZ
+ // ...
+ // AAAAZZ
+ // AAABZZ
+ QByteArray id("AAAAAAA");
+
+ if (dict.isEmpty()) {
+ for (int i = id.length() - 1; i > 0;) {
+ dict.append(id);
+ char c = id.at(i);
+ id[i] = ++c;
+
+ if (c == 'Z') {
+ // wrap to next digit
+ i--;
+ id[i] = 'A';
+ }
}
-
- QTest::newRow("uuids-list") << uuids;
}
+ // string versions of numbers.
+ for (int i = 5000000; i < 5005001; ++i)
+ numbers.append(QString::number(i));
}
-void tst_QHash::qhash_qt4()
+void tst_QHash::data()
{
- QFETCH(QStringList, items);
- QStringList realitems = items; // for copy/paste ease between benchmarks
- QHash<QString, int> hash;
-
- QBENCHMARK {
- for (int i = 0, n = realitems.size(); i != n; ++i) {
- hash[realitems.at(i)] = i;
- }
- }
+ QTest::addColumn<QStringList>("items");
+ QTest::newRow("paths-small") << smallFilePaths;
+ QTest::newRow("uuids-list") << uuids;
+ QTest::newRow("dictionary") << dict;
+ QTest::newRow("numbers") << numbers;
}
-void tst_QHash::qhash_faster()
+void tst_QHash::qhash_qt4()
{
QFETCH(QStringList, items);
- QHash<String, int> hash;
+ QHash<Qt4String, int> hash;
- QList<String> realitems;
+ QList<Qt4String> realitems;
foreach (const QString &s, items)
realitems.append(s);
diff --git a/tests/benchmarks/corelib/tools/qhash/main.h b/tests/benchmarks/corelib/tools/qhash/main.h
index c4cf94e190..a865eaf7a6 100644
--- a/tests/benchmarks/corelib/tools/qhash/main.h
+++ b/tests/benchmarks/corelib/tools/qhash/main.h
@@ -41,14 +41,14 @@
#include <QString>
-struct String : QString
+struct Qt4String : QString
{
- String() {}
- String(const QString &s) : QString(s) {}
+ Qt4String() {}
+ Qt4String(const QString &s) : QString(s) {}
};
QT_BEGIN_NAMESPACE
-uint qHash(const String &);
+uint qHash(const Qt4String &);
QT_END_NAMESPACE
diff --git a/tests/benchmarks/corelib/tools/qhash/outofline.cpp b/tests/benchmarks/corelib/tools/qhash/outofline.cpp
index 162c604a35..75d99f96f8 100644
--- a/tests/benchmarks/corelib/tools/qhash/outofline.cpp
+++ b/tests/benchmarks/corelib/tools/qhash/outofline.cpp
@@ -41,49 +41,19 @@
#include "main.h"
-static void doHash(const unsigned short *p, uint &h)
-{
-#if 1
- // Copied from static uint hash(const QChar *p, int n).
- // Possibly not the cheapest way.
- h = (h << 4) + (*p++);
- h ^= (h & 0xf0000000) >> 23;
- h &= 0x0fffffff;
-
- h = (h << 4) + (*p++);
- h ^= (h & 0xf0000000) >> 23;
- h &= 0x0fffffff;
-
- h = (h << 4) + (*p++);
- h ^= (h & 0xf0000000) >> 23;
- h &= 0x0fffffff;
-
- h = (h << 4) + (*p++);
- h ^= (h & 0xf0000000) >> 23;
- h &= 0x0fffffff;
-#else
- // Faster, but probably less spread.
- h ^= *(unsigned int *)p;
-#endif
-}
-
QT_BEGIN_NAMESPACE
-uint qHash(const String &str)
+uint qHash(const Qt4String &str)
{
- const unsigned short *p = (unsigned short *)str.constData();
- const int s = str.size();
- switch (s) {
- case 0: return 0;
- case 1: return *p;
- case 2: return *(unsigned int *)p;
- case 3: return (*(unsigned int *)p) ^ *(p + 2);
- //case 3: return (*p << 11) + (*(p + 1) << 22) + *(p + 2);
- }
+ int n = str.length();
+ const QChar *p = str.unicode();
uint h = 0;
- doHash(p, h);
- doHash(p + s / 2 - 2, h);
- doHash(p + s - 4, h);
+
+ while (n--) {
+ h = (h << 4) + (*p++).unicode();
+ h ^= (h & 0xf0000000) >> 23;
+ h &= 0x0fffffff;
+ }
return h;
}