update menu/explorer + flake for group1-marker
This commit is contained in:
46
flake.nix
46
flake.nix
@ -284,17 +284,30 @@ rec {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wamr_src = pkgs.fetchFromGitea {
|
||||||
|
domain = "gitea.local.chriphost.de";
|
||||||
|
owner = "christoph";
|
||||||
|
# domain = "git.cs.tu-dortmund.de";
|
||||||
|
# owner = "christoph.urlacher";
|
||||||
|
repo = "wamr";
|
||||||
|
|
||||||
|
# With fail_marker_group1 in wasm_set_exception_local
|
||||||
|
rev = "177fe78618ce3f74ed497c13ea80e8fbad779e82";
|
||||||
|
hash = "sha256-H+ubCmL1YkI7kG7pYBs1+vpROm0hy2sryi0MWeQO3Bs=";
|
||||||
|
|
||||||
|
# With mmap_space in .text.wamr_aot
|
||||||
|
# rev = "cda2009deb85511089b04b0ac736ad4da2d07e58";
|
||||||
|
# hash = "sha256-CN6xTiwzF4Jbrpf21TF5c/C03Xb3urwkibRuIXjoU/w=";
|
||||||
|
|
||||||
|
# Without mmap_space in .text.wamr_aot
|
||||||
|
# rev = "4e7aed33fe53bf3ee4a3f2fe582c74816f850759";
|
||||||
|
# hash = "sha256-/4BKwoFDRfkA+DmbWagxdtkCDAED5rxbz5e4xvjvVWU=";
|
||||||
|
};
|
||||||
|
|
||||||
wamr = stdenv.mkDerivation {
|
wamr = stdenv.mkDerivation {
|
||||||
pname = "wamr";
|
pname = "wamr";
|
||||||
version = "2.4.4";
|
version = "2.4.4";
|
||||||
|
src = wamr_src;
|
||||||
src = pkgs.fetchFromGitea {
|
|
||||||
domain = "gitea.local.chriphost.de";
|
|
||||||
owner = "christoph";
|
|
||||||
repo = "wamr";
|
|
||||||
rev = "fd69a4e76ec0d384bd79f514772b7dfa240fc0d7";
|
|
||||||
hash = "sha256-rlCx4isI0k6rC9E0hWIA9LeinqiACug7zxj9z/e4SBQ=";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@ -317,22 +330,7 @@ rec {
|
|||||||
buildenv.mkDerivation {
|
buildenv.mkDerivation {
|
||||||
pname = "libiwasm";
|
pname = "libiwasm";
|
||||||
version = "2.4.4";
|
version = "2.4.4";
|
||||||
|
src = wamr_src;
|
||||||
src = pkgs.fetchFromGitea {
|
|
||||||
domain = "gitea.local.chriphost.de";
|
|
||||||
owner = "christoph";
|
|
||||||
# domain = "git.cs.tu-dortmund.de";
|
|
||||||
# owner = "christoph.urlacher";
|
|
||||||
repo = "wamr";
|
|
||||||
|
|
||||||
# With mmap_space in .text.wamr_aot
|
|
||||||
rev = "cda2009deb85511089b04b0ac736ad4da2d07e58";
|
|
||||||
hash = "sha256-CN6xTiwzF4Jbrpf21TF5c/C03Xb3urwkibRuIXjoU/w=";
|
|
||||||
|
|
||||||
# Without mmap_space in .text.wamr_aot
|
|
||||||
# rev = "4e7aed33fe53bf3ee4a3f2fe582c74816f850759";
|
|
||||||
# hash = "sha256-/4BKwoFDRfkA+DmbWagxdtkCDAED5rxbz5e4xvjvVWU=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [cmake];
|
nativeBuildInputs = with pkgs; [cmake];
|
||||||
|
|
||||||
|
|||||||
@ -54,7 +54,7 @@ my @markers = (
|
|||||||
"OK_MARKER", "DETECTED_MARKER",
|
"OK_MARKER", "DETECTED_MARKER",
|
||||||
"FAIL_MARKER", "TRAP",
|
"FAIL_MARKER", "TRAP",
|
||||||
"TIMEOUT", "ACCESS_OUTERSPACE",
|
"TIMEOUT", "ACCESS_OUTERSPACE",
|
||||||
"WRITE_TEXTSEGMENT",
|
"WRITE_TEXTSEGMENT", "GROUP1_MARKER",
|
||||||
);
|
);
|
||||||
|
|
||||||
# Filter popup state
|
# Filter popup state
|
||||||
|
|||||||
@ -213,7 +213,7 @@ my %handlers = (
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
'10. Open Experiment In Explorer' =>
|
'10. Explore Experiment Results' =>
|
||||||
sub { do "$local_scripts_dir/explore.pl" },
|
sub { do "$local_scripts_dir/explore.pl" },
|
||||||
|
|
||||||
'11. Compare Experiment Results' => sub {
|
'11. Compare Experiment Results' => sub {
|
||||||
@ -241,7 +241,7 @@ my %handlers = (
|
|||||||
'OK_MARKER', 'FAIL_MARKER',
|
'OK_MARKER', 'FAIL_MARKER',
|
||||||
'DETECTED_MARKER', 'TIMEOUT',
|
'DETECTED_MARKER', 'TIMEOUT',
|
||||||
'TRAP', 'WRITE_TEXTSEGMENT',
|
'TRAP', 'WRITE_TEXTSEGMENT',
|
||||||
'ACCESS_OUTERSPACE'
|
'ACCESS_OUTERSPACE', 'GROUP1_MARKER'
|
||||||
);
|
);
|
||||||
|
|
||||||
my $heading = sprintf( "%5s %20s ", "BENCH", "TYPE" );
|
my $heading = sprintf( "%5s %20s ", "BENCH", "TYPE" );
|
||||||
|
|||||||
Reference in New Issue
Block a user