diff --git a/flake.nix b/flake.nix index ca24a0d..51ba4fa 100644 --- a/flake.nix +++ b/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 { pname = "wamr"; version = "2.4.4"; - - src = pkgs.fetchFromGitea { - domain = "gitea.local.chriphost.de"; - owner = "christoph"; - repo = "wamr"; - rev = "fd69a4e76ec0d384bd79f514772b7dfa240fc0d7"; - hash = "sha256-rlCx4isI0k6rC9E0hWIA9LeinqiACug7zxj9z/e4SBQ="; - }; + src = wamr_src; dontBuild = true; installPhase = '' @@ -317,22 +330,7 @@ rec { buildenv.mkDerivation { pname = "libiwasm"; version = "2.4.4"; - - 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="; - }; + src = wamr_src; nativeBuildInputs = with pkgs; [cmake]; diff --git a/scripts/explore.pl b/scripts/explore.pl index b9be773..1d4b79b 100644 --- a/scripts/explore.pl +++ b/scripts/explore.pl @@ -51,10 +51,10 @@ my $source_text; my @benchs = ( "ip", "mem", "regs" ); my @markers = ( - "OK_MARKER", "DETECTED_MARKER", - "FAIL_MARKER", "TRAP", - "TIMEOUT", "ACCESS_OUTERSPACE", - "WRITE_TEXTSEGMENT", + "OK_MARKER", "DETECTED_MARKER", + "FAIL_MARKER", "TRAP", + "TIMEOUT", "ACCESS_OUTERSPACE", + "WRITE_TEXTSEGMENT", "GROUP1_MARKER", ); # Filter popup state diff --git a/scripts/menu.pl b/scripts/menu.pl index 017f680..ff5329e 100644 --- a/scripts/menu.pl +++ b/scripts/menu.pl @@ -213,7 +213,7 @@ my %handlers = ( } }, - '10. Open Experiment In Explorer' => + '10. Explore Experiment Results' => sub { do "$local_scripts_dir/explore.pl" }, '11. Compare Experiment Results' => sub { @@ -238,10 +238,10 @@ my %handlers = ( my @benchs = ( 'ip', 'mem', 'regs' ); my @markers = ( - 'OK_MARKER', 'FAIL_MARKER', - 'DETECTED_MARKER', 'TIMEOUT', - 'TRAP', 'WRITE_TEXTSEGMENT', - 'ACCESS_OUTERSPACE' + 'OK_MARKER', 'FAIL_MARKER', + 'DETECTED_MARKER', 'TIMEOUT', + 'TRAP', 'WRITE_TEXTSEGMENT', + 'ACCESS_OUTERSPACE', 'GROUP1_MARKER' ); my $heading = sprintf( "%5s %20s ", "BENCH", "TYPE" );