From 74dc89de3ed45ad217fdb003f663144e71ef01f8 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 16:30:54 +0200 Subject: Use QList instead of QVector in benchmarks tests Task-number: QTBUG-84469 Change-Id: Id61d6036067da0bcd0811b1b97df5f1334007b7e Reviewed-by: Lars Knoll --- .../corelib/tools/containers-sequential/main.cpp | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'tests/benchmarks/corelib/tools/containers-sequential/main.cpp') diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp index 64d3dd5733..6874c69abc 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp +++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp @@ -25,10 +25,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -// This file contains benchmarks for comparing QVector against std::vector +// This file contains benchmarks for comparing QList against std::vector #include -#include +#include #include #include @@ -51,13 +51,13 @@ T * f(T *ts) // dummy function to prevent code from being optimized away by the return ts; } -// This subclass implements the use cases using QVector as efficiently as possible. -template -class UseCases_QVector : public UseCases +// This subclass implements the use cases using QList as efficiently as possible. +template +class UseCases_QList : public UseCases { void insert(int size) { - QVector v; + QList v; T t; QBENCHMARK { for (int i = 0; i < size; ++i) @@ -67,7 +67,7 @@ class UseCases_QVector : public UseCases void lookup(int size) { - QVector v; + QList v; T t; for (int i = 0; i < size; ++i) @@ -127,17 +127,17 @@ class tst_vector_vs_std : public QObject public: tst_vector_vs_std() { - useCases_QVector_int = new UseCases_QVector; + useCases_QList_int = new UseCases_QList; useCases_stdvector_int = new UseCases_stdvector; - useCases_QVector_Large = new UseCases_QVector; + useCases_QList_Large = new UseCases_QList; useCases_stdvector_Large = new UseCases_stdvector; } private: - UseCases *useCases_QVector_int; + UseCases *useCases_QList_int; UseCases *useCases_stdvector_int; - UseCases *useCases_QVector_Large; + UseCases *useCases_QList_Large; UseCases *useCases_stdvector_Large; private slots: @@ -159,7 +159,7 @@ void tst_vector_vs_std::insert_int_data() for (int size = 10; size < 20000; size += 100) { const QByteArray sizeString = QByteArray::number(size); QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size; - QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size; + QTest::newRow(QByteArray("QList-int--" + sizeString).constData()) << false << size; } } @@ -171,7 +171,7 @@ void tst_vector_vs_std::insert_int() if (useStd) useCases_stdvector_int->insert(size); else - useCases_QVector_int->insert(size); + useCases_QList_int->insert(size); } void tst_vector_vs_std::insert_Large_data() @@ -182,7 +182,7 @@ 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(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size; - QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size; + QTest::newRow(QByteArray("QList-Large--" + sizeString).constData()) << false << size; } } @@ -194,7 +194,7 @@ void tst_vector_vs_std::insert_Large() if (useStd) useCases_stdvector_Large->insert(size); else - useCases_QVector_Large->insert(size); + useCases_QList_Large->insert(size); } void tst_vector_vs_std::lookup_int_data() @@ -205,7 +205,7 @@ void tst_vector_vs_std::lookup_int_data() for (int size = 10; size < 20000; size += 100) { const QByteArray sizeString = QByteArray::number(size); QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size; - QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size; + QTest::newRow(QByteArray("QList-int--" + sizeString).constData()) << false << size; } } @@ -217,7 +217,7 @@ void tst_vector_vs_std::lookup_int() if (useStd) useCases_stdvector_int->lookup(size); else - useCases_QVector_int->lookup(size); + useCases_QList_int->lookup(size); } void tst_vector_vs_std::lookup_Large_data() @@ -228,7 +228,7 @@ 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(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size; - QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size; + QTest::newRow(QByteArray("QList-Large--" + sizeString).constData()) << false << size; } } @@ -240,7 +240,7 @@ void tst_vector_vs_std::lookup_Large() if (useStd) useCases_stdvector_Large->lookup(size); else - useCases_QVector_Large->lookup(size); + useCases_QList_Large->lookup(size); } QTEST_MAIN(tst_vector_vs_std) -- cgit v1.2.3