mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-14 16:26:17 +01:00
Reorganized utf8-performance tests
Now each function-string pair gets its own test path to track a single performance result. https://bugzilla.gnome.org/show_bug.cgi?id=738504
This commit is contained in:
parent
b963565125
commit
401f78652c
@ -35,24 +35,33 @@ static const char str_cyrillic[] =
|
|||||||
|
|
||||||
/* First sentence from the Wikipedia article:
|
/* First sentence from the Wikipedia article:
|
||||||
* http://zh.wikipedia.org/w/index.php?title=%E6%B1%89%E5%AD%97&oldid=13053137 */
|
* http://zh.wikipedia.org/w/index.php?title=%E6%B1%89%E5%AD%97&oldid=13053137 */
|
||||||
static const char str_chinese[] =
|
static const char str_han[] =
|
||||||
"漢字,亦稱中文字、中国字,在台灣又被稱為國字,是漢字文化圈廣泛使用的一種文字,屬於表意文字的詞素音節文字";
|
"漢字,亦稱中文字、中国字,在台灣又被稱為國字,是漢字文化圈廣泛使用的一種文字,屬於表意文字的詞素音節文字";
|
||||||
|
|
||||||
typedef int (* GrindFunc) (const char *, gsize);
|
typedef int (* GrindFunc) (const char *, gsize);
|
||||||
|
|
||||||
|
#define GRIND_LOOP_BEGIN \
|
||||||
|
{ \
|
||||||
|
int i; \
|
||||||
|
for (i = 0; i < NUM_ITERATIONS; i++)
|
||||||
|
|
||||||
|
#define GRIND_LOOP_END \
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_get_char (const char *str, gsize len)
|
grind_get_char (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
gunichar acc = 0;
|
gunichar acc = 0;
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
const char *p = str;
|
const char *p = str;
|
||||||
while (*p) {
|
while (*p)
|
||||||
acc += g_utf8_get_char (p);
|
{
|
||||||
p = g_utf8_next_char (p);
|
acc += g_utf8_get_char (p);
|
||||||
}
|
p = g_utf8_next_char (p);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return acc;
|
return acc;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,28 +69,29 @@ static int
|
|||||||
grind_get_char_validated (const char *str, gsize len)
|
grind_get_char_validated (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
gunichar acc = 0;
|
gunichar acc = 0;
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
const char *p = str;
|
const char *p = str;
|
||||||
while (*p) {
|
while (*p)
|
||||||
acc += g_utf8_get_char_validated (p, -1);
|
{
|
||||||
p = g_utf8_next_char (p);
|
acc += g_utf8_get_char_validated (p, -1);
|
||||||
}
|
p = g_utf8_next_char (p);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return acc;
|
return acc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_to_ucs4 (const char *str, gsize len)
|
grind_utf8_to_ucs4 (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
gunichar *ustr;
|
gunichar *ustr;
|
||||||
ustr = g_utf8_to_ucs4 (str, -1, NULL, NULL, NULL);
|
ustr = g_utf8_to_ucs4 (str, -1, NULL, NULL, NULL);
|
||||||
g_free (ustr);
|
g_free (ustr);
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,8 +99,7 @@ static int
|
|||||||
grind_get_char_backwards (const char *str, gsize len)
|
grind_get_char_backwards (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
gunichar acc = 0;
|
gunichar acc = 0;
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
const char *p = str + len;
|
const char *p = str + len;
|
||||||
do
|
do
|
||||||
@ -100,69 +109,78 @@ grind_get_char_backwards (const char *str, gsize len)
|
|||||||
}
|
}
|
||||||
while (p != str);
|
while (p != str);
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return acc;
|
return acc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_to_ucs4_sized (const char *str, gsize len)
|
grind_utf8_to_ucs4_sized (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
gunichar *ustr;
|
gunichar *ustr;
|
||||||
ustr = g_utf8_to_ucs4 (str, len, NULL, NULL, NULL);
|
ustr = g_utf8_to_ucs4 (str, len, NULL, NULL, NULL);
|
||||||
g_free (ustr);
|
g_free (ustr);
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_to_ucs4_fast (const char *str, gsize len)
|
grind_utf8_to_ucs4_fast (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
gunichar *ustr;
|
gunichar *ustr;
|
||||||
ustr = g_utf8_to_ucs4_fast (str, -1, NULL);
|
ustr = g_utf8_to_ucs4_fast (str, -1, NULL);
|
||||||
g_free (ustr);
|
g_free (ustr);
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_to_ucs4_fast_sized (const char *str, gsize len)
|
grind_utf8_to_ucs4_fast_sized (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
{
|
{
|
||||||
gunichar *ustr;
|
gunichar *ustr;
|
||||||
ustr = g_utf8_to_ucs4_fast (str, len, NULL);
|
ustr = g_utf8_to_ucs4_fast (str, len, NULL);
|
||||||
g_free (ustr);
|
g_free (ustr);
|
||||||
}
|
}
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_validate (const char *str, gsize len)
|
grind_utf8_validate (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
g_utf8_validate (str, -1, NULL);
|
g_utf8_validate (str, -1, NULL);
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
grind_utf8_validate_sized (const char *str, gsize len)
|
grind_utf8_validate_sized (const char *str, gsize len)
|
||||||
{
|
{
|
||||||
int i;
|
GRIND_LOOP_BEGIN
|
||||||
for (i = 0; i < NUM_ITERATIONS; i++)
|
|
||||||
g_utf8_validate (str, len, NULL);
|
g_utf8_validate (str, len, NULL);
|
||||||
|
GRIND_LOOP_END;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typedef struct _GrindData {
|
||||||
|
GrindFunc func;
|
||||||
|
const char *str;
|
||||||
|
} GrindData;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
perform_for (GrindFunc grind_func, const char *str, const char *label)
|
perform (gconstpointer data)
|
||||||
{
|
{
|
||||||
|
GrindData *gd = (GrindData *) data;
|
||||||
|
GrindFunc grind_func = gd->func;
|
||||||
|
const char *str = gd->str;
|
||||||
gsize len;
|
gsize len;
|
||||||
gulong bytes_ground;
|
gulong bytes_ground;
|
||||||
gdouble time_elapsed;
|
gdouble time_elapsed;
|
||||||
@ -179,21 +197,32 @@ perform_for (GrindFunc grind_func, const char *str, const char *label)
|
|||||||
|
|
||||||
result = ((gdouble) bytes_ground / time_elapsed) * 1.0e-6;
|
result = ((gdouble) bytes_ground / time_elapsed) * 1.0e-6;
|
||||||
|
|
||||||
g_test_maximized_result (result, "%-9s %6.1f MB/s", label, result);
|
g_test_maximized_result (result, "%7.1f MB/s", result);
|
||||||
|
|
||||||
|
g_slice_free (GrindData, gd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
perform (gconstpointer data)
|
add_cases(const char *path, GrindFunc func)
|
||||||
{
|
{
|
||||||
GrindFunc grind_func = (GrindFunc) data;
|
#define ADD_CASE(script) \
|
||||||
|
G_STMT_START { \
|
||||||
|
GrindData *gd; \
|
||||||
|
gchar *full_path; \
|
||||||
|
gd = g_slice_new0(GrindData); \
|
||||||
|
gd->func = func; \
|
||||||
|
gd->str = str_##script; \
|
||||||
|
full_path = g_strdup_printf("%s/" #script, path); \
|
||||||
|
g_test_add_data_func (full_path, gd, perform); \
|
||||||
|
g_free (full_path); \
|
||||||
|
} G_STMT_END
|
||||||
|
|
||||||
if (!g_test_perf ())
|
ADD_CASE(ascii);
|
||||||
return;
|
ADD_CASE(latin1);
|
||||||
|
ADD_CASE(cyrillic);
|
||||||
|
ADD_CASE(han);
|
||||||
|
|
||||||
perform_for (grind_func, str_ascii, "ASCII:");
|
#undef ADD_CASE
|
||||||
perform_for (grind_func, str_latin1, "Latin-1:");
|
|
||||||
perform_for (grind_func, str_cyrillic, "Cyrillic:");
|
|
||||||
perform_for (grind_func, str_chinese, "Chinese:");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -203,15 +232,15 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
if (g_test_perf ())
|
if (g_test_perf ())
|
||||||
{
|
{
|
||||||
g_test_add_data_func ("/utf8/perf/get_char", grind_get_char, perform);
|
add_cases ("/utf8/perf/get_char", grind_get_char);
|
||||||
g_test_add_data_func ("/utf8/perf/get_char-backwards", grind_get_char_backwards, perform);
|
add_cases ("/utf8/perf/get_char-backwards", grind_get_char_backwards);
|
||||||
g_test_add_data_func ("/utf8/perf/get_char_validated", grind_get_char_validated, perform);
|
add_cases ("/utf8/perf/get_char_validated", grind_get_char_validated);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_to_ucs4", grind_utf8_to_ucs4, perform);
|
add_cases ("/utf8/perf/utf8_to_ucs4", grind_utf8_to_ucs4);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_to_ucs4-sized", grind_utf8_to_ucs4_sized, perform);
|
add_cases ("/utf8/perf/utf8_to_ucs4-sized", grind_utf8_to_ucs4_sized);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_to_ucs4_fast", grind_utf8_to_ucs4_fast, perform);
|
add_cases ("/utf8/perf/utf8_to_ucs4_fast", grind_utf8_to_ucs4_fast);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_to_ucs4_fast-sized", grind_utf8_to_ucs4_fast_sized, perform);
|
add_cases ("/utf8/perf/utf8_to_ucs4_fast-sized", grind_utf8_to_ucs4_fast_sized);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_validate", grind_utf8_validate, perform);
|
add_cases ("/utf8/perf/utf8_validate", grind_utf8_validate);
|
||||||
g_test_add_data_func ("/utf8/perf/utf8_validate-sized", grind_utf8_validate_sized, perform);
|
add_cases ("/utf8/perf/utf8_validate-sized", grind_utf8_validate_sized);
|
||||||
}
|
}
|
||||||
|
|
||||||
return g_test_run ();
|
return g_test_run ();
|
||||||
|
Loading…
Reference in New Issue
Block a user