fix(asap-tools): keep perf script conversion on remote

Author: milindsrivastava1997

asap-tools/docs/configuration.md

@@ -177,8 +177,8 @@ All profiling options are in the `profiling` section and are **monitoring** feat
 profiling.query_engine=true
 ```
 
-**Output:** Raw `perf.data` recordings and `perf archive` symbol archives are
-saved to the experiment output directory. Run
+**Output:** Raw `perf.data` recordings and remote `perf script --header` output
+are saved to the experiment output directory. Run
 `experiments/postprocess_query_engine_profiles.sh` locally after the experiment
 to generate scripts, folded stacks, and flamegraphs.
 

asap-tools/docs/query-engine-profiling.md

@@ -5,8 +5,9 @@ Set `profiling.query_engine: true` and
 
 The remote workflow builds and launches the separate
 `target/release/query_engine_rust_fp` binary, records compact frame-pointer
-call chains with `perf record`, and archives the symbols with `perf archive`.
-It does not run `perf script` remotely.
+call chains with `perf record`, and converts the recording to a symbolized
+`perf.script` with `perf script --header` on the remote node. FP makes this
+conversion fast enough to complete before the experiment output is rsynced.
 
 After `experiment_run_e2e.py` rsyncs the experiment output back locally, run:
 
@@ -15,7 +16,8 @@ After `experiment_run_e2e.py` rsyncs the experiment output back locally, run:
   experiment_outputs/<experiment>/sketchdb/query_engine_profiles
 ```
 
-This produces, for each `perf_*.data` file:
+This reuses the remote `.script` file when present and produces, for each
+`perf_*.data` file:
 
 - `.script`: symbolized Perf samples;
 - `.folded`: collapsed stacks for Speedscope or FlameGraph;

asap-tools/experiments/experiment_utils/services/query_engine.py

@@ -361,8 +361,6 @@ def _start_bare_metal(
             # which execs argv[0] directly rather than re-parsing through a
             # shell -- a bare `VAR=val` prefix would make nohup try (and
             # fail) to exec "TZ=UTC" itself as the program name.
-            f"test -x {binary_path} || "
-            f"{{ echo 'Missing query engine binary: {binary_path}'; exit 1; }}; "
             f"env TZ=UTC {binary_path}"
             f" --config-file {output_dir}/engine_config.yaml"
             f" > {output_dir}/query_engine_rust.out 2>&1 &"

asap-tools/experiments/postprocess_query_engine_profiles.sh

@@ -35,14 +35,7 @@ for data_file in "${data_files[@]}"; do
     script_file="$stem.script"
     folded_file="$stem.folded"
     svg_file="$stem.svg"
-    archive_file="$data_file.tar.bz2"
-    symfs_directory="${stem}.symbols"
-
-    if [[ -f "$archive_file" ]]; then
-        mkdir -p "$symfs_directory"
-        tar --overwrite -xjf "$archive_file" -C "$symfs_directory"
-        perf script --header -i "$data_file" --symfs "$symfs_directory" > "$script_file"
-    else
+    if [[ ! -f "$script_file" ]]; then
         perf script --header -i "$data_file" > "$script_file"
     fi
 

asap-tools/experiments/remote_monitor.py

@@ -5,7 +5,6 @@
 import subprocess
 import yaml
 import signal
-import tempfile
 from loguru import logger
 
 from typing import List
@@ -217,29 +216,23 @@ def stop_profiling_query_engine_pids(qe_perf_procs, store: bool):
     logger.debug("Stopped profiling for query engine pids")
 
 
-def archive_query_engine_perf_data(experiment_output_dir):
+def convert_query_engine_perf_data(experiment_output_dir):
     qe_profiles_dir = os.path.join(experiment_output_dir, "query_engine_profiles")
     data_files = [
         os.path.join(qe_profiles_dir, f)
         for f in os.listdir(qe_profiles_dir)
         if f.startswith("perf_") and f.endswith(".data")
     ]
     for data_file in data_files:
-        archive_file = f"{data_file}.tar.bz2"
-        logger.debug(f"Archiving {data_file} to {archive_file}")
-        with tempfile.TemporaryDirectory(dir=qe_profiles_dir) as archive_dir:
+        script_file = data_file.replace(".data", ".script")
+        logger.debug(f"Converting {data_file} to {script_file}")
+        with open(script_file, "w") as script_output:
             subprocess.run(
-                ["perf", "archive", data_file],
-                cwd=archive_dir,
+                ["perf", "script", "--header", "-i", data_file],
+                stdout=script_output,
                 check=True,
             )
-            generated_archive = os.path.join(archive_dir, "perf.data.tar.bz2")
-            if not os.path.isfile(generated_archive):
-                raise RuntimeError(
-                    f"perf archive did not produce expected file: {generated_archive}"
-                )
-            os.replace(generated_archive, archive_file)
-        logger.debug(f"Finished archiving {data_file}")
+        logger.debug(f"Finished converting {data_file}")
 
 
 # TODO Provide some way of specifying which hooks will be used
@@ -442,7 +435,7 @@ def main(args):
     if qe_flamegraph_procs:
         logger.debug("Stopping profiling for query engine pids")
         stop_profiling_query_engine_pids(qe_flamegraph_procs, store=True)
-        archive_query_engine_perf_data(args.experiment_output_dir)
+        convert_query_engine_perf_data(args.experiment_output_dir)
 
     logger.debug("Stopping process monitors")
     monitor_info = process_monitor.stop_monitor(monitor, control_pipe, monitor_pipe)