From ee6b22ca63361a61618b00723e8f557d33e72af4 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Sat, 13 Mar 2021 20:27:55 -0800 Subject: [perf] Run benchmarks with VFS2. The run-benchmark target would run the benchmark with VFS1. PiperOrigin-RevId: 362754188 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e424308fa..0f79b6a18 100644 --- a/Makefile +++ b/Makefile @@ -326,6 +326,7 @@ containerd-tests: containerd-test-1.4.3 ## BENCHMARKS_FILTER - filter to be applied to the test suite. ## BENCHMARKS_OPTIONS - options to be passed to the test. ## BENCHMARKS_PROFILE - profile options to be passed to the test. +## BENCH_RUNTIME_ARGS - args to configure the runtime which runs the benchmarks. ## BENCHMARKS_PROJECT ?= gvisor-benchmarks BENCHMARKS_DATASET ?= kokoro @@ -339,6 +340,7 @@ BENCHMARKS_FILTER := . BENCHMARKS_OPTIONS := -test.benchtime=30s BENCHMARKS_ARGS := -test.v -test.bench=$(BENCHMARKS_FILTER) $(BENCHMARKS_OPTIONS) BENCHMARKS_PROFILE := -pprof-dir=/tmp/profile -pprof-cpu -pprof-heap -pprof-block -pprof-mutex +BENCH_RUNTIME_ARGS ?= --vfs2 init-benchmark-table: ## Initializes a BigQuery table with the benchmark schema. @$(call run,//tools/parsers:parser,init --project=$(BENCHMARKS_PROJECT) --dataset=$(BENCHMARKS_DATASET) --table=$(BENCHMARKS_TABLE)) @@ -359,13 +361,13 @@ run_benchmark = \ benchmark-platforms: load-benchmarks $(RUNTIME_BIN) ## Runs benchmarks for runc and all given platforms in BENCHMARK_PLATFORMS. @$(foreach PLATFORM,$(BENCHMARKS_PLATFORMS), \ - $(call run_benchmark,$(PLATFORM),--platform=$(PLATFORM) --vfs2) && \ + $(call run_benchmark,$(PLATFORM),--platform=$(PLATFORM) $(BENCH_RUNTIME_ARGS)) && \ ) true @$(call run_benchmark,runc) .PHONY: benchmark-platforms run-benchmark: load-benchmarks $(RUNTIME_BIN) ## Runs single benchmark and optionally sends data to BigQuery. - @$(call run_benchmark,$(RUNTIME),) + @$(call run_benchmark,$(RUNTIME),$(BENCH_RUNTIME_ARGS)) .PHONY: run-benchmark ## -- cgit v1.2.3