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

glcpp: Avoid unnecessary call to strlen

Browse Source 
Length of the token was already calculated by flex and stored in yyleng,
no need to implicitly call strlen() via linear_strdup().

Signed-off-by: Thomas Helland <thomashelland90@gmail.com>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

V2: Also convert this pattern in glsl_lexer.ll

V3: Remove a misplaced comment

V4: Use a temporary char to avoid type change
    Remove bogus +1 on length check of identifier
This commit is contained in:
Thomas Helland
2017-05-21 00:21:54 +02:00
parent e7220d2c22
commit d86bc36446
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/glcpp/glcpp-lex.l
View File

@@ -101,7 +101,14 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
#define RETURN_STRING_TOKEN(token) \ #define RETURN_STRING_TOKEN(token) \
do { \ do { \
if (! parser->skipping) { \ if (! parser->skipping) { \
yylval->str = linear_strdup(yyextra->linalloc, yytext); \ /* We're not doing linear_strdup here, to avoid \
* an implicit call on strlen() for the length \
* of the string, as this is already found by \
* flex and stored in yyleng */ \
void *mem_ctx = yyextra->linalloc; \
yylval->str = linear_alloc_child(mem_ctx, \
yyleng + 1); \
memcpy(yylval->str, yytext, yyleng + 1); \
RETURN_TOKEN_NEVER_SKIP (token); \ RETURN_TOKEN_NEVER_SKIP (token); \
} \ } \
} while(0) } while(0)

39
src/compiler/glsl/glsl_lexer.ll
View File

@@ -81,8 +81,13 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
"illegal use of reserved word `%s'", yytext); \ "illegal use of reserved word `%s'", yytext); \
return ERROR_TOK; \ return ERROR_TOK; \
} else { \ } else { \
void *mem_ctx = yyextra->linalloc; \ /* We're not doing linear_strdup here, to avoid an implicit \
yylval->identifier = linear_strdup(mem_ctx, yytext); \ * call on strlen() for the length of the string, as this is \
* already found by flex and stored in yyleng */ \
void *mem_ctx = yyextra->linalloc; \
char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1); \
memcpy(id, yytext, yyleng + 1); \
yylval->identifier = id; \
return classify_identifier(yyextra, yytext); \ return classify_identifier(yyextra, yytext); \
} \ } \
} while (0) } while (0)
@@ -261,8 +266,14 @@ HASH ^{SPC}#{SPC}
<PP>[ \t\r]* { } <PP>[ \t\r]* { }
<PP>: return COLON; <PP>: return COLON;
<PP>[_a-zA-Z][_a-zA-Z0-9]* { <PP>[_a-zA-Z][_a-zA-Z0-9]* {
void *mem_ctx = yyextra->linalloc; /* We're not doing linear_strdup here, to avoid an implicit call
yylval->identifier = linear_strdup(mem_ctx, yytext); * on strlen() for the length of the string, as this is already
* found by flex and stored in yyleng
*/
void *mem_ctx = yyextra->linalloc;
char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1);
memcpy(id, yytext, yyleng + 1);
yylval->identifier = id;
return IDENTIFIER; return IDENTIFIER;
} }
<PP>[1-9][0-9]* { <PP>[1-9][0-9]* {
@@ -449,8 +460,14 @@ layout {
|| yyextra->ARB_tessellation_shader_enable) { || yyextra->ARB_tessellation_shader_enable) {
return LAYOUT_TOK; return LAYOUT_TOK;
} else { } else {
void *mem_ctx = yyextra->linalloc; /* We're not doing linear_strdup here, to avoid an implicit call
yylval->identifier = linear_strdup(mem_ctx, yytext); * on strlen() for the length of the string, as this is already
* found by flex and stored in yyleng
*/
void *mem_ctx = yyextra->linalloc;
char *id = (char *) linear_alloc_child(mem_ctx, yyleng + 1);
memcpy(id, yytext, yyleng + 1);
yylval->identifier = id;
return classify_identifier(yyextra, yytext); return classify_identifier(yyextra, yytext);
} }
} }
@@ -621,12 +638,18 @@ u64vec4 KEYWORD_WITH_ALT(0, 0, 0, 0, yyextra->ARB_gpu_shader_int64_enable, U64V
[_a-zA-Z][_a-zA-Z0-9]* { [_a-zA-Z][_a-zA-Z0-9]* {
struct _mesa_glsl_parse_state *state = yyextra; struct _mesa_glsl_parse_state *state = yyextra;
void *ctx = state->linalloc; void *ctx = state->linalloc;
if (state->es_shader && strlen(yytext) > 1024) { if (state->es_shader && yyleng > 1024) {
_mesa_glsl_error(yylloc, state, _mesa_glsl_error(yylloc, state,
"Identifier `%s' exceeds 1024 characters", "Identifier `%s' exceeds 1024 characters",
yytext); yytext);
} else { } else {
yylval->identifier = linear_strdup(ctx, yytext); /* We're not doing linear_strdup here, to avoid an implicit call
* on strlen() for the length of the string, as this is already
* found by flex and stored in yyleng
*/
char *id = (char *) linear_alloc_child(ctx, yyleng + 1);
memcpy(id, yytext, yyleng + 1);
yylval->identifier = id;
} }
return classify_identifier(state, yytext); return classify_identifier(state, yytext);
} }