Fix arg parsing for bare-metal recipe

Author: jacob-hughes

Dockerfile

@@ -6,9 +6,17 @@ FROM debian:latest as base
 FROM base as build
 WORKDIR /app
 
-# Add build argument for prebuilt binaries
 ARG BUILD_QUICK=false
-ENV BUILD_QUICK=${BUILD_QUICK}
+ARG PEXECS
+ARG EXPERIMENTS
+ARG SUITES
+ARG MEASUREMENTS
+
+ENV BUILD_QUICK=$BUILD_QUICK
+ENV PEXECS=$PEXECS
+ENV EXPERIMENTS=$EXPERIMENTS
+ENV SUITES=$SUITES
+ENV MEASUREMENTS=$MEASUREMENTS
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -48,7 +56,7 @@ RUN mkdir -p /app/artefacts
 COPY . .
 
 RUN if [ "$BUILD_QUICK" = "false" ]; then \
-    invoke build-benchmarks; \
+    invoke build-alloy $EXPERIMENTS $MEASUREMENTS; \
     else \
     echo "Using prebuilt binaries"; \
     cp -r ./artefacts/prebuilt /app/artefacts/; \
@@ -62,8 +70,5 @@ FROM debian:latest as runtime
 WORKDIR /app
 COPY --from=build /app/artefacts /app/artefacts
 
-CMD invoke run-benchmarks $PEXECS \
-    --experiments=$EXPERIMENTS \
-    --suites=$SUITES \
-    --metrics=$MEASUREMENTS
+CMD invoke run-benchmarks $PEXECS $EXPERIMENTS $SUITES $MEASUREMENTS
 

Makefile

@@ -1,6 +1,4 @@
 CURDIR ?= $(shell pwd)
-EXPERIMENTS ?= gcvs premopt elision
-MEASUREMENTS ?= perf mem metrics
 
 IMAGE_full := full:latest
 IMAGE_quick := quick:latest
@@ -32,7 +30,7 @@ run-quick: fetch-binaries
 	docker buildx build \
 		--target runtime \
 		--tag $(IMAGE_quick) \
-		--build-arg QUICK_BUILD=true \
+		--build-arg BUILD_QUICK=true \
 		--load .
 	@test -f $(LOGFILE) || touch $(LOGFILE)
 	chmod a+w $(LOGFILE)
@@ -42,7 +40,13 @@ run-quick: fetch-binaries
 		$(IMAGE_quick)
 
 run-full:
-	docker buildx build --target runtime --tag $(IMAGE_full) --load .
+	docker buildx build \
+		--build-arg $(if $(EXPERIMENTS),EXPERIMENTS="--experiments $(EXPERIMENTS))" \
+		--build-arg $(if $(SUITES),SUITES="--suites $(SUITES))" \
+		--build-arg $(if $(MEASUREMENTS),MEASUREMENTS="--measurements $(MEASUREMENTS))" \
+		--target runtime \
+		--tag $(IMAGE_full) \
+		--load .
 	@test -f $(LOGFILE) || touch $(LOGFILE)
 	chmod a+w $(LOGFILE)
 	docker run --rm -it \
@@ -65,5 +69,8 @@ fetch-binaries: venv
 	@echo "Done"
 
 bare-metal: venv
-	./run build-benchmarks
+	@./run build-alloy \
+		$(if $(EXPERIMENTS),--experiments $(EXPERIMENTS)) \
+		$(if $(SUITES),--suites $(SUITES)) \
+		$(if $(MEASUREMENTS),--measurements $(MEASUREMENTS))