Allow configuring which memory for pool/usage allocators is placed where

This commit is contained in:
2026-06-05 20:15:19 +02:00
parent b6355a67f3
commit a07cd4913c
4 changed files with 208 additions and 81 deletions

View File

@ -49,34 +49,10 @@ my @selected_modes =
TUI::select_from_list( "Select Execution Modes", 1, @modes );
die "No mode selected" unless @selected_modes;
# Select .text.wamr_aot section variant
my @aot_section_variants = (
"Place AOT array in .text.wamr_aot",
"Let the linker decide where the AOT array is located",
);
my ($selected_aot_variant) =
TUI::select_from_list( "Select WAMR Array.Text Variant",
0, @aot_section_variants );
die "No AOT section variant selected" unless $selected_aot_variant;
local $ENV{WAMR_USE_AOT_IN_TEXT} =
( $selected_aot_variant eq $aot_section_variants[0] )
? "true"
: "false";
# Select WAMR mmap variant
my @mmap_variants = (
"Place mmap_space in .text.wamr_mmap",
"Let the linker decide where mmap_space is located"
);
my ($selected_mmap_variant) =
TUI::select_from_list( "Select WAMR Mmap.Text Variant", 0, @mmap_variants );
die "No variant selected" unless $selected_mmap_variant;
local $ENV{WAMR_USE_MMAP_IN_TEXT} =
( $selected_mmap_variant eq $mmap_variants[0] )
? "true"
: "false";
# ========================================================================================= #
# Select WAMR allocator variant
# ========================================================================================= #
my @allocator_variants = (
"Pool allocator (Alloc_With_Pool)",
"Allocator with usage (Alloc_With_Allocator)",
@ -90,17 +66,123 @@ local $ENV{WAMR_USE_ALLOCATOR} =
? "false"
: "true";
# ========================================================================================= #
# Select XIP variant
# ========================================================================================= #
my @xip_variants = ( "Compile AOT with --xip", "Compile AOT without --xip" );
my ($selected_xip_variant) =
TUI::select_from_list( "Select WAMRC XIP Variant", 0, @xip_variants );
die "No XIP variant selected" unless $selected_xip_variant;
local $ENV{WAMR_USE_XIP} =
( $selected_xip_variant eq $xip_variants[0] )
my $selected_xip_variant;
if ( grep { $_ eq "aot" } @selected_modes ) {
($selected_xip_variant) =
TUI::select_from_list( "Select WAMRC XIP Variant", 0, @xip_variants );
die "No XIP variant selected" unless $selected_xip_variant;
local $ENV{WAMR_USE_XIP} =
( $selected_xip_variant eq $xip_variants[0] )
? "true"
: "false";
}
# ========================================================================================= #
# Select .text.wamr_mmap variant
# ========================================================================================= #
my @mmap_variants = (
"Place mmap_space in .text.wamr_mmap",
"Let the linker decide where mmap_space is located"
);
my ($selected_mmap_variant) =
TUI::select_from_list( "Select WAMR Mmap.Text Variant", 0, @mmap_variants );
die "No variant selected" unless $selected_mmap_variant;
local $ENV{WAMR_USE_MMAP_IN_TEXT} =
( $selected_mmap_variant eq $mmap_variants[0] )
? "true"
: "false";
# ========================================================================================= #
# Select .text.wamr_aot variant
# ========================================================================================= #
my @aot_section_variants = (
"Place AOT array in .text.wamr_aot",
"Let the linker decide where the AOT array is located",
);
my $selected_aot_variant;
if ( grep { $_ eq "aot" } @selected_modes ) {
($selected_aot_variant) =
TUI::select_from_list( "Select WAMR Array.Text Variant",
0, @aot_section_variants );
die "No AOT section variant selected" unless $selected_aot_variant;
local $ENV{WAMR_USE_AOT_IN_TEXT} =
( $selected_aot_variant eq $aot_section_variants[0] )
? "true"
: "false";
}
# ========================================================================================= #
# Select .text.wamr_global_heap variant
# ========================================================================================= #
my @global_heap_variants = (
"Place pool allocator's global_heap in .text.wamr_global_heap",
"Let the linker decide where global_heap is located"
);
my $selected_global_heap_variant;
if ( $selected_allocator_variant eq $allocator_variants[0] ) {
($selected_global_heap_variant) =
TUI::select_from_list( "Select WAMR Global Heap Variant",
0, @global_heap_variants );
die "No global heap variant selected" unless $selected_global_heap_variant;
local $ENV{WAMR_USE_GLOBAL_HEAP_IN_TEXT} =
( $selected_global_heap_variant eq $global_heap_variants[0] )
? "true"
: "false";
}
# ========================================================================================= #
# Select .text.wamr_runtime_pool variant
# ========================================================================================= #
my @runtime_pool_variants = (
"Place usage allocator's runtime_pool in .text.wamr_runtime_pool",
"Let the linker decide where runtime_pool is located"
);
my $selected_runtime_pool_variant;
if ( $selected_allocator_variant eq $allocator_variants[1] ) {
($selected_runtime_pool_variant) =
TUI::select_from_list( "Select WAMR Runtime Pool Variant",
0, @runtime_pool_variants );
die "No runtime pool variant selected"
unless $selected_runtime_pool_variant;
local $ENV{WAMR_USE_RUNTIME_POOL_IN_TEXT} =
( $selected_runtime_pool_variant eq $runtime_pool_variants[0] )
? "true"
: "false";
}
# ========================================================================================= #
# Select .text.wamr_linear_pool variant
# ========================================================================================= #
my @linear_pool_variants = (
"Place usage allocator's linear_pool in .text.wamr_linear_pool",
"Let the linker decide where linear_pool is located"
);
my $selected_linear_pool_variant;
if ( $selected_allocator_variant eq $allocator_variants[1] ) {
($selected_linear_pool_variant) =
TUI::select_from_list( "Select WAMR Linear Pool Variant",
0, @linear_pool_variants );
die "No linear pool variant selected" unless $selected_linear_pool_variant;
local $ENV{WAMR_USE_LINEAR_POOL_IN_TEXT} =
( $selected_linear_pool_variant eq $linear_pool_variants[0] )
? "true"
: "false";
}
# ========================================================================================= #
# Select FAIL catch flags (written to runner_flags in each build dir)
# ========================================================================================= #
my %catch_flag_map = (
"--catch-outer" => "--catch-outerspace",
"--catch-text" => "--catch-write-textsegment",
@ -108,15 +190,30 @@ my %catch_flag_map = (
my @selected_catch_tags =
TUI::select_from_list( "Select FAIL Flags", 1, sort keys %catch_flag_map );
# ========================================================================================= #
# Build everything
# ========================================================================================= #
# TODO: linux-baremetal target is broken
system( "mkdir", "-p", "$local_builds_dir" );
foreach my $experiment (@selected_experiments) {
foreach my $target (@selected_targets) {
foreach my $mode (@selected_modes) {
my $allocator_info =
( ( $mode eq "aot" || $mode eq "interp" )
&& $selected_allocator_variant eq $allocator_variants[0] )
? "alloc_pool"
: "alloc_usage";
my $xip_info =
( $mode eq "aot"
&& $selected_xip_variant
&& $selected_xip_variant eq $xip_variants[0] )
? "xip"
: "";
my $aot_info =
( $mode eq "aot"
&& $selected_aot_variant
&& $selected_aot_variant eq $aot_section_variants[0] )
? "wamr_aot"
: "";
@ -125,20 +222,32 @@ foreach my $experiment (@selected_experiments) {
&& $selected_mmap_variant eq $mmap_variants[0] )
? "wamr_mmap"
: "";
my $allocator_info =
( ( $mode eq "aot" || $mode eq "interp" )
&& $selected_allocator_variant eq $allocator_variants[0] )
? "alloc_pool"
: "alloc_usage";
my $xip_info =
( $mode eq "aot" && $selected_xip_variant eq $xip_variants[0] )
? "xip"
my $global_heap_info =
( ( $mode eq "aot" || $mode eq "interp" )
&& $selected_global_heap_variant
&& $selected_global_heap_variant eq $global_heap_variants[0] )
? "wamr_global_heap"
: "";
my $runtime_pool_info =
( ( $mode eq "aot" || $mode eq "interp" )
&& $selected_runtime_pool_variant
&& $selected_runtime_pool_variant eq
$runtime_pool_variants[0] )
? "wamr_runtime_pool"
: "";
my $linear_pool_info =
( ( $mode eq "aot" || $mode eq "interp" )
&& $selected_linear_pool_variant
&& $selected_linear_pool_variant eq $linear_pool_variants[0] )
? "wamr_linear_pool"
: "";
my $flags_info = join " ", @selected_catch_tags;
my $info_str = join " ",
my $info_str = join " ",
grep { length } (
$mode, $aot_info, $mmap_info,
$allocator_info, $xip_info, $flags_info
$mode, $aot_info, $mmap_info,
$allocator_info, $global_heap_info, $runtime_pool_info,
$linear_pool_info, $xip_info, $flags_info
);
# Build experiment
@ -156,21 +265,12 @@ foreach my $experiment (@selected_experiments) {
print $fhandle "$catch_flag_map{$_}\n" for @selected_catch_tags;
close($fhandle);
my $aot_name = $aot_info ? "_aot-text" : "";
my $mmap_name = $mmap_info ? "_mmap-text" : "";
my $allocator_name = $allocator_info ? "_alloc-usage" : "";
my $xip_name = $xip_info ? "_xip" : "";
system(
join " ",
(
"mv",
"$local_root/build-$experiment",
join "",
(
"$local_builds_dir/",
"${date}_${experiment}_${mode}_${target}",
"${aot_name}${mmap_name}${allocator_name}${xip_name}",
)
"$local_builds_dir/${date}_${experiment}_${mode}_${target}",
)
);
}