From: Simon Ruderich Date: Mon, 26 Mar 2012 02:05:07 +0000 (+0200) Subject: Precompile flag regexps. X-Git-Tag: 0.01~53 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=f2db9f24cb7bc4d7ce9bf169bd06dd7ec5e17a1d;p=blhc%2Fblhc.git Precompile flag regexps. Speeds up any_flags_used() and all_flags_used(). --- diff --git a/bin/blhc b/bin/blhc index 7b228ec..ad98dc5 100755 --- a/bin/blhc +++ b/bin/blhc @@ -191,7 +191,12 @@ my @def_ldflags_pie = ( '-fPIE', '-pie', ); -# Renaming rules for the output so the regex parts are not visible. +my @def_ldflags_pic = ( + '-fPIC', + '-fpic', +); +# Renaming rules for the output so the regex parts are not visible. Also +# stores string values of flag regexps above, see compile_flag_regexp(). my %flag_renames = ( '-O(?:2|3)' => '-O2', '-Wl,(-z,)?relro' => '-Wl,-z,relro', @@ -207,12 +212,10 @@ my $option_color; sub error_flags { my ($message, $missing_flags_ref, $flag_renames_ref, $line) = @_; - # Rename flags if requested. + # Get string value of qr//-escaped regexps and if requested rename them. my @missing_flags = map { - (exists $flag_renames_ref->{$_}) - ? $flag_renames_ref->{$_} - : $_ - } @{$missing_flags_ref}; + $flag_renames_ref->{$_} + } @{$missing_flags_ref}; my $flags = join ' ', @missing_flags; printf "%s (%s)%s %s", @@ -247,7 +250,7 @@ sub any_flags_used { my ($line, @flags) = @_; foreach my $flag (@flags) { - return 1 if $line =~ /\s$flag(?:\s|\\)/; + return 1 if $line =~ /$flag/; } return 0; @@ -257,7 +260,7 @@ sub all_flags_used { my @missing_flags = (); foreach my $flag (@flags) { - if ($line !~ /\s$flag(?:\s|\\)/) { + if (not $line =~ /$flag/) { push @missing_flags, $flag; } } @@ -273,7 +276,7 @@ sub pic_pie_conflict { my ($line, $pie, $missing_flags_ref, @flags_pie) = @_; return 0 if not $pie; - return 0 if not any_flags_used($line, ('-fPIC', '-fpic')); + return 0 if not any_flags_used($line, @def_ldflags_pic); my %flags = map { $_ => 1 } @flags_pie; @@ -329,6 +332,24 @@ sub is_non_verbose_build { return 1; } +sub compile_flag_regexp { + my ($flag_renames_ref, @flags) = @_; + + my @result = (); + foreach my $flag (@flags) { + # Store flag name in replacement string for correct flags in messages + # with qr//ed flag regexps. + $flag_renames_ref->{qr/\s$flag(?:\s|\\)/} + = (exists $flag_renames_ref->{$flag}) + ? $flag_renames_ref->{$flag} + : $flag; + + # Compile flag regexp for faster execution. + push @result, qr/\s$flag(?:\s|\\)/; + } + return @result; +} + sub extension_found { my ($extensions_ref, @extensions) = @_; @@ -397,6 +418,22 @@ if ($option_all) { $option_bindnow = 1; } +# Precompile all flag regexps. any_flags_used(), all_flags_used() get a lot +# faster with this. +@def_cflags = compile_flag_regexp(\%flag_renames, @def_cflags); +@def_cflags_format = compile_flag_regexp(\%flag_renames, @def_cflags_format); +@def_cflags_fortify = compile_flag_regexp(\%flag_renames, @def_cflags_fortify); +@def_cflags_stack = compile_flag_regexp(\%flag_renames, @def_cflags_stack); +@def_cflags_pie = compile_flag_regexp(\%flag_renames, @def_cflags_pie); +@def_cxxflags = compile_flag_regexp(\%flag_renames, @def_cxxflags); +@def_cppflags = compile_flag_regexp(\%flag_renames, @def_cppflags); +@def_cppflags_fortify = compile_flag_regexp(\%flag_renames, @def_cppflags_fortify); +@def_ldflags = compile_flag_regexp(\%flag_renames, @def_ldflags); +@def_ldflags_relro = compile_flag_regexp(\%flag_renames, @def_ldflags_relro); +@def_ldflags_bindnow = compile_flag_regexp(\%flag_renames, @def_ldflags_bindnow); +@def_ldflags_pie = compile_flag_regexp(\%flag_renames, @def_ldflags_pie); +@def_ldflags_pic = compile_flag_regexp(\%flag_renames, @def_ldflags_pic); + # Final exit code. my $exit = 0;