OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Don't strlen() the output for every token being printed.

Browse Source 
The ralloc string appending functions were originally intended for
simple, non-hot-path uses like printing to an info log.

Cuts Unigine Tropics load time by around 20% (6 seconds).

v2: Avoid strlen() on every newline, too.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> [v1]
Acked-by: José Fonseca <jfonseca@vmware.com> [v1]
This commit is contained in:
Kenneth Graunke
2012-02-09 20:33:44 -08:00
parent 8292b7419d
commit b823b99ec0
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/glsl/glcpp/glcpp-parse.y
View File

@@ -184,11 +184,11 @@ input:
line:
control_line {
ralloc_strcat (&parser->output, "\n");
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n");
}
| text_line {
_glcpp_parser_print_expanded_token_list (parser, $1);
ralloc_strcat (&parser->output, "\n");
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n");
ralloc_free ($1);
}
| expanded_line
@@ -320,7 +320,7 @@ control_line:
if ($2 >= 130 || $2 == 100)
add_builtin_define (parser, "GL_FRAGMENT_PRECISION_HIGH", 1);
ralloc_asprintf_append (&parser->output, "#version %" PRIiMAX, $2);
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "#version %" PRIiMAX, $2);
}
| HASH NEWLINE
;
@@ -903,54 +903,54 @@ _token_list_equal_ignoring_space (token_list_t *a, token_list_t *b)
}
static void
_token_print (char **out, token_t *token)
_token_print (char **out, size_t *len, token_t *token)
{
if (token->type < 256) {
ralloc_asprintf_append (out, "%c", token->type);
ralloc_asprintf_rewrite_tail (out, len, "%c", token->type);
return;
}
switch (token->type) {
case INTEGER:
ralloc_asprintf_append (out, "%" PRIiMAX, token->value.ival);
ralloc_asprintf_rewrite_tail (out, len, "%" PRIiMAX, token->value.ival);
break;
case IDENTIFIER:
case INTEGER_STRING:
case OTHER:
ralloc_strcat (out, token->value.str);
ralloc_asprintf_rewrite_tail (out, len, "%s", token->value.str);
break;
case SPACE:
ralloc_strcat (out, " ");
ralloc_asprintf_rewrite_tail (out, len, " ");
break;
case LEFT_SHIFT:
ralloc_strcat (out, "<<");
ralloc_asprintf_rewrite_tail (out, len, "<<");
break;
case RIGHT_SHIFT:
ralloc_strcat (out, ">>");
ralloc_asprintf_rewrite_tail (out, len, ">>");
break;
case LESS_OR_EQUAL:
ralloc_strcat (out, "<=");
ralloc_asprintf_rewrite_tail (out, len, "<=");
break;
case GREATER_OR_EQUAL:
ralloc_strcat (out, ">=");
ralloc_asprintf_rewrite_tail (out, len, ">=");
break;
case EQUAL:
ralloc_strcat (out, "==");
ralloc_asprintf_rewrite_tail (out, len, "==");
break;
case NOT_EQUAL:
ralloc_strcat (out, "!=");
ralloc_asprintf_rewrite_tail (out, len, "!=");
break;
case AND:
ralloc_strcat (out, "&&");
ralloc_asprintf_rewrite_tail (out, len, "&&");
break;
case OR:
ralloc_strcat (out, "||");
ralloc_asprintf_rewrite_tail (out, len, "||");
break;
case PASTE:
ralloc_strcat (out, "##");
ralloc_asprintf_rewrite_tail (out, len, "##");
break;
case COMMA_FINAL:
ralloc_strcat (out, ",");
ralloc_asprintf_rewrite_tail (out, len, ",");
break;
case PLACEHOLDER:
/* Nothing to print. */
@@ -1040,11 +1040,11 @@ _token_paste (glcpp_parser_t *parser, token_t *token, token_t *other)
}
glcpp_error (&token->location, parser, "");
ralloc_strcat (&parser->info_log, "Pasting \"");
_token_print (&parser->info_log, token);
ralloc_strcat (&parser->info_log, "\" and \"");
_token_print (&parser->info_log, other);
ralloc_strcat (&parser->info_log, "\" does not give a valid preprocessing token.\n");
ralloc_asprintf_rewrite_tail (&parser->info_log, &parser->info_log_length, "Pasting \"");
_token_print (&parser->info_log, &parser->info_log_length, token);
ralloc_asprintf_rewrite_tail (&parser->info_log, &parser->info_log_length, "\" and \"");
_token_print (&parser->info_log, &parser->info_log_length, other);
ralloc_asprintf_rewrite_tail (&parser->info_log, &parser->info_log_length, "\" does not give a valid preprocessing token.\n");
return token;
}
@@ -1058,7 +1058,7 @@ _token_list_print (glcpp_parser_t *parser, token_list_t *list)
return;
for (node = list->head; node; node = node->next)
_token_print (&parser->output, node->token);
_token_print (&parser->output, &parser->output_length, node->token);
}
void
@@ -1104,7 +1104,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
parser->lex_from_node = NULL;
parser->output = ralloc_strdup(parser, "");
parser->output_length = 0;
parser->info_log = ralloc_strdup(parser, "");
parser->info_log_length = 0;
parser->error = 0;
/* Add pre-defined macros. */

2
src/glsl/glcpp/glcpp.h
View File

@@ -174,6 +174,8 @@ struct glcpp_parser {
token_node_t *lex_from_node;
char *output;
char *info_log;
size_t output_length;
size_t info_log_length;
int error;
};