From 4ba417ebdfc568b17d54427a4d555b43359e8e3c Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 13 Jun 2026 21:39:50 +0200 Subject: [PATCH] Fix perl import errors --- scripts/Modules/Filters.pm | 2 +- scripts/Modules/Util.pm | 2 +- scripts/Queries/Faults.pm | 9 ++-- scripts/Queries/Results.pm | 11 +++-- scripts/Queries/ResultsData.pm | 12 ++--- scripts/compile.pl | 82 +++++++++++++++++++++------------- scripts/menu.pl | 5 +-- scripts/runner.pl | 7 ++- 8 files changed, 72 insertions(+), 58 deletions(-) diff --git a/scripts/Modules/Filters.pm b/scripts/Modules/Filters.pm index 56e072c..a47b2ed 100644 --- a/scripts/Modules/Filters.pm +++ b/scripts/Modules/Filters.pm @@ -1,4 +1,4 @@ -package Modules::Filters; +package Filters; use strict; use warnings; diff --git a/scripts/Modules/Util.pm b/scripts/Modules/Util.pm index 9a93d48..dac5a23 100644 --- a/scripts/Modules/Util.pm +++ b/scripts/Modules/Util.pm @@ -175,7 +175,7 @@ sub format_number_sep { } sub elf_sym_addr { - my ($elffile, $sym) = @_; + my ( $elffile, $sym ) = @_; my $line = qx{nm "$elffile" 2>/dev/null | grep " $sym\$"}; return undef unless $line =~ /^([0-9a-f]+)/i; return hex($1); diff --git a/scripts/Queries/Faults.pm b/scripts/Queries/Faults.pm index 9b3ceb8..06196a8 100644 --- a/scripts/Queries/Faults.pm +++ b/scripts/Queries/Faults.pm @@ -1,13 +1,12 @@ -package Queries::Faults; +package Faults; use strict; use warnings; use diagnostics; use FindBin; -use lib "$FindBin::Bin/.."; use lib "$FindBin::Bin/../Modules"; -use Modules::Filters; +use Filters; use feature 'say'; @@ -15,8 +14,8 @@ sub query { my ( $experiment, $experiment_dir, $filter_config_name ) = @_; $filter_config_name //= ''; - my $filters = Modules::Filters::build_filter_clause( $experiment_dir, - $filter_config_name ); + my $filters = + Filters::build_filter_clause( $experiment_dir, $filter_config_name ); my $querystring = "SELECT benchmark, resulttype, SUM(t.time2 - t.time1 + 1) AS faults, diff --git a/scripts/Queries/Results.pm b/scripts/Queries/Results.pm index af9822c..41d8010 100644 --- a/scripts/Queries/Results.pm +++ b/scripts/Queries/Results.pm @@ -1,13 +1,12 @@ -package Queries::Results; +package Results; use strict; use warnings; use diagnostics; use FindBin; -use lib "$FindBin::Bin/.."; use lib "$FindBin::Bin/../Modules"; -use Modules::Filters; +use Filters; use feature 'say'; @@ -15,8 +14,8 @@ sub query { my ( $experiment, $experiment_dir, $filter_config_name ) = @_; $filter_config_name //= ''; - my $extra = Modules::Filters::build_filter_clause( $experiment_dir, - $filter_config_name ); + my $extra = + Filters::build_filter_clause( $experiment_dir, $filter_config_name ); my $querystring = "SELECT benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults @@ -39,7 +38,7 @@ sub args { return "-t"; } sub filename { my ($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"; } diff --git a/scripts/Queries/ResultsData.pm b/scripts/Queries/ResultsData.pm index a634d68..b0ed3f6 100644 --- a/scripts/Queries/ResultsData.pm +++ b/scripts/Queries/ResultsData.pm @@ -1,13 +1,12 @@ -package Queries::ResultsData; +package ResultsData; use strict; use warnings; use diagnostics; use FindBin; -use lib "$FindBin::Bin/.."; use lib "$FindBin::Bin/../Modules"; -use Modules::Filters; +use Filters; use feature 'say'; @@ -15,8 +14,8 @@ sub query { my ( $experiment, $experiment_dir, $filter_config_name ) = @_; $filter_config_name //= ''; - my $extra = Modules::Filters::build_filter_clause( $experiment_dir, - $filter_config_name ); + my $extra = + Filters::build_filter_clause( $experiment_dir, $filter_config_name ); my $querystring = "SELECT benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults @@ -39,7 +38,8 @@ sub args { return "--batch --raw"; } sub filename { my ($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"; } diff --git a/scripts/compile.pl b/scripts/compile.pl index f6fc725..31996ea 100644 --- a/scripts/compile.pl +++ b/scripts/compile.pl @@ -32,13 +32,16 @@ my $wamr_root = require_env('WAMR_ROOT'); my $cross_cc = require_env('CROSS_CC'); my $linux_cc = require_env('LINUX_CC'); -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_xip = ( $ENV{WAMR_USE_XIP} // '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_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'; +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_xip = ( $ENV{WAMR_USE_XIP} // '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_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 @@ -66,7 +69,8 @@ my @wamr_cmake_linux = ( '-DWAMR_BUILD_PLATFORM=linux', ); # Variant defines passed as CMAKE_C_FLAGS my @variant_cflags = ( '-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; 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. my @host_variant_cflags; 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, $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'; +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, + $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 @@ -243,7 +256,8 @@ sub compile_wasm_module { sub compile_wasm_aot { my ( $module, $bd, $target ) = @_; 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 { @@ -299,26 +313,29 @@ sub compile_wasm_host { my ( $module, $bd, $target ) = @_; if ( $target eq 'fail' ) { Util::run( - $cross_cc, '-I./targets/wasm-host', - @cross_cflags, @host_variant_cflags, - @wamr_inc_baremetal, '-DTARGET_FAIL', - '-c', "$bd/module_host.c", '-o', "$bd/system.o" + $cross_cc, '-I./targets/wasm-host', + @cross_cflags, @host_variant_cflags, + @wamr_inc_baremetal, '-DTARGET_FAIL', + '-c', "$bd/module_host.c", + '-o', "$bd/system.o" ); } elsif ( $target eq 'linux' ) { Util::run( - $linux_cc, '-I./targets/wasm-host', - @linux_cflags, @host_variant_cflags, - @wamr_inc_linux, '-DTARGET_LINUX', - '-c', "$bd/module_host.c", '-o', "$bd/system.o" + $linux_cc, '-I./targets/wasm-host', + @linux_cflags, @host_variant_cflags, + @wamr_inc_linux, '-DTARGET_LINUX', + '-c', "$bd/module_host.c", + '-o', "$bd/system.o" ); } elsif ( $target eq 'linux-baremetal' ) { Util::run( - $cross_cc, '-I./targets/wasm-host', + $cross_cc, '-I./targets/wasm-host', @linux_baremetal_cflags, @host_variant_cflags, - @wamr_inc_baremetal, '-DTARGET_LINUX_BAREMETAL', - '-c', "$bd/module_host.c", '-o', "$bd/system.o" + @wamr_inc_baremetal, '-DTARGET_LINUX_BAREMETAL', + '-c', "$bd/module_host.c", + '-o', "$bd/system.o" ); } else { @@ -342,15 +359,16 @@ sub compile_c_host { ( $target eq 'linux' ) ? ( $linux_cc, @linux_cflags, '-DTARGET_LINUX' ) : ( $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" ); } sub compile_startup { my ( $module, $bd, $target ) = @_; return unless $target eq 'fail'; - Util::run( $cross_cc, 'targets/startup.s', '-I./targets/wasm-host', @cross_cflags, - '-c', '-o', "$bd/startup.o" ); + Util::run( $cross_cc, 'targets/startup.s', '-I./targets/wasm-host', + @cross_cflags, '-c', '-o', "$bd/startup.o" ); } sub compile_syscalls { @@ -380,12 +398,12 @@ sub link_wasm { ); } elsif ( $target eq 'linux' ) { - Util::run( $linux_cc, "$bd/system.o", "$bd/libiwasm.a", @linux_ldflags_base, - '-o', "$bd/system.elf" ); + Util::run( $linux_cc, "$bd/system.o", "$bd/libiwasm.a", + @linux_ldflags_base, '-o', "$bd/system.elf" ); } elsif ( $target eq 'linux-baremetal' ) { - Util::run( $cross_cc, "$bd/system.o", "$bd/syscalls.o", "$bd/libiwasm.a", - @baremetal_ldflags_base, '-o', "$bd/system.elf" ); + Util::run( $cross_cc, "$bd/system.o", "$bd/syscalls.o", + "$bd/libiwasm.a", @baremetal_ldflags_base, '-o', "$bd/system.elf" ); } else { die "Unknown target '$target'\n"; @@ -404,8 +422,8 @@ sub link_c { ); } elsif ( $target eq 'linux' ) { - Util::run( $linux_cc, "$bd/c_host.o", "$bd/c_module.o", @linux_ldflags_nowasm, - '-o', "$bd/system.elf" ); + Util::run( $linux_cc, "$bd/c_host.o", "$bd/c_module.o", + @linux_ldflags_nowasm, '-o', "$bd/system.elf" ); } else { die "C mode is not supported for target '$target'\n"; diff --git a/scripts/menu.pl b/scripts/menu.pl index afd08e9..269e4c9 100644 --- a/scripts/menu.pl +++ b/scripts/menu.pl @@ -5,13 +5,12 @@ use warnings; use diagnostics; use FindBin; -use lib $FindBin::Bin; use lib "$FindBin::Bin/Modules"; use Util; use Mars; use TUI; -use Modules::Filters; +use Filters; use Text::CSV_XS; use feature 'say'; @@ -90,7 +89,7 @@ my %handlers = ( my @filter_choices = ("None"); my %filter_label_name; my @filter_configs; - my $configs = Modules::Filters::get_configs(); + my $configs = Filters::get_configs(); foreach my $name ( sort keys %$configs ) { my $label = $configs->{$name}{label}; push @filter_choices, $label; diff --git a/scripts/runner.pl b/scripts/runner.pl index 20bede9..d76f2cc 100644 --- a/scripts/runner.pl +++ b/scripts/runner.pl @@ -5,11 +5,10 @@ use warnings; use diagnostics; use FindBin; -use lib $FindBin::Bin; use lib "$FindBin::Bin/Modules"; -use Modules::Filters; -use Modules::Util; +use Filters; +use Util; use feature 'say'; @@ -275,7 +274,7 @@ sub results { my @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 $config (@configs) {