Various fixes

Author: jacob-hughes

Dockerfile

@@ -27,9 +27,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
     rm -f /etc/apt/apt.conf.d/docker-clean && \
     apt-get update && \
-    apt-get -y install make build-essential curl git cmake python3.11 python3.11-venv python3.11-distutils python3-pip \
+    apt-get -y install make bc perl build-essential curl git cmake python3.11 python3.11-venv python3.11-distutils python3-pip \
     libtinfo-dev libzip-dev ninja-build gdb pipx rsync \
-    libdwarf-dev libunwind-dev libboost-dev libboost-iostreams-dev \
+    libdwarf-dev libunwind-dev libboost-dev libfontconfig1-dev fontconfig libboost-iostreams-dev \
     libboost-all-dev libboost-program-options-dev libboost-regex-dev zlib1g-dev zstd libelf-dev elfutils \
     libdw-dev pkg-config libssl-dev zlib1g-dev libzstd-dev liblzma-dev \
     libffi-dev libedit-dev llvm-dev clang procps autotools-dev xz-utils \
@@ -67,12 +67,12 @@ RUN --mount=type=cache,target=/cache \
     ls -ls /app/artefacts/bin; \
     fi
 
-RUN  invoke build-alloy $EXPERIMENTS $MEASUREMENTS
+RUN  invoke build-benchmarks $EXPERIMENTS $SUITES $MEASUREMENTS
 
 FROM scratch as log_export
 COPY --from=build /app/experiment.log /docker-run-full.log
 
-FROM debian:latest as runtime
+FROM build as runtime
 
 ARG BUILD_QUICK=false
 ARG PEXECS
@@ -87,7 +87,10 @@ ENV SUITES=$SUITES
 ENV MEASUREMENTS=$MEASUREMENTS
 
 WORKDIR /app
-COPY --from=build /app/artefacts /app/artefacts
 
-CMD invoke run-benchmarks $PEXECS $EXPERIMENTS $SUITES $MEASUREMENTS
+RUN pip install --upgrade pip --break-system-packages && \
+    pip install .[dev] --break-system-packages
+
+RUN ls -la
+run invoke run-benchmarks $PEXECS $EXPERIMENTS $SUITES $MEASUREMENTS
 

Makefile

@@ -4,7 +4,7 @@ IMAGE := $(if $(FULL),full:latest,quick:latest)
 LOG_STAGE := log_export
 RUNTIME_STAGE := runtime
 RESULTS := $(CURDIR)/results
-LOGFILE := experiment.log
+LOGFILE := $(CURDIR)/experiment.log
 
 VENV_DIR := .venv
 VENV_PYTHON := $(VENV_DIR)/bin/python
@@ -38,22 +38,21 @@ define WITH_DOCKER
 		$(if $(SUITE_ARG),--build-arg SUITES=$(SUITE_ARG)) \
 		$(if $(MEASURE_ARG),--build-arg MEASUREMENTS=$(MEASURE_ARG)) \
 		--target runtime \
-		--tag $(IMAGE) \
+		--tag $2 \
 		--load .
 	@test -f $(LOGFILE) || touch $(LOGFILE)
 	chmod a+w $(LOGFILE)
 	docker run --rm -it \
-		--mount type=bind,source="$(LOGFILE)",target=/app/experiment.log \
 		--mount type=bind,source="$(RESULTS)",target=/app/results \
-		$(IMAGE)
+		$2
 endef
 
 
 run-quick:
-	$(call WITH_DOCKER,false)
+	$(call WITH_DOCKER,false,quick:latest)
 
 run-full:
-	$(call WITH_DOCKER,true)
+	$(call WITH_DOCKER,true,full:latext)
 
 tarball:
 	@echo "Compressing $(BIN_DIR) with maximum compression..."

benchmarks.py

@@ -35,22 +35,27 @@ def __lt__(self, other):
 FD = (
     Benchmark(
         name="no-pattern",
-        extra_args=f"--hidden --no-ignore 'alloy'",
+        extra_args=f"--hidden --no-ignore {artefacts.ALLOY.src}",
+    ),
+    Benchmark(
+        name="simple-pattern", extra_args=f"'.*[0-9]\\.jpg$' . '{artefacts.ALLOY.src}'"
     ),
-    Benchmark(name="simple-pattern", extra_args=f"'.*[0-9]\\.jpg$' . 'alloy'"),
     Benchmark(
         name="simple-pattern-HI",
-        extra_args=f"-HI '.*[0-9]\\.jpg$' 'alloy'",
+        extra_args=f"-HI '.*[0-9]\\.jpg$' . '{artefacts.ALLOY.src}'",
     ),
     Benchmark(
         name="file-extension",
-        extra_args=f"-HI --extension jpg . 'alloy'",
+        extra_args=f"-HI --extension jpg . '{artefacts.ALLOY.src}'",
+    ),
+    Benchmark(name="file-type", extra_args=f"-HI --type l . '{artefacts.ALLOY.src}'"),
+    Benchmark(
+        name="command-execution",
+        extra_args=f"'ab' . '{artefacts.ALLOY.src}' --exec echo",
     ),
-    Benchmark(name="file-type", extra_args=f"-HI --type l . 'alloy'"),
-    Benchmark(name="command-execution", extra_args=f"'ab' 'alloy' --exec echo"),
     Benchmark(
         name="command-execution-large-output",
-        extra_args=f"-tf 'ab' 'alloy' --exec echo",
+        extra_args=f"-tf 'ab' . '{artefacts.ALLOY.src}' --exec echo",
     ),
 )