Update artefact to draw new plots and tables

Author: jacob-hughes

Makefile

@@ -76,7 +76,7 @@ bare-metal: venv
 		$(MEASURE_ARG)
 
 process: venv
-	@$(INVOKE) process-benchmarks
+	@$(INVOKE) process-results
 
 build-paper:
 	docker build --progress=plain -f Dockerfile.paper --target export --output type=local,dest=./rustgc_paper -t rustgc-paper:latest .

alloy_adapter.py

@@ -28,7 +28,8 @@ def __init__(self, include_faulty, executor):
         GaugeAdapter.__init__(self, include_faulty, executor)
 
     def _create_command(self, command):
-        return "%s -f %s %s" % (self._time_bin, AlloyAdapter.time_format, command)
+        time = f"{self._time_bin} -f {AlloyAdapter.time_format}"
+        return f"{time} {command}"
 
     def should_enable_premature_finalizer_optimization(self, run_id):
         exec = run_id.benchmark.suite.executor.name
@@ -60,6 +61,13 @@ def acquire_command(self, run_id):
         if not self._completed_time_availability_check:
             self._check_which_time_command_is_available()
 
+        if "GC_HEAPTRACK_DIR" in run_id.env:
+            dir = run_id.env["GC_HEAPTRACK_DIR"]
+            bm = run_id.benchmark.name.lower()
+            out = f"{dir}/{bm}-{run_id.completed_invocations + 1}"
+            ht = run_id.env["HEAPTRACK_PATH"]
+            run_id.env["GC_HEAPTRACK_ZST"] = out
+            command = " ".join([ht, "--record-only", "-o", out, command])
         return self._create_command(command)
 
     def _check_which_time_command_is_available(self):
@@ -118,6 +126,16 @@ def parse_data(self, data, run_id, invocation):
                 measure = Measurement(
                     invocation, iteration, time, "ms", run_id, "total"
                 )
+
+                # if "GC_HEAPTRACK_DIR" in run_id.env:
+                #     zst = run_id.env["GC_HEAPTRACK_ZST"]
+                #     ht_print = run_id.env["HEAPTRACK_PRINT_PATH"]
+                #     subprocess.run(
+                #         [ht_print, "-M", f"{zst}.massif", f"{zst}.zst"],
+                #         stdout=subprocess.DEVNULL,
+                #         stderr=subprocess.DEVNULL,
+                #     )
+
                 current.add_measurement(measure)
                 data_points.append(current)
                 current = DataPoint(run_id)

artefacts.py

@@ -117,23 +117,11 @@ def wrapper(self, *args, **kwargs):
 
 @dataclass(frozen=True)
 class Artefact:
-    _name: Optional[str] = None
     repo: Optional[Repo] = None
-    deps: Tuple["Artefact"] = ()
-    steps: Optional[int] = 0
-    _src: Optional[Path] = None
-
-    @property
-    def name(self) -> str:
-        return self._name or self.repo.name
-
-    @property
-    def debug_name(self) -> str:
-        return self.name
 
     @property
     def src(self) -> Path:
-        return self._src or (SRC_DIR / self.repo.name)
+        return SRC_DIR / self.repo.name
 
     @property
     def install_prefix(self) -> Path:
@@ -161,44 +149,46 @@ def remove(self, including_src=False):
             self.repo.remove()
 
 
-class Crate(Artefact):
-    @property
-    def cargo_toml(self):
-        return f"{self.src}/Cargo.toml"
+class Heaptrack(Artefact):
+    def build(self, c):
+        self.repo.fetch()
+        self.build_dir.mkdir(parents=True, exist_ok=True)
+        self.install_prefix.mkdir(parents=True, exist_ok=True)
 
-    @command_runner(description="Building", dry_run=DRY_RUN)
-    def _cargo_build(self):
-        return [
-            "cargo",
-            "build",
-            "--release",
-            "--manifest-path",
-            self.cargo_toml,
-            "--target-dir",
-            self.build_dir,
+        cmake = [
+            "cmake",
+            "-S",
+            str(self.repo.src),
+            "-B",
+            str(self.build_dir),
+            f"-DCMAKE_INSTALL_PREFIX={self.install_prefix}",
+            "-DCMAKE_BUILD_TYPE=Release",
         ]
+        c.run(" ".join(cmake))
+        with c.cd(self.build_dir):
+            c.run(f"make -j install")
 
-    @prepare_build
-    def build(self):
-        self._cargo_build()
-        for f in (self.target / "release").glob("*"):
-            if (
-                f.is_file()
-                and not f.suffix in [".d", ".rlib"]
-                and not f.name.startswith(".")
-            ):
-                os.symlink(f, self.bin / f.name)
+    @property
+    def path(self) -> Path:
+        return self.install_prefix / "bin" / "heaptrack"
 
 
 ALLOY = Artefact(
-    steps=5907,
     repo=Repo(
         name="alloy",
         url="https://github.com/jacob-hughes/alloy",
         version="quickfix-stats",
     ),
 )
 
+HEAPTRACK = Heaptrack(
+    repo=Repo(
+        name="heaptrack",
+        url="https://github.com/kde/heaptrack",
+        version="master",
+    ),
+)
+
 LINUX = Repo(
     name="linux",
     url="https://github.com/BurntSushi/linux",