Don't fail nm calls silently

.gitignore

@@ -1,9 +1,9 @@
+/**/__pycache__
 /build-*
 /builds
 /ghidra/projects/**/*.lock*
 /mars-db.conf
 /.direnv
 /db.conf
-/fail/bin/resultbrowser/app/__pycache__
 /fail/bin/VisualFAIL/CONFIGURATION.php
 /qemu.log

scripts/Modules/Util.pm

@@ -181,19 +181,49 @@ sub format_number_sep {
     return $number;
 }
 
+# Run nm once and cache the result instead of running 20x per query
+my %nm_cache;
+
+sub nm_lines {
+    my ( $elffile, @nm_args ) = @_;
+
+    my $command = join ' ', 'nm', @nm_args, shell_quote($elffile);
+    return @{ $nm_cache{$command} } if exists $nm_cache{$command};
+
+    die "ELF file does not exist: $elffile\n" unless -f $elffile;
+
+    my @lines  = qx{$command 2>&1};
+    my $status = $?;
+
+    die "nm not found in PATH\n"
+      if $status == -1 || ( $status >> 8 ) == 127;
+    die "nm failed on $elffile (exit @{[ $status >> 8 ]}): @lines"
+      if $status != 0;
+    die "nm found no symbols in $elffile\n" unless @lines;
+
+    $nm_cache{$command} = \@lines;
+    return @lines;
+}
+
 sub elf_sym_addr {
     my ( $elffile, $sym ) = @_;
-    my $line = qx{nm "$elffile" 2>/dev/null | grep " $sym\$"};
-    return undef unless $line =~ /^([0-9a-f]+)/i;
-    return hex($1);
+
+    for my $line ( nm_lines($elffile) ) {
+
+        # "0010eefe T aot_invoke_native"
+        # This is case-sensitive!
+        next unless $line =~ /^([0-9a-fA-F]+)\s+\S\s+\Q$sym\E$/;
+        return hex($1);
+    }
+
+    return undef;
 }
 
 # Determine the address range of a function symbol
 sub elf_sym_range {
     my ( $elffile, $sym ) = @_;
 
-    my @lines = qx{nm -nS "$elffile" 2>/dev/null};
-    return () unless @lines;
+    my @lines = nm_lines( $elffile, '-nS' );
 
     for my $i ( 0 .. $#lines ) {
         my $line = $lines[$i];

scripts/Queries/TraceWeight.pm

@@ -0,0 +1,55 @@
+package TraceWeight;
+
+use strict;
+use warnings;
+use diagnostics;
+
+use FindBin;
+use lib "$FindBin::Bin/../Modules";
+use Filters;
+
+use feature 'say';
+
+sub query {
+    my ( $experiment, $experiment_dir, @filter_config_names ) = @_;
+
+    my $extra =
+      Filters::build_filter_clause( $experiment_dir, @filter_config_names );
+
+    # This query basically asks: How much faultspace area is there?
+    # It queries the same "SUM(t.time2 - t.time1 + 1)" as ResultsData.pm,
+    # but doesn't join over "result_GenericExperimentMessage", so the
+    # faultspace area is not repeated.
+    # The "COUNT(*)" part counts the number of equivalence classes
+    # (or the number of pilots in other words).
+    # The number of actual injections is (probably/hopefully) 8 * pilots,
+    # because we run with --inject-single-bit.
+    # We expect the "weight" to be equal to the number of pilots for the
+    # IP benchmark, as the IP injections are only a single tick long.
+    my $querystring = "SELECT
+benchmark, SUM(t.time2 - t.time1 + 1) AS weight, COUNT(*) AS pilots
+FROM variant v
+JOIN trace t ON v.id = t.variant_id
+JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_physical_address = t.data_physical_address
+JOIN fsppilot p ON p.id = g.pilot_id
+WHERE v.variant = '$experiment'$extra
+GROUP BY v.id, benchmark
+ORDER BY variant, benchmark;";
+
+    say $querystring;
+
+    return $querystring;
+}
+
+sub args { return "--batch --raw"; }
+
+sub filename {
+    my @filter_config_names = grep { defined && length } @_;
+    my $suffix =
+      @filter_config_names ? "_" . join( "+", sort @filter_config_names ) : "";
+    return "traceweight${suffix}.csv";
+}
+
+sub postprocess { $_[0] =~ s/\t/,/g; }
+
+1;

scripts/menu.pl

@@ -336,93 +336,93 @@ my %handlers = (
             0, @entries );
     },
 
-    '11b. Compare to Baseline' => sub {
-
-        my $baseline = Util::select_experiment(0);
-
-        my @selected_experiments = Util::select_experiment(1);
-
-       # TODO: Fails silently if not every selected experiment has this datafile
-        my $resultsdata_csv =
-          Util::pick_data_file( "$local_archive_dir/$baseline", "resultsdata" );
-
-        my %all_results;
-        foreach my $experiment ( $baseline, @selected_experiments ) {
-
-            my $data = Text::CSV_XS::csv(
-                in      => "$local_archive_dir/$experiment/$resultsdata_csv",
-                headers => 'auto'
-            );
-
-            foreach my $row (@$data) {
-                $all_results{$experiment}{ $row->{benchmark} }
-                  { $row->{resulttype} } = $row->{faults};
-            }
-        }
-
-        my @benchs  = ( 'ip', 'mem', 'regs' );
-        my @markers = (
-            'OK_MARKER',         'FAIL_MARKER',
-            'DETECTED_MARKER',   'TIMEOUT',
-            'TRAP',              'WRITE_TEXTSEGMENT',
-            'ACCESS_OUTERSPACE', 'GROUP1_MARKER'
-        );
-
-        my $heading = sprintf( "%5s %20s %50s  ", "BENCH", "TYPE", $baseline );
-        my $subheading = sprintf( "%5s %20s %50s  ",
-            "", "", Util::read_experiment_info($baseline) );
-        foreach my $experiment (@selected_experiments) {
-            $heading .= sprintf( "%50s  ", $experiment );
-            $subheading .=
-              sprintf( "%50s  ", Util::read_experiment_info($experiment) );
-        }
-
-        my @entries = ( $heading, $subheading, "" );
-        foreach my $benchmark (@benchs) {
-            foreach my $marker (@markers) {
-                my $entry = sprintf( "%5s %20s ", $benchmark, $marker );
-
-                if ( exists $all_results{$baseline}{$benchmark}{$marker} ) {
-                    $entry .= sprintf(
-                        "%50s  ",
-                        Util::format_number_sep(
-                            $all_results{$baseline}{$benchmark}{$marker}
-                        )
-                    );
-                }
-                else {
-                    $entry .= sprintf( "%50s  ", "" );
-                }
-
-                foreach my $experiment (@selected_experiments) {
-                    if (    exists $all_results{$baseline}{$benchmark}{$marker}
-                        and
-                        exists $all_results{$experiment}{$benchmark}{$marker}
-                        and $all_results{$baseline}{$benchmark}{$marker} != 0 )
-                    {
-                        my $factor =
-                          $all_results{$experiment}{$benchmark}{$marker} /
-                          $all_results{$baseline}{$benchmark}{$marker};
-                        $entry .=
-                          sprintf( "%50s  ", sprintf( "%.2fx", $factor ) );
-                    }
-                    else {
-                        $entry .= sprintf( "%50s  ", "" );
-                    }
-                }
-
-                push @entries, $entry;
-            }
-            push @entries, "";
-        }
-
-        TUI::select_from_list(
-            "Baseline: $baseline — Comparing "
-              . scalar(@selected_experiments)
-              . " Experiments",
-            0, @entries
-        );
-    },
+  # '11b. Compare to Baseline' => sub {
+  #
+  #     my $baseline = Util::select_experiment(0);
+  #
+  #     my @selected_experiments = Util::select_experiment(1);
+  #
+  #    # TODO: Fails silently if not every selected experiment has this datafile
+  #     my $resultsdata_csv =
+  #       Util::pick_data_file( "$local_archive_dir/$baseline", "resultsdata" );
+  #
+  #     my %all_results;
+  #     foreach my $experiment ( $baseline, @selected_experiments ) {
+  #
+  #         my $data = Text::CSV_XS::csv(
+  #             in      => "$local_archive_dir/$experiment/$resultsdata_csv",
+  #             headers => 'auto'
+  #         );
+  #
+  #         foreach my $row (@$data) {
+  #             $all_results{$experiment}{ $row->{benchmark} }
+  #               { $row->{resulttype} } = $row->{faults};
+  #         }
+  #     }
+  #
+  #     my @benchs  = ( 'ip', 'mem', 'regs' );
+  #     my @markers = (
+  #         'OK_MARKER',         'FAIL_MARKER',
+  #         'DETECTED_MARKER',   'TIMEOUT',
+  #         'TRAP',              'WRITE_TEXTSEGMENT',
+  #         'ACCESS_OUTERSPACE', 'GROUP1_MARKER'
+  #     );
+  #
+  #     my $heading = sprintf( "%5s %20s %50s  ", "BENCH", "TYPE", $baseline );
+  #     my $subheading = sprintf( "%5s %20s %50s  ",
+  #         "", "", Util::read_experiment_info($baseline) );
+  #     foreach my $experiment (@selected_experiments) {
+  #         $heading .= sprintf( "%50s  ", $experiment );
+  #         $subheading .=
+  #           sprintf( "%50s  ", Util::read_experiment_info($experiment) );
+  #     }
+  #
+  #     my @entries = ( $heading, $subheading, "" );
+  #     foreach my $benchmark (@benchs) {
+  #         foreach my $marker (@markers) {
+  #             my $entry = sprintf( "%5s %20s ", $benchmark, $marker );
+  #
+  #             if ( exists $all_results{$baseline}{$benchmark}{$marker} ) {
+  #                 $entry .= sprintf(
+  #                     "%50s  ",
+  #                     Util::format_number_sep(
+  #                         $all_results{$baseline}{$benchmark}{$marker}
+  #                     )
+  #                 );
+  #             }
+  #             else {
+  #                 $entry .= sprintf( "%50s  ", "" );
+  #             }
+  #
+  #             foreach my $experiment (@selected_experiments) {
+  #                 if (    exists $all_results{$baseline}{$benchmark}{$marker}
+  #                     and
+  #                     exists $all_results{$experiment}{$benchmark}{$marker}
+  #                     and $all_results{$baseline}{$benchmark}{$marker} != 0 )
+  #                 {
+  #                     my $factor =
+  #                       $all_results{$experiment}{$benchmark}{$marker} /
+  #                       $all_results{$baseline}{$benchmark}{$marker};
+  #                     $entry .=
+  #                       sprintf( "%50s  ", sprintf( "%.2fx", $factor ) );
+  #                 }
+  #                 else {
+  #                     $entry .= sprintf( "%50s  ", "" );
+  #                 }
+  #             }
+  #
+  #             push @entries, $entry;
+  #         }
+  #         push @entries, "";
+  #     }
+  #
+  #     TUI::select_from_list(
+  #         "Baseline: $baseline — Comparing "
+  #           . scalar(@selected_experiments)
+  #           . " Experiments",
+  #         0, @entries
+  #     );
+  # },
 
     '12. Open Experiment in BinaryNinja' => sub {
         my @selected_experiments = Util::select_experiment(1);

scripts/runner.pl

@@ -281,9 +281,17 @@ sub results {
     # Filters are combined into one
     my @configs = Filters::get_default_configs();
 
+    # Keep trying even if a single query fails
     for my $query (@queries) {
-        Util::execute_query( $experiment, $query,
-            $remote_db_conf, $remote_builds_dir, 1, @configs );
+        eval {
+            Util::execute_query( $experiment, $query,
+                $remote_db_conf, $remote_builds_dir, 1, @configs );
+            1;
+        } or do {
+            my $error = $@ || 'bullshit error';
+            chomp $error;
+            warn "Query $query failed for $experiment: $error\n";
+        };
     }
 }