[benchmark-shape] Reorder text vs font order for better output

This commit is contained in:
Behdad Esfahbod 2022-06-05 02:01:17 -06:00
parent 92e81ab1df
commit 3c258e1373
1 changed files with 23 additions and 22 deletions

View File

@ -17,41 +17,42 @@
struct test_input_t struct test_input_t
{ {
const char *text_path;
const char *font_path; const char *font_path;
const char *text_path;
bool is_variable; bool is_variable;
} default_tests[] = } default_tests[] =
{ {
{"perf/texts/fa-thelittleprince.txt",
"perf/fonts/Amiri-Regular.ttf", {"perf/fonts/NotoNastaliqUrdu-Regular.ttf",
"perf/texts/fa-thelittleprince.txt",
false}, false},
{"perf/texts/fa-thelittleprince.txt", {"perf/fonts/NotoNastaliqUrdu-Regular.ttf",
"perf/fonts/NotoNastaliqUrdu-Regular.ttf", "perf/texts/fa-monologue.txt",
false}, false},
{"perf/texts/fa-monologue.txt", {"perf/fonts/Amiri-Regular.ttf",
"perf/fonts/Amiri-Regular.ttf", "perf/texts/fa-thelittleprince.txt",
false}, false},
{"perf/texts/fa-monologue.txt", {"perf/fonts/Amiri-Regular.ttf",
"perf/fonts/NotoNastaliqUrdu-Regular.ttf", "perf/texts/fa-monologue.txt",
false}, false},
{"perf/texts/en-thelittleprince.txt", {"perf/fonts/Roboto-Regular.ttf",
"perf/fonts/Roboto-Regular.ttf", "perf/texts/en-thelittleprince.txt",
false}, false},
{"perf/texts/en-thelittleprince.txt", {"perf/fonts/Roboto-Regular.ttf",
SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", "perf/texts/en-words.txt",
false},
{SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf",
"perf/texts/en-thelittleprince.txt",
true}, true},
{"perf/texts/en-words.txt", {SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf",
"perf/fonts/Roboto-Regular.ttf", "perf/texts/en-words.txt",
false},
{"perf/texts/en-words.txt",
SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf",
true}, true},
}; };
@ -132,11 +133,11 @@ static void test_backend (backend_t backend,
char name[1024] = "BM_Shape"; char name[1024] = "BM_Shape";
const char *p; const char *p;
strcat (name, "/"); strcat (name, "/");
p = strrchr (test_input.text_path, '/');
strcat (name, p ? p + 1 : test_input.text_path);
strcat (name, "/");
p = strrchr (test_input.font_path, '/'); p = strrchr (test_input.font_path, '/');
strcat (name, p ? p + 1 : test_input.font_path); strcat (name, p ? p + 1 : test_input.font_path);
strcat (name, "/");
p = strrchr (test_input.text_path, '/');
strcat (name, p ? p + 1 : test_input.text_path);
strcat (name, variable ? "/var" : ""); strcat (name, variable ? "/var" : "");
strcat (name, "/"); strcat (name, "/");
strcat (name, backend_name); strcat (name, backend_name);