benchmark: Add new traces for Babeltrace benchmarks

Change-Id: I844a8887bf02e5283e98669bb08facef57cbe7bd
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/lava/benchmark/babeltrace/benchmark.yml b/lava/benchmark/babeltrace/benchmark.yml
index 22e7d9ea64e254370961c866d4d57aa78f60aadf..65d335e8a2b0f4387a393d292059955abb99fe53 100644 (file)
--- a/lava/benchmark/babeltrace/benchmark.yml
+++ b/lava/benchmark/babeltrace/benchmark.yml
@@ -4,6 +4,8 @@ metadata:
         description: "Run benchmark for babeltrace"
 params:
         TRACE_LOCATION: "https://obj.internal.efficios.com/lava/traces/benchmark/babeltrace/babeltrace_benchmark_trace.tar.gz"
+        TRACE_tools-2.10_LOCATION: "https://obj.internal.efficios.com/lava/traces/babeltrace/benchmark/babeltrace_benchmark_trace-tools-2.10.tar.gz"
+        TRACE_tools-2.14_LOCATION: "https://obj.internal.efficios.com/lava/traces/babeltrace/benchmark/babeltrace_benchmark_trace-tools-2.14.tar.gz"
         COMMIT: "invalid"
         GIT_URL: "https://github.com/efficios/babeltrace.git"
 run:
@@ -32,8 +34,19 @@ run:
                 - cpupower frequency-set -g performance
                 - tar xvf /tmp/trace.tar.gz --directory /tmp/ram_disk/trace/
                 - echo 3 | tee /proc/sys/vm/drop_caches
-                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_dummy_sink --command "babeltrace /tmp/ram_disk/trace/ -o dummy" --iteration 5
-                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_text_sink --command "babeltrace /tmp/ram_disk/trace/" --iteration 5
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_dummy_sink --command "babeltrace /tmp/ram_disk/trace/ -o dummy" --iteration 5 --taskset 0
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_text_sink --command "babeltrace /tmp/ram_disk/trace/" --iteration 5 --taskset 0
                 - ./ci/lava/upload_artifact.sh result_dummy_sink results/benchmarks/babeltrace/dummy/${COMMIT}
                 - ./ci/lava/upload_artifact.sh result_text_sink results/benchmarks/babeltrace/text/${COMMIT}
-
+                - rm -rf /tmp/ram_disk/trace/*
+                - curl -o - "${TRACE_tools-2.10_LOCATION}" | tar -C /tmp/ram_disk/trace -xz
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_dummy_sink --command "babeltrace /tmp/ram_disk/trace/ -o dummy" --iteration 5 --taskset 0
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_text_sink --command "babeltrace /tmp/ram_disk/trace/" --iteration 5 --taskset 0
+                - ./ci/lava/upload_artifact.sh result_dummy_sink results/benchmarks/babeltrace/dummy-2.10/${COMMIT}
+                - ./ci/lava/upload_artifact.sh result_text_sink results/benchmarks/babeltrace/text-2.10/${COMMIT}
+                - rm -rf /tmp/ram_disk/trace/*
+                - curl -o - "${TRACE_tools-2.14_LOCATION}" | tar -C /tmp/ram_disk/trace -xz
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_dummy_sink --command "babeltrace /tmp/ram_disk/trace/ -o dummy" --iteration 5 --taskset 0
+                - python3 ./ci/scripts/babeltrace-benchmark/time.py --output=result_text_sink --command "babeltrace /tmp/ram_disk/trace/" --iteration 5 --taskset 0
+                - ./ci/lava/upload_artifact.sh result_dummy_sink results/benchmarks/babeltrace/dummy-2.14/${COMMIT}
+                - ./ci/lava/upload_artifact.sh result_text_sink results/benchmarks/babeltrace/text-2.14/${COMMIT}

diff --git a/scripts/babeltrace-benchmark/benchmark.py b/scripts/babeltrace-benchmark/benchmark.py
index 8d0948d657f33f53e9bdfc67769655b5084afac6..898e08e41f354b792b69e1beb092a8667e384dd7 100644 (file)
--- a/scripts/babeltrace-benchmark/benchmark.py
+++ b/scripts/babeltrace-benchmark/benchmark.py
@@ -31,7 +31,16 @@ from matplotlib.ticker import PercentFormatter
 from minio import Minio
 from minio.error import NoSuchKey, ResponseError
 
-BENCHMARK_TYPES = ["dummy", "text"]
+BENCHMARK_TYPES = [
+    "dummy",
+    "text",
+    # traces created using lttng-tools 2.10
+    "dummy-tools-2.10",
+    "text-tools-2.10",
+    # traces created using lttng-tools master (soon to be 2.14)
+    "dummy-tools-2.14",
+    "text-tools-2.14",
+]
 DEFAULT_BUCKET = "lava"
 
 invalid_commits = {