summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-09-14 13:38:39 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-15 20:39:28 +0200
commita48e9af146ee1d7571934994065e7164fd323f18 (patch)
treeeae84b3faf30a4c0c7489ec2b6c6c0da1f4630fa /tests/auto
parent5639423ea7322d5880d68c61c480a3a084ac4f8b (diff)
Boost performance of QChar::isLetter
Make it inline; add fast checks for ascii letters; add fallback function that uses the fastcall calling convention. On ia32, this change makes isLetter ~370x faster for ascii letters, ~250x faster for non-letter ascii characters, and ~1.5x 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: I06f8d3d43114537cee5567e670898cef6494c20a Reviewed-on: http://codereview.qt-project.org/4903 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/tools/qchar/tst_qchar.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 5a2a4834db..0c51422f75 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -75,6 +75,8 @@ private slots:
void toCaseFolded();
void isDigit_data();
void isDigit();
+ void isLetter_data();
+ void isLetter();
void isPrint();
void isUpper();
void isLower();
@@ -244,6 +246,33 @@ void tst_QChar::isDigit()
QCOMPARE(QChar(ucs).isDigit(), expected);
}
+static bool isExpectedLetter(ushort ucs)
+{
+ return (ucs >= 'a' && ucs <= 'z') || (ucs >= 'A' && ucs <= 'Z')
+ || ucs == 0xAA || ucs == 0xB5 || ucs == 0xBA
+ || (ucs >= 0xC0 && ucs <= 0xD6)
+ || (ucs >= 0xD8 && ucs <= 0xF6)
+ || (ucs >= 0xF8 && ucs <= 0xFF);
+}
+
+void tst_QChar::isLetter_data()
+{
+ QTest::addColumn<ushort>("ucs");
+ QTest::addColumn<bool>("expected");
+
+ for (ushort ucs = 0; ucs < 256; ++ucs) {
+ QString tag = QString::fromLatin1("0x%0").arg(QString::number(ucs, 16));
+ QTest::newRow(tag.toLatin1()) << ucs << isExpectedLetter(ucs);
+ }
+}
+
+void tst_QChar::isLetter()
+{
+ QFETCH(ushort, ucs);
+ QFETCH(bool, expected);
+ QCOMPARE(QChar(ucs).isLetter(), expected);
+}
+
void tst_QChar::isPrint()
{
QVERIFY(QChar('A').isPrint());