diff --git a/scripts/runner.pl b/scripts/runner.pl index fc9edc9..ff1bdc0 100644 --- a/scripts/runner.pl +++ b/scripts/runner.pl @@ -55,7 +55,7 @@ sub trace { # "-Wf,--full-trace", # "-Wf,--check-bounds", - ">$remote_builds_dir/$experiment/1_trace.log" + ">$remote_builds_dir/$experiment/1_trace.log 2>&1" ); say "Trace command: $trace_command"; @@ -78,10 +78,9 @@ sub import_trace { "-b ip", "--no-gp", # Don't inject general purpose registers "--ip", # Inject instruction pointer - ">$remote_builds_dir/$experiment/2_import_ip.log" + ">$remote_builds_dir/$experiment/2_import_ip.log 2>&1" ); say "Import IP command: $import_ip_command"; - system($import_ip_command); # Benchmark: mem @@ -94,10 +93,9 @@ sub import_trace { "-e $remote_builds_dir/$experiment/system.elf", "-v $experiment", "-b mem", - ">$remote_builds_dir/$experiment/2_import_mem.log" + ">$remote_builds_dir/$experiment/2_import_mem.log 2>&1" ); say "Import MEM command: $import_mem_command"; - system($import_mem_command); # Benchmark: regs @@ -110,10 +108,9 @@ sub import_trace { "-v $experiment", "-b regs", "--flags", # Inject flags register - ">$remote_builds_dir/$experiment/2_import_regs.log" + ">$remote_builds_dir/$experiment/2_import_regs.log 2>&1" ); say "Import REGS command: $import_regs_command"; - system($import_regs_command); # Import fulltrace for VisualFAIL @@ -129,63 +126,64 @@ sub import_trace { # ) # ); - # Import disassembly/sources - system( - join " ", - ( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b ip", - "--objdump objdump", + # Import disassembly/sources + my $import_ip_asm_command = join " ", ( + "$fail_import", + "--database-option-file $remote_db_conf", + "-t $remote_builds_dir/$experiment/trace.pb", + "-i ElfImporter", + "-e $remote_builds_dir/$experiment/system.elf", + "-v $experiment", + "-b ip", + "--objdump objdump", - # "--sources", - ) - ); - system( - join " ", - ( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b mem", - "--objdump objdump", + # "--sources", + ">$remote_builds_dir/$experiment/2_import_ip_asm.log 2>&1" + ); + say "Import IP Asm command: $import_ip_asm_command"; + system($import_ip_asm_command); - # "--sources", - ) - ); - system( - join " ", - ( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b regs", - "--objdump objdump", + my $import_mem_asm_command = join " ", ( + "$fail_import", + "--database-option-file $remote_db_conf", + "-t $remote_builds_dir/$experiment/trace.pb", + "-i ElfImporter", + "-e $remote_builds_dir/$experiment/system.elf", + "-v $experiment", + "-b mem", + "--objdump objdump", - # "--sources", - ) - ); + # "--sources", + ">$remote_builds_dir/$experiment/2_import_mem_asm.log 2>&1" + ); + say "Import Mem Asm command: $import_mem_asm_command"; + system($import_mem_asm_command); - my $prune_command = join " ", - ( + my $import_regs_asm_command = join " ", ( + "$fail_import", + "--database-option-file $remote_db_conf", + "-t $remote_builds_dir/$experiment/trace.pb", + "-i ElfImporter", + "-e $remote_builds_dir/$experiment/system.elf", + "-v $experiment", + "-b regs", + "--objdump objdump", + + # "--sources", + ">$remote_builds_dir/$experiment/2_import_regs_asm.log 2>&1" + ); + say "Import Regs Asm command: $import_regs_asm_command"; + system($import_regs_asm_command); + + my $prune_command = join " ", ( "$fail_prune", "--database-option-file $remote_db_conf", "-v $experiment", "-b %%", - #'-p NoPruner', - `-p BasicPruner`, - "--overwrite", ">$remote_builds_dir/$experiment/2_prune.log" - ); - say "Prune command: $prune_command"; + #'-p NoPruner', + '-p BasicPruner', + "--overwrite", ">$remote_builds_dir/$experiment/2_prune.log 2>&1" + ); + say "Prune command: $prune_command"; system($prune_command); } @@ -203,7 +201,7 @@ sub inject { "--database-option-file $remote_db_conf", "-v $experiment", "-b %", "--inject-single-bit", "--inject-registers", - ">$remote_builds_dir/$experiment/3_server.log" + ">$remote_builds_dir/$experiment/3_server.log 2>&1" ); say "Server command: $server_command"; @@ -230,9 +228,9 @@ sub inject { # Called in WAMR exception handler "-Wf,--group1-marker=fail_marker_group1", - ">/dev/null" + ">/dev/null 2>&1" - # ">$remote_builds_dir/$experiment/4_client.log" + # ">$remote_builds_dir/$experiment/4_client.log 2>&1" ); say "Client command: $client_command";