summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-09-14 13:50:36 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-15 20:39:28 +0200
commit08d1ca10537b2005fa0ff93534272e277b3ae821 (patch)
tree76ec1088be51f25d33fc9c876dd245b332d2fc86 /tests/auto/corelib
parenta48e9af146ee1d7571934994065e7164fd323f18 (diff)
Boost performance of QChar::isLetterOrNumber
Make it inline; add fast checks for ascii letters and digits; add fallback function that uses the fastcall calling convention. On ia32, this change makes isLetterOrNumber ~120x faster for ascii letters and digits, ~150x faster for non-letter/digit ascii characters, and ~1.3x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: Ia4e13692f4dd79f6aa0b96da29449e0487971b0e Reviewed-on: http://codereview.qt-project.org/4904 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/tools/qchar/tst_qchar.cpp24
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 0c51422f75..f16d32a4f9 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -77,6 +77,8 @@ private slots:
void isDigit();
void isLetter_data();
void isLetter();
+ void isLetterOrNumber_data();
+ void isLetterOrNumber();
void isPrint();
void isUpper();
void isLower();
@@ -273,6 +275,28 @@ void tst_QChar::isLetter()
QCOMPARE(QChar(ucs).isLetter(), expected);
}
+void tst_QChar::isLetterOrNumber_data()
+{
+ QTest::addColumn<ushort>("ucs");
+ QTest::addColumn<bool>("expected");
+
+ for (ushort ucs = 0; ucs < 256; ++ucs) {
+ bool isLetterOrNumber = isExpectedLetter(ucs)
+ || (ucs >= '0' && ucs <= '9')
+ || ucs == 0xB2 || ucs == 0xB3 || ucs == 0xB9
+ || (ucs >= 0xBC && ucs <= 0xBE);
+ QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
+ QTest::newRow(tag.toLatin1()) << ucs << isLetterOrNumber;
+ }
+}
+
+void tst_QChar::isLetterOrNumber()
+{
+ QFETCH(ushort, ucs);
+ QFETCH(bool, expected);
+ QCOMPARE(QChar(ucs).isLetterOrNumber(), expected);
+}
+
void tst_QChar::isPrint()
{
QVERIFY(QChar('A').isPrint());