diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index da395bbd4b153821605e41aec1ba7b7f61cb8ca3..3aff7bbc85e6306a4ad3099ddc2cfb7c767ecf70 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -579,7 +579,7 @@ opam:octez-plompiler: opam:octez-plonk: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_7 + - .rules_template__trigger_all_opam_batch_6 variables: package: octez-plonk @@ -658,12 +658,7 @@ opam:octez-smart-rollup-node-lib: # Ignoring unreleased package octez-smart-rollup-wasm-benchmark. -opam:octez-smart-rollup-wasm-benchmark-lib: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_5 - variables: - package: octez-smart-rollup-wasm-benchmark-lib +# Ignoring unreleased package octez-smart-rollup-wasm-benchmark-lib. opam:octez-smart-rollup-wasm-debugger: extends: @@ -1300,7 +1295,7 @@ opam:tezos-protocol-003-PsddFKi3: opam:tezos-protocol-004-Pt24m4xi: extends: - .opam_template - - .rules_template__trigger_all_opam_batch_6 + - .rules_template__trigger_all_opam_batch_5 variables: package: tezos-protocol-004-Pt24m4xi diff --git a/manifest/main.ml b/manifest/main.ml index 71c998574d6d58e2b6befe1cf27136dc0e00f75d..fc06761a6ccb9d3d05a169399e360ef3812cff1a 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -7826,7 +7826,6 @@ let _octez_scoru_wasm_debugger = available. *) Protocol.(client_exn alpha); octez_scoru_wasm; - octez_scoru_wasm_benchmark; octez_scoru_wasm_helpers |> open_; octez_webassembly_interpreter |> open_; octez_webassembly_interpreter_extra |> open_; diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam index d605050f3ebef6b8181a1122374342b7d925c95c..c6bd99bb66b1936c0f13bc5072fdaad178e2ea91 100644 --- a/opam/octez-smart-rollup-wasm-debugger.opam +++ b/opam/octez-smart-rollup-wasm-debugger.opam @@ -15,7 +15,6 @@ depends: [ "yaml" { >= "3.1.0" } "tezos-client-alpha" "tezos-scoru-wasm" - "octez-smart-rollup-wasm-benchmark-lib" "tezos-scoru-wasm-helpers" "tezos-webassembly-interpreter" "tezos-webassembly-interpreter-extra" diff --git a/src/bin_wasm_debugger/commands.ml b/src/bin_wasm_debugger/commands.ml index 32866ac544c7c5929c928b3f7b3fc7db0c223dd3..432110650064c8a292c6d4a2b18042b9684e76b6 100644 --- a/src/bin_wasm_debugger/commands.ml +++ b/src/bin_wasm_debugger/commands.ml @@ -39,7 +39,6 @@ type profile_options = {collapse : bool; with_time : bool; no_reboot : bool} (* Possible commands for the REPL. *) type commands = - | Bench | Time of commands | Show_inbox | Show_outbox of int32 @@ -224,10 +223,6 @@ let rec commands_docs = (fun command -> match command with ["stop"] -> Some Stop | _ -> None); documentation = "stop: Stops the execution of the current session."; }; - { - parse = (function ["bench"] -> Some Bench | _ -> None); - documentation = "bench: Benchmarking tool."; - }; { parse = (function @@ -625,29 +620,6 @@ module Make (Wasm_utils : Wasm_utils_intf.S) = struct let*! () = show_status tree in return (tree, inboxes, level) - let bench config tree = - let open Lwt_syntax in - let action = - Octez_smart_rollup_wasm_benchmark_lib.Scenario.exec_slow - ~reveal_builtins:(reveals config) - in - let step = - Octez_smart_rollup_wasm_benchmark_lib.Scenario.make_scenario_step - "" - action - in - let eval = Octez_smart_rollup_wasm_benchmark_lib.Scenario.apply_step step in - let* benchmark, tree = eval tree in - let* () = - Lwt_io.printf - "%s\n%!" - (Format.asprintf - "%a" - Octez_smart_rollup_wasm_benchmark_lib.Data.pp_analysis - benchmark) - in - return tree - (* [show_inbox tree] prints the current input buffer and the number of messages it contains. *) let show_inbox tree = @@ -945,18 +917,6 @@ module Make (Wasm_utils : Wasm_utils_intf.S) = struct return (tree, inboxes, level) in let rec go = function - | Bench -> - (* TODO: https://gitlab.com/tezos/tezos/-/issues/5615 - let*! tree = bench config tree in - return ~tree () - *) - let*! () = - Lwt_io.printf - "This command is temporarily unavailable.\n\ - See https://gitlab.com/tezos/tezos/-/issues/5615\n\ - %!" - in - return () | Time cmd -> let t = Time.System.now () in let* res = go cmd in diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index cbb890e7bdbb0b14ff13e8b437932c901b3b29fd..5d737cb4f255d323951ebf918c5d045d3c1990da 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -14,7 +14,6 @@ yaml tezos-client-alpha tezos-scoru-wasm - octez_smart_rollup_wasm_benchmark_lib tezos-scoru-wasm-helpers tezos-webassembly-interpreter tezos-webassembly-interpreter-extra