1 files changed, 40 insertions, 8 deletions

diff --git a/tests/benchmarks/corelib/tools/qhash/tst_bench_qhash.cpp b/tests/benchmarks/corelib/tools/qhash/tst_bench_qhash.cpp
index fd0a74b52a..1a62a48437 100644
--- a/tests/benchmarks/corelib/tools/qhash/tst_bench_qhash.cpp
+++ b/tests/benchmarks/corelib/tools/qhash/tst_bench_qhash.cpp
@@ -1,6 +1,8 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // Copyright (C) 2016 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
 
 #include "tst_bench_qhash.h"
 
@@ -11,6 +13,8 @@
 #include <QUuid>
 #include <QTest>
 
+static constexpr quint64 RandomSeed32 = 1045982819;
+static constexpr quint64 RandomSeed64 = QtPrivate::QHashCombine{}(RandomSeed32, RandomSeed32);
 
 class tst_QHash : public QObject
 {
@@ -29,6 +33,8 @@ private slots:
 
     void hashing_current_data() { data(); }
     void hashing_current() { hashing_template<QString>(); }
+    void hashing_qbytearray_data() { data(); }
+    void hashing_qbytearray() { hashing_template<QByteArray>(); }
     void hashing_qt50_data() { data(); }
     void hashing_qt50()  { hashing_template<Qt50String>(); }
     void hashing_qt4_data() { data(); }
@@ -36,15 +42,25 @@ private slots:
     void hashing_javaString_data() { data(); }
     void hashing_javaString() { hashing_template<JavaString>(); }
 
+    void hashing_nonzero_current_data() { data(); }
+    void hashing_nonzero_current() { hashing_nonzero_template<QString>(); }
+    void hashing_nonzero_qbytearray_data() { data(); }
+    void hashing_nonzero_qbytearray() { hashing_nonzero_template<QByteArray>(); }
+    void hashing_nonzero_qlatin1string_data() { data(); }
+    void hashing_nonzero_qlatin1string() { hashing_nonzero_template<OwningLatin1String>(); }
+
 private:
     void data();
     template <typename String> void qhash_template();
-    template <typename String> void hashing_template();
+    template <typename String, size_t Seed = 0> void hashing_template();
+    template <typename String> void hashing_nonzero_template()
+    { hashing_template<String, size_t(RandomSeed64)>(); }
 
     QStringList smallFilePaths;
     QStringList uuids;
     QStringList dict;
     QStringList numbers;
+    QStringList longstrings;
 };
 
 ///////////////////// QHash /////////////////////
@@ -53,6 +69,8 @@ private:
 
 void tst_QHash::initTestCase()
 {
+    QHashSeed::setDeterministicGlobalSeed();
+
     // small list of strings (that happen to look like file paths produced long
     // ago by cd ../.. && find . -print, but that's irrelevant).
     QFile smallPathsData(QFINDTESTDATA("paths_small_data.txt"));
@@ -64,10 +82,12 @@ void tst_QHash::initTestCase()
     // guaranteed to be completely random, generated by http://xkcd.com/221/
     QUuid ns = QUuid("{f43d2ef3-2fe9-4563-a6f5-5a0100c2d699}");
     uuids.reserve(smallFilePaths.size());
+    longstrings.reserve(smallFilePaths.size());
 
     foreach (const QString &path, smallFilePaths)
         uuids.append(QUuid::createUuidV5(ns, path).toString());
-
+    for (qsizetype i = 0; i < uuids.size(); ++i)
+        longstrings.append(uuids.at(i).repeated(8));
 
     // lots of strings with alphabetical characters, vaguely reminiscent of
     // a dictionary.
@@ -108,6 +128,7 @@ void tst_QHash::data()
     QTest::addColumn<QStringList>("items");
     QTest::newRow("paths-small") << smallFilePaths;
     QTest::newRow("uuids-list") << uuids;
+    QTest::newRow("longstrings-list") << longstrings;
     QTest::newRow("dictionary") << dict;
     QTest::newRow("numbers") << numbers;
 }
@@ -128,19 +149,30 @@ template <typename String> void tst_QHash::qhash_template()
     }
 }
 
-template <typename String> void tst_QHash::hashing_template()
+template <typename String, size_t Seed> void tst_QHash::hashing_template()
 {
     // just the hashing function
     QFETCH(QStringList, items);
 
     QList<String> realitems;
     realitems.reserve(items.size());
-    foreach (const QString &s, items)
-        realitems.append(s);
+    foreach (const QString &s, items) {
+        if constexpr (std::is_same_v<QString::value_type, typename String::value_type>) {
+            realitems.append(s);
+        } else if constexpr (sizeof(typename String::value_type) == 1) {
+            realitems.append(String(s.toLatin1()));
+        }
+    }
 
     QBENCHMARK {
-        for (int i = 0, n = realitems.size(); i != n; ++i)
-            (void)qHash(realitems.at(i));
+        for (int i = 0, n = realitems.size(); i != n; ++i) {
+            volatile size_t h = qHash(realitems.at(i), Seed);
+            (void)h;
+#ifdef Q_CC_GNU
+            // "use" h
+            asm ("" : "+r" (h));
+#endif
+        }
     }
 }