From 9bf21aa2449363d9a280fc6d5b1fb4a409654fa5 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Mon, 4 Jul 2022 13:27:29 -0700 Subject: [PATCH 1/3] test: fix setup of benchmarks in CI on new CPU models "12th Gen Intel(R) Core(TM) i5-12500" is a new CPU model appearing in CI benchmark runs in the last week. The "... i7-8665U ..." model is being added from the equivalent 'setUp()' implementation in apm-agent-java. --- test/benchmarks/scripts/run-benchmarks-ci.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/benchmarks/scripts/run-benchmarks-ci.sh b/test/benchmarks/scripts/run-benchmarks-ci.sh index 200ef84e1f..cf30704239 100755 --- a/test/benchmarks/scripts/run-benchmarks-ci.sh +++ b/test/benchmarks/scripts/run-benchmarks-ci.sh @@ -35,10 +35,18 @@ function setUp() { then CORE_INDEX=7 BASE_FREQ="3.6GHz" + elif [ "${CPU_MODEL}" == "Intel(R) Core(TM) i7-8665U CPU @ 1.90GHz " ] + then + CORE_INDEX=7 + BASE_FREQ="1.9GHz" elif [ "${CPU_MODEL}" == "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz " ] then CORE_INDEX=9 BASE_FREQ="2.90GHz" + elif [ "${CPU_MODEL}" == "12th Gen Intel(R) Core(TM) i5-12500 " ] + then + CORE_INDEX=11 + BASE_FREQ="3.0GHz" else >&2 echo "Cannot determine base frequency for CPU model [${CPU_MODEL}]. Please adjust the build script." exit 1 From 7867feef377f02d1e47b0e3c478ad2367dba0a41 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Mon, 4 Jul 2022 13:37:47 -0700 Subject: [PATCH 2/3] comment showing shared impl in the Java agent --- test/benchmarks/scripts/run-benchmarks-ci.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/benchmarks/scripts/run-benchmarks-ci.sh b/test/benchmarks/scripts/run-benchmarks-ci.sh index cf30704239..9ef07760b6 100755 --- a/test/benchmarks/scripts/run-benchmarks-ci.sh +++ b/test/benchmarks/scripts/run-benchmarks-ci.sh @@ -18,6 +18,8 @@ fi echo $(pwd) +# Share this 'setUp' implementation with +# https://github.com/elastic/apm-agent-java/blob/main/scripts/jenkins/run-benchmarks.sh function setUp() { echo "Setting CPU frequency to base frequency" From 21d1132f083de536ddaf39a3794acf0a0a50a511 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Tue, 5 Jul 2022 09:23:26 -0700 Subject: [PATCH 3/3] drop the i7-8665U CPU, it is Sylvain's laptop and not likely to be useful for Node.js benchmarks :) --- test/benchmarks/scripts/run-benchmarks-ci.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/benchmarks/scripts/run-benchmarks-ci.sh b/test/benchmarks/scripts/run-benchmarks-ci.sh index 9ef07760b6..51d01ca42d 100755 --- a/test/benchmarks/scripts/run-benchmarks-ci.sh +++ b/test/benchmarks/scripts/run-benchmarks-ci.sh @@ -37,10 +37,6 @@ function setUp() { then CORE_INDEX=7 BASE_FREQ="3.6GHz" - elif [ "${CPU_MODEL}" == "Intel(R) Core(TM) i7-8665U CPU @ 1.90GHz " ] - then - CORE_INDEX=7 - BASE_FREQ="1.9GHz" elif [ "${CPU_MODEL}" == "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz " ] then CORE_INDEX=9