mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #17615: Expand expensive PyUnicode_READ() macro in unicode_compare():

Browse source 
write specialized functions for each combination of Unicode kinds.
This commit is contained in:
Victor Stinner 2013-04-08 21:50:54 +02:00
parent ffcd339aac
commit c1302bba4c
1 changed files with 78 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Objects/unicodeobject.c
View file

@ -10241,10 +10241,24 @@ unicode_center(PyObject *self, PyObject *args)
static int static int
unicode_compare(PyObject *str1, PyObject *str2) unicode_compare(PyObject *str1, PyObject *str2)
{ {
#define COMPARE(TYPE1, TYPE2) \
do { \
TYPE1* p1 = (TYPE1 *)data1; \
TYPE2* p2 = (TYPE2 *)data2; \
TYPE1* end = p1 + len; \
Py_UCS4 c1, c2; \
for (; p1 != end; p1++, p2++) { \
c1 = *p1; \
c2 = *p2; \
if (c1 != c2) \
return (c1 < c2) ? -1 : 1; \
} \
} \
while (0)
int kind1, kind2; int kind1, kind2;
void *data1, *data2; void *data1, *data2;
Py_ssize_t len1, len2; Py_ssize_t len1, len2, len;
Py_ssize_t i, len;
/* a string is equal to itself */ /* a string is equal to itself */
if (str1 == str2) if (str1 == str2)
@ -10258,23 +10272,67 @@ unicode_compare(PyObject *str1, PyObject *str2)
len2 = PyUnicode_GET_LENGTH(str2); len2 = PyUnicode_GET_LENGTH(str2);
len = Py_MIN(len1, len2); len = Py_MIN(len1, len2);
if (kind1 == 1 && kind2 == 1) { switch(kind1) {
int cmp = memcmp(data1, data2, len); case PyUnicode_1BYTE_KIND:
/* normalize result of memcmp() into the range [-1; 1] */ {
if (cmp < 0) switch(kind2) {
return -1; case PyUnicode_1BYTE_KIND:
if (cmp > 0) {
return 1; int cmp = memcmp(data1, data2, len);
} /* normalize result of memcmp() into the range [-1; 1] */
else { if (cmp < 0)
for (i = 0; i < len; ++i) { return -1;
Py_UCS4 c1, c2; if (cmp > 0)
c1 = PyUnicode_READ(kind1, data1, i); return 1;
c2 = PyUnicode_READ(kind2, data2, i); break;
if (c1 != c2)
return (c1 < c2) ? -1 : 1;
} }
case PyUnicode_2BYTE_KIND:
COMPARE(Py_UCS1, Py_UCS2);
break;
case PyUnicode_4BYTE_KIND:
COMPARE(Py_UCS1, Py_UCS4);
break;
default:
assert(0);
}
break;
}
case PyUnicode_2BYTE_KIND:
{
switch(kind2) {
case PyUnicode_1BYTE_KIND:
COMPARE(Py_UCS2, Py_UCS1);
break;
case PyUnicode_2BYTE_KIND:
COMPARE(Py_UCS2, Py_UCS2);
break;
case PyUnicode_4BYTE_KIND:
COMPARE(Py_UCS2, Py_UCS4);
break;
default:
assert(0);
}
break;
}
case PyUnicode_4BYTE_KIND:
{
switch(kind2) {
case PyUnicode_1BYTE_KIND:
COMPARE(Py_UCS4, Py_UCS1);
break;
case PyUnicode_2BYTE_KIND:
COMPARE(Py_UCS4, Py_UCS2);
break;
case PyUnicode_4BYTE_KIND:
COMPARE(Py_UCS4, Py_UCS4);
break;
default:
assert(0);
}
break;
}
default:
assert(0);
} }
if (len1 == len2) if (len1 == len2)
@ -10283,6 +10341,8 @@ unicode_compare(PyObject *str1, PyObject *str2)
return -1; return -1;
else else
return 1; return 1;
#undef COMPARE
} }
static int static int