1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make two QDT benchmarks data-driven and add more rows

Browse Source 
The QDateTime benchmark's toMSecsSinceEpoch() and
toMSecsSinceEpochTz() each iterated the 2010s and had 1950 and 2050
variants for two other decades. I want to also test some earlier
decades and do similar for create(), so combine the existing triplets
as three rows of a data-driven test for each triplet, add the new rows
and apply the same to create().

In the process, turn an enum used for qint64 constants into a set of
constexpr qint64 declarations.

Task-number: QTBUG-104012
Change-Id: I2657346b65d96a7ef7503cd33c870b688ea5dbff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 12eac545b6f5a6f963fcc1d06c3ae426260adb9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2022-06-03 17:02:25 +02:00 committed by Qt Cherry-pick Bot
parent 16414f6d35
commit 265ca8528c
1 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp
View File

@ -11,24 +11,12 @@ class tst_QDateTime : public QObject
{ {
Q_OBJECT Q_OBJECT
enum : qint64
{
SECS_PER_DAY = 86400,
MSECS_PER_DAY = 86400000,
JULIAN_DAY_1950 = 2433283,
JULIAN_DAY_1960 = 2436935,
JULIAN_DAY_1970 = 2440588, // Epoch
JULIAN_DAY_2010 = 2455198,
JULIAN_DAY_2011 = 2455563,
JULIAN_DAY_2020 = 2458850,
JULIAN_DAY_2050 = 2469808,
JULIAN_DAY_2060 = 2473460
};
static QList<QDateTime> daily(qint64 start, qint64 end); static QList<QDateTime> daily(qint64 start, qint64 end);
static QList<QDateTime> norse(qint64 start, qint64 end); static QList<QDateTime> norse(qint64 start, qint64 end);
void decade_data();
private Q_SLOTS: private Q_SLOTS:
void create_data() { decade_data(); }
void create(); void create();
void isNull(); void isNull();
void isValid(); void isValid();
@ -37,12 +25,10 @@ private Q_SLOTS:
void timeSpec(); void timeSpec();
void offsetFromUtc(); void offsetFromUtc();
void timeZoneAbbreviation(); void timeZoneAbbreviation();
void toMSecsSinceEpoch_data() { decade_data(); }
void toMSecsSinceEpoch(); void toMSecsSinceEpoch();
void toMSecsSinceEpoch1950(); void toMSecsSinceEpochTz_data() { decade_data(); }
void toMSecsSinceEpoch2050();
void toMSecsSinceEpochTz(); void toMSecsSinceEpochTz();
void toMSecsSinceEpoch1950Tz();
void toMSecsSinceEpoch2050Tz();
void setDate(); void setDate();
void setTime(); void setTime();
void setTimeSpec(); void setTimeSpec();
@ -77,6 +63,33 @@ private Q_SLOTS:
void fromMSecsSinceEpochTz(); void fromMSecsSinceEpochTz();
}; };
constexpr qint64 SECS_PER_DAY = 86400;
constexpr qint64 MSECS_PER_DAY = 86400000;
constexpr qint64 JULIAN_DAY_1 = 1721426;
constexpr qint64 JULIAN_DAY_11 = 1725078;
constexpr qint64 JULIAN_DAY_1890 = 2411369;
constexpr qint64 JULIAN_DAY_1900 = 2415021;
constexpr qint64 JULIAN_DAY_1950 = 2433283;
constexpr qint64 JULIAN_DAY_1960 = 2436935;
constexpr qint64 JULIAN_DAY_1970 = 2440588; // Epoch
constexpr qint64 JULIAN_DAY_2010 = 2455198;
constexpr qint64 JULIAN_DAY_2011 = 2455563;
constexpr qint64 JULIAN_DAY_2020 = 2458850;
constexpr qint64 JULIAN_DAY_2050 = 2469808;
constexpr qint64 JULIAN_DAY_2060 = 2473460;
void tst_QDateTime::decade_data()
{
QTest::addColumn<qint64>("startJd");
QTest::addColumn<qint64>("stopJd");
QTest::newRow("first-decade-CE") << JULIAN_DAY_1 << JULIAN_DAY_11;
QTest::newRow("1890s") << JULIAN_DAY_1890 << JULIAN_DAY_1900;
QTest::newRow("1950s") << JULIAN_DAY_1950 << JULIAN_DAY_1960;
QTest::newRow("2010s") << JULIAN_DAY_2010 << JULIAN_DAY_2020;
QTest::newRow("2050s") << JULIAN_DAY_2050 << JULIAN_DAY_2060;
}
QList<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end) QList<QDateTime> tst_QDateTime::daily(qint64 start, qint64 end)
{ {
QList<QDateTime> list; QList<QDateTime> list;
@ -98,9 +111,11 @@ QList<QDateTime> tst_QDateTime::norse(qint64 start, qint64 end)
void tst_QDateTime::create() void tst_QDateTime::create()
{ {
QFETCH(const qint64, startJd);
QFETCH(const qint64, stopJd);
const QTime noon = QTime::fromMSecsSinceStartOfDay(43200); const QTime noon = QTime::fromMSecsSinceStartOfDay(43200);
QBENCHMARK { QBENCHMARK {
for (int jd = JULIAN_DAY_2010; jd < JULIAN_DAY_2020; ++jd) { for (int jd = startJd; jd < stopJd; ++jd) {
QDateTime test(QDate::fromJulianDay(jd), noon); QDateTime test(QDate::fromJulianDay(jd), noon);
Q_UNUSED(test); Q_UNUSED(test);
} }
@ -172,25 +187,9 @@ void tst_QDateTime::timeZoneAbbreviation()
void tst_QDateTime::toMSecsSinceEpoch() void tst_QDateTime::toMSecsSinceEpoch()
{ {
const auto list = daily(JULIAN_DAY_2010, JULIAN_DAY_2020); QFETCH(const qint64, startJd);
QBENCHMARK { QFETCH(const qint64, stopJd);
for (const QDateTime &test : list) const auto list = daily(startJd, stopJd);
test.toMSecsSinceEpoch();
}
}
void tst_QDateTime::toMSecsSinceEpoch1950()
{
const auto list = daily(JULIAN_DAY_1950, JULIAN_DAY_1960);
QBENCHMARK {
for (const QDateTime &test : list)
test.toMSecsSinceEpoch();
}
}
void tst_QDateTime::toMSecsSinceEpoch2050()
{
const auto list = daily(JULIAN_DAY_2050, JULIAN_DAY_2060);
QBENCHMARK { QBENCHMARK {
for (const QDateTime &test : list) for (const QDateTime &test : list)
test.toMSecsSinceEpoch(); test.toMSecsSinceEpoch();
@ -199,30 +198,11 @@ void tst_QDateTime::toMSecsSinceEpoch2050()
void tst_QDateTime::toMSecsSinceEpochTz() void tst_QDateTime::toMSecsSinceEpochTz()
{ {
qint64 result; QFETCH(const qint64, startJd);
const auto list = norse(JULIAN_DAY_2010, JULIAN_DAY_2020); QFETCH(const qint64, stopJd);
QBENCHMARK { const auto list = norse(startJd, stopJd);
for (const QDateTime &test : list)
result = test.toMSecsSinceEpoch();
}
Q_UNUSED(result);
}
void tst_QDateTime::toMSecsSinceEpoch1950Tz()
{
qint64 result; qint64 result;
const auto list = norse(JULIAN_DAY_1950, JULIAN_DAY_1960);
QBENCHMARK {
for (const QDateTime &test : list)
result = test.toMSecsSinceEpoch();
}
Q_UNUSED(result);
}
void tst_QDateTime::toMSecsSinceEpoch2050Tz()
{
qint64 result;
const auto list = norse(JULIAN_DAY_2050, JULIAN_DAY_2060);
QBENCHMARK { QBENCHMARK {
for (const QDateTime &test : list) for (const QDateTime &test : list)
result = test.toMSecsSinceEpoch(); result = test.toMSecsSinceEpoch();