christoph/failnix
1
Fork 0
Code Releases Activity

Fix perl import errors

Browse Source
This commit is contained in:
Christoph Urlacher
2026-06-13 21:39:50 +02:00
parent b344c55eee
commit 4ba417ebdf
8 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Modules/Filters.pm
View File

@ -1,4 +1,4 @@
package Modules::Filters; package Filters;
use strict; use strict;
use warnings; use warnings;

2
scripts/Modules/Util.pm
View File

@ -175,7 +175,7 @@ sub format_number_sep {
} }
sub elf_sym_addr { sub elf_sym_addr {
my ($elffile, $sym) = @_; my ( $elffile, $sym ) = @_;
my $line = qx{nm "$elffile" 2>/dev/null | grep " $sym\$"}; my $line = qx{nm "$elffile" 2>/dev/null | grep " $sym\$"};
return undef unless $line =~ /^([0-9a-f]+)/i; return undef unless $line =~ /^([0-9a-f]+)/i;
return hex($1); return hex($1);

9
scripts/Queries/Faults.pm
View File

@ -1,13 +1,12 @@
package Queries::Faults; package Faults;
use strict; use strict;
use warnings; use warnings;
use diagnostics; use diagnostics;
use FindBin; use FindBin;
use lib "$FindBin::Bin/..";
use lib "$FindBin::Bin/../Modules"; use lib "$FindBin::Bin/../Modules";
use Modules::Filters; use Filters;
use feature 'say'; use feature 'say';
@ -15,8 +14,8 @@ sub query {
my ( $experiment, $experiment_dir, $filter_config_name ) = @_; my ( $experiment, $experiment_dir, $filter_config_name ) = @_;
$filter_config_name //= ''; $filter_config_name //= '';
my $filters = Modules::Filters::build_filter_clause( $experiment_dir, my $filters =
$filter_config_name ); Filters::build_filter_clause( $experiment_dir, $filter_config_name );
my $querystring = "SELECT my $querystring = "SELECT
benchmark, resulttype, SUM(t.time2 - t.time1 + 1) AS faults, benchmark, resulttype, SUM(t.time2 - t.time1 + 1) AS faults,

11
scripts/Queries/Results.pm
View File

@ -1,13 +1,12 @@
package Queries::Results; package Results;
use strict; use strict;
use warnings; use warnings;
use diagnostics; use diagnostics;
use FindBin; use FindBin;
use lib "$FindBin::Bin/..";
use lib "$FindBin::Bin/../Modules"; use lib "$FindBin::Bin/../Modules";
use Modules::Filters; use Filters;
use feature 'say'; use feature 'say';
@ -15,8 +14,8 @@ sub query {
my ( $experiment, $experiment_dir, $filter_config_name ) = @_; my ( $experiment, $experiment_dir, $filter_config_name ) = @_;
$filter_config_name //= ''; $filter_config_name //= '';
my $extra = Modules::Filters::build_filter_clause( $experiment_dir, my $extra =
$filter_config_name ); Filters::build_filter_clause( $experiment_dir, $filter_config_name );
my $querystring = "SELECT my $querystring = "SELECT
benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults
@ -39,7 +38,7 @@ sub args { return "-t"; }
sub filename { sub filename {
my ($filter_config_name) = @_; my ($filter_config_name) = @_;
$filter_config_name //= ''; $filter_config_name //= '';
my $suffix = length($filter_config_name) ? "_filtered_$filter_config_name" : ""; my $suffix = length($filter_config_name) ? "_$filter_config_name" : "";
return "results${suffix}.txt"; return "results${suffix}.txt";
} }

12
scripts/Queries/ResultsData.pm
View File

@ -1,13 +1,12 @@
package Queries::ResultsData; package ResultsData;
use strict; use strict;
use warnings; use warnings;
use diagnostics; use diagnostics;
use FindBin; use FindBin;
use lib "$FindBin::Bin/..";
use lib "$FindBin::Bin/../Modules"; use lib "$FindBin::Bin/../Modules";
use Modules::Filters; use Filters;
use feature 'say'; use feature 'say';
@ -15,8 +14,8 @@ sub query {
my ( $experiment, $experiment_dir, $filter_config_name ) = @_; my ( $experiment, $experiment_dir, $filter_config_name ) = @_;
$filter_config_name //= ''; $filter_config_name //= '';
my $extra = Modules::Filters::build_filter_clause( $experiment_dir, my $extra =
$filter_config_name ); Filters::build_filter_clause( $experiment_dir, $filter_config_name );
my $querystring = "SELECT my $querystring = "SELECT
benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults
@ -39,7 +38,8 @@ sub args { return "--batch --raw"; }
sub filename { sub filename {
my ($filter_config_name) = @_; my ($filter_config_name) = @_;
$filter_config_name //= ''; $filter_config_name //= '';
my $suffix = length($filter_config_name) ? "_filtered_$filter_config_name" : ""; my $suffix =
length($filter_config_name) ? "_filtered_$filter_config_name" : "";
return "resultsdata${suffix}.csv"; return "resultsdata${suffix}.csv";
} }

82
scripts/compile.pl
View File

@ -32,13 +32,16 @@ my $wamr_root = require_env('WAMR_ROOT');
my $cross_cc = require_env('CROSS_CC'); my $cross_cc = require_env('CROSS_CC');
my $linux_cc = require_env('LINUX_CC'); my $linux_cc = require_env('LINUX_CC');
my $use_aot_in_text = ( $ENV{WAMR_USE_AOT_IN_TEXT} // 'false' ) eq 'true'; my $use_aot_in_text = ( $ENV{WAMR_USE_AOT_IN_TEXT} // 'false' ) eq 'true';
my $use_mmap_in_text = ( $ENV{WAMR_USE_MMAP_IN_TEXT} // 'false' ) eq 'true'; my $use_mmap_in_text = ( $ENV{WAMR_USE_MMAP_IN_TEXT} // 'false' ) eq 'true';
my $use_xip = ( $ENV{WAMR_USE_XIP} // 'false' ) eq 'true'; my $use_xip = ( $ENV{WAMR_USE_XIP} // 'false' ) eq 'true';
my $use_allocator = ( $ENV{WAMR_USE_ALLOCATOR} // 'false' ) eq 'true'; my $use_allocator = ( $ENV{WAMR_USE_ALLOCATOR} // 'false' ) eq 'true';
my $use_global_heap_in_text = ( $ENV{WAMR_USE_GLOBAL_HEAP_IN_TEXT} // 'false' ) eq 'true'; my $use_global_heap_in_text =
my $use_runtime_pool_in_text = ( $ENV{WAMR_USE_RUNTIME_POOL_IN_TEXT} // 'false' ) eq 'true'; ( $ENV{WAMR_USE_GLOBAL_HEAP_IN_TEXT} // 'false' ) eq 'true';
my $use_linear_pool_in_text = ( $ENV{WAMR_USE_LINEAR_POOL_IN_TEXT} // 'false' ) eq 'true'; my $use_runtime_pool_in_text =
( $ENV{WAMR_USE_RUNTIME_POOL_IN_TEXT} // 'false' ) eq 'true';
my $use_linear_pool_in_text =
( $ENV{WAMR_USE_LINEAR_POOL_IN_TEXT} // 'false' ) eq 'true';
# ========================================================================================= # # ========================================================================================= #
# WAMR cmake configuration # WAMR cmake configuration
@ -66,7 +69,8 @@ my @wamr_cmake_linux = ( '-DWAMR_BUILD_PLATFORM=linux', );
# Variant defines passed as CMAKE_C_FLAGS # Variant defines passed as CMAKE_C_FLAGS
my @variant_cflags = my @variant_cflags =
( '-Wno-error=implicit-function-declaration', '-O0', '-ggdb3' ); ( '-Wno-error=implicit-function-declaration', '-O0', '-ggdb3' );
push @variant_cflags, $use_mmap_in_text ? '-DWAMR_MMAP_IN_TEXT=1' : '-DWAMR_MMAP_IN_TEXT=0'; push @variant_cflags,
$use_mmap_in_text ? '-DWAMR_MMAP_IN_TEXT=1' : '-DWAMR_MMAP_IN_TEXT=0';
push @variant_cflags, '-DWASM_MEM_ALLOC_WITH_USAGE=1' if $use_allocator; push @variant_cflags, '-DWASM_MEM_ALLOC_WITH_USAGE=1' if $use_allocator;
my $cmake_c_flags = join( ' ', @variant_cflags ); my $cmake_c_flags = join( ' ', @variant_cflags );
@ -78,9 +82,18 @@ push @variant_cmake_flags, '-DWAMR_BUILD_ALLOC_WITH_USAGE=1' if $use_allocator;
# WASM_MEM_ALLOC_WITH_USAGE value as libiwasm.a was built with. # WASM_MEM_ALLOC_WITH_USAGE value as libiwasm.a was built with.
my @host_variant_cflags; my @host_variant_cflags;
push @host_variant_cflags, '-DWASM_MEM_ALLOC_WITH_USAGE=1' if $use_allocator; push @host_variant_cflags, '-DWASM_MEM_ALLOC_WITH_USAGE=1' if $use_allocator;
push @host_variant_cflags, $use_global_heap_in_text ? '-DWAMR_GLOBAL_HEAP_IN_TEXT=1' : '-DWAMR_GLOBAL_HEAP_IN_TEXT=0'; push @host_variant_cflags,
push @host_variant_cflags, $use_runtime_pool_in_text ? '-DWAMR_RUNTIME_POOL_IN_TEXT=1' : '-DWAMR_RUNTIME_POOL_IN_TEXT=0'; $use_global_heap_in_text
push @host_variant_cflags, $use_linear_pool_in_text ? '-DWAMR_LINEAR_POOL_IN_TEXT=1' : '-DWAMR_LINEAR_POOL_IN_TEXT=0'; ? '-DWAMR_GLOBAL_HEAP_IN_TEXT=1'
: '-DWAMR_GLOBAL_HEAP_IN_TEXT=0';
push @host_variant_cflags,
$use_runtime_pool_in_text
? '-DWAMR_RUNTIME_POOL_IN_TEXT=1'
: '-DWAMR_RUNTIME_POOL_IN_TEXT=0';
push @host_variant_cflags,
$use_linear_pool_in_text
? '-DWAMR_LINEAR_POOL_IN_TEXT=1'
: '-DWAMR_LINEAR_POOL_IN_TEXT=0';
# ========================================================================================= # # ========================================================================================= #
# Compiler / linker flags # Compiler / linker flags
@ -243,7 +256,8 @@ sub compile_wasm_module {
sub compile_wasm_aot { sub compile_wasm_aot {
my ( $module, $bd, $target ) = @_; my ( $module, $bd, $target ) = @_;
my @flags = ( $target eq 'linux' ) ? @linux_wamrcflags : @cross_wamrcflags; my @flags = ( $target eq 'linux' ) ? @linux_wamrcflags : @cross_wamrcflags;
Util::run( 'wamrc', @flags, '-o', "$bd/wasm_module.aot", "$bd/wasm_module.wasm" ); Util::run( 'wamrc', @flags, '-o', "$bd/wasm_module.aot",
"$bd/wasm_module.wasm" );
} }
sub make_aot_array { sub make_aot_array {
@ -299,26 +313,29 @@ sub compile_wasm_host {
my ( $module, $bd, $target ) = @_; my ( $module, $bd, $target ) = @_;
if ( $target eq 'fail' ) { if ( $target eq 'fail' ) {
Util::run( Util::run(
$cross_cc, '-I./targets/wasm-host', $cross_cc, '-I./targets/wasm-host',
@cross_cflags, @host_variant_cflags, @cross_cflags, @host_variant_cflags,
@wamr_inc_baremetal, '-DTARGET_FAIL', @wamr_inc_baremetal, '-DTARGET_FAIL',
'-c', "$bd/module_host.c", '-o', "$bd/system.o" '-c', "$bd/module_host.c",
'-o', "$bd/system.o"
); );
} }
elsif ( $target eq 'linux' ) { elsif ( $target eq 'linux' ) {
Util::run( Util::run(
$linux_cc, '-I./targets/wasm-host', $linux_cc, '-I./targets/wasm-host',
@linux_cflags, @host_variant_cflags, @linux_cflags, @host_variant_cflags,
@wamr_inc_linux, '-DTARGET_LINUX', @wamr_inc_linux, '-DTARGET_LINUX',
'-c', "$bd/module_host.c", '-o', "$bd/system.o" '-c', "$bd/module_host.c",
'-o', "$bd/system.o"
); );
} }
elsif ( $target eq 'linux-baremetal' ) { elsif ( $target eq 'linux-baremetal' ) {
Util::run( Util::run(
$cross_cc, '-I./targets/wasm-host', $cross_cc, '-I./targets/wasm-host',
@linux_baremetal_cflags, @host_variant_cflags, @linux_baremetal_cflags, @host_variant_cflags,
@wamr_inc_baremetal, '-DTARGET_LINUX_BAREMETAL', @wamr_inc_baremetal, '-DTARGET_LINUX_BAREMETAL',
'-c', "$bd/module_host.c", '-o', "$bd/system.o" '-c', "$bd/module_host.c",
'-o', "$bd/system.o"
); );
} }
else { else {
@ -342,15 +359,16 @@ sub compile_c_host {
( $target eq 'linux' ) ( $target eq 'linux' )
? ( $linux_cc, @linux_cflags, '-DTARGET_LINUX' ) ? ( $linux_cc, @linux_cflags, '-DTARGET_LINUX' )
: ( $cross_cc, @cross_cflags, '-DTARGET_FAIL' ); : ( $cross_cc, @cross_cflags, '-DTARGET_FAIL' );
Util::run( $cc, @flags, '-c', 'targets/c-host/c_host.c', '-o', "$bd/c_host.o" ); Util::run( $cc, @flags, '-c', 'targets/c-host/c_host.c', '-o',
"$bd/c_host.o" );
copy( 'targets/c-host/c_host.c', "$bd/module_host.c" ); copy( 'targets/c-host/c_host.c', "$bd/module_host.c" );
} }
sub compile_startup { sub compile_startup {
my ( $module, $bd, $target ) = @_; my ( $module, $bd, $target ) = @_;
return unless $target eq 'fail'; return unless $target eq 'fail';
Util::run( $cross_cc, 'targets/startup.s', '-I./targets/wasm-host', @cross_cflags, Util::run( $cross_cc, 'targets/startup.s', '-I./targets/wasm-host',
'-c', '-o', "$bd/startup.o" ); @cross_cflags, '-c', '-o', "$bd/startup.o" );
} }
sub compile_syscalls { sub compile_syscalls {
@ -380,12 +398,12 @@ sub link_wasm {
); );
} }
elsif ( $target eq 'linux' ) { elsif ( $target eq 'linux' ) {
Util::run( $linux_cc, "$bd/system.o", "$bd/libiwasm.a", @linux_ldflags_base, Util::run( $linux_cc, "$bd/system.o", "$bd/libiwasm.a",
'-o', "$bd/system.elf" ); @linux_ldflags_base, '-o', "$bd/system.elf" );
} }
elsif ( $target eq 'linux-baremetal' ) { elsif ( $target eq 'linux-baremetal' ) {
Util::run( $cross_cc, "$bd/system.o", "$bd/syscalls.o", "$bd/libiwasm.a", Util::run( $cross_cc, "$bd/system.o", "$bd/syscalls.o",
@baremetal_ldflags_base, '-o', "$bd/system.elf" ); "$bd/libiwasm.a", @baremetal_ldflags_base, '-o', "$bd/system.elf" );
} }
else { else {
die "Unknown target '$target'\n"; die "Unknown target '$target'\n";
@ -404,8 +422,8 @@ sub link_c {
); );
} }
elsif ( $target eq 'linux' ) { elsif ( $target eq 'linux' ) {
Util::run( $linux_cc, "$bd/c_host.o", "$bd/c_module.o", @linux_ldflags_nowasm, Util::run( $linux_cc, "$bd/c_host.o", "$bd/c_module.o",
'-o', "$bd/system.elf" ); @linux_ldflags_nowasm, '-o', "$bd/system.elf" );
} }
else { else {
die "C mode is not supported for target '$target'\n"; die "C mode is not supported for target '$target'\n";

5
scripts/menu.pl
View File

@ -5,13 +5,12 @@ use warnings;
use diagnostics; use diagnostics;
use FindBin; use FindBin;
use lib $FindBin::Bin;
use lib "$FindBin::Bin/Modules"; use lib "$FindBin::Bin/Modules";
use Util; use Util;
use Mars; use Mars;
use TUI; use TUI;
use Modules::Filters; use Filters;
use Text::CSV_XS; use Text::CSV_XS;
use feature 'say'; use feature 'say';
@ -90,7 +89,7 @@ my %handlers = (
my @filter_choices = ("None"); my @filter_choices = ("None");
my %filter_label_name; my %filter_label_name;
my @filter_configs; my @filter_configs;
my $configs = Modules::Filters::get_configs(); my $configs = Filters::get_configs();
foreach my $name ( sort keys %$configs ) { foreach my $name ( sort keys %$configs ) {
my $label = $configs->{$name}{label}; my $label = $configs->{$name}{label};
push @filter_choices, $label; push @filter_choices, $label;

7
scripts/runner.pl
View File

@ -5,11 +5,10 @@ use warnings;
use diagnostics; use diagnostics;
use FindBin; use FindBin;
use lib $FindBin::Bin;
use lib "$FindBin::Bin/Modules"; use lib "$FindBin::Bin/Modules";
use Modules::Filters; use Filters;
use Modules::Util; use Util;
use feature 'say'; use feature 'say';
@ -275,7 +274,7 @@ sub results {
my @queries = my @queries =
map { s/\.pm//gr } Util::find_files("$remote_root/scripts/Queries"); map { s/\.pm//gr } Util::find_files("$remote_root/scripts/Queries");
my @configs = ( '', Modules::Filters::get_default_configs() ); my @configs = ( '', Filters::get_default_configs() );
for my $query (@queries) { for my $query (@queries) {
for my $config (@configs) { for my $config (@configs) {