diff --git a/buildscripts/resmokeconfig/suites/benchmarks_sep.yml b/buildscripts/resmokeconfig/suites/benchmarks_sep.yml index 42e5966b478..8337e40a1b3 100644 --- a/buildscripts/resmokeconfig/suites/benchmarks_sep.yml +++ b/buildscripts/resmokeconfig/suites/benchmarks_sep.yml @@ -2,11 +2,7 @@ test_kind: benchmark_test selector: - root: build/benchmarks.txt - include_files: - # The trailing asterisk is for handling the .exe extension on Windows. - - build/install/bin/service_entry_point_shard_role_bm* - - build/install/bin/service_entry_point_router_role_bm* + root: build/sep_bm.txt executor: config: {} diff --git a/buildscripts/resmokelib/config.py b/buildscripts/resmokelib/config.py index 62c82fcc0a0..af675bfcba2 100644 --- a/buildscripts/resmokelib/config.py +++ b/buildscripts/resmokelib/config.py @@ -686,6 +686,7 @@ BENCHMARK_SUITE_TEST_LISTS = [ "build/second_half_bm.txt", "build/storage_bm.txt", "build/sharding_bm.txt", + "build/sep_bm.txt", ] # External files or executables, used as suite selectors, that are created during the build and # therefore might not be available when creating a test membership map. diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 1b57537caea..0964f73c7e4 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -105,6 +105,9 @@ commit_queue_aliases: - variant: "^(amazon-linux2-arm64-static-compile|linux-x86-dynamic-compile-required)$" variant_tags: [] task_tags: ["clang_tidy"] + - variant: "^(al2023-arm64-sep-benchmark)$" + variant_tags: [] + task_tags: ["benchmarks_sep"] github_pr_aliases: - variant: "commit-queue" @@ -116,6 +119,9 @@ github_pr_aliases: task_tags: ["clang_tidy"] - variant: "^(AL2023-arm64-coverage|rhel-93-64-bit-coverage)$" task: ".*" + - variant: "^(al2023-arm64-sep-benchmark)$" + variant_tags: [] + task_tags: ["benchmarks_sep"] patch_aliases: - alias: required diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 5785192a54b..52b2b3474dc 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -859,6 +859,19 @@ functions: - *fetch_benchmarks - *extract_benchmarks + "do benchmark setup no fetch": + - command: manifest.load + - *git_get_shallow_project + - *f_expansions_write + - *restore_git_history_and_tags + - *add_git_tag + - *kill_processes + - *cleanup_environment + - *set_up_venv + - *upload_pip_requirements + - *f_expansions_write + - *set_up_credentials + "f_multiversion_setup_exec": &do_multiversion_setup command: subprocess.exec display_name: "multiversion setup" diff --git a/etc/evergreen_yml_components/tasks/compile_tasks.yml b/etc/evergreen_yml_components/tasks/compile_tasks.yml index c8f6b92a1eb..a160fa4c3a8 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks.yml @@ -319,7 +319,7 @@ tasks: targets: >- install-benchmarks archive-benchmarks - bazel_build_tags: --bazel-build-tag=mongo_benchmark --bazel-build-tag=mongo_library --bazel-build-tag=-repl_bm --bazel-build-tag=-query_bm --bazel-build-tag=-bsoncolumn_bm --bazel-build-tag=-first_half_bm --bazel-build-tag=-second_half_bm --bazel-build-tag=-storage_bm --bazel-build-tag=-sharding_bm + bazel_build_tags: --bazel-build-tag=mongo_benchmark --bazel-build-tag=mongo_library --bazel-build-tag=-repl_bm --bazel-build-tag=-query_bm --bazel-build-tag=-bsoncolumn_bm --bazel-build-tag=-first_half_bm --bazel-build-tag=-second_half_bm --bazel-build-tag=-storage_bm --bazel-build-tag=-sharding_bm --bazel-build-tag=-sep_bm compiling_for_test: true - command: s3.put params: diff --git a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml index 07a48b9a52d..2ead17afd83 100644 --- a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml +++ b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml @@ -60,6 +60,19 @@ variables: resmoke_jobs_max: 1 suite: benchmark_suite + - &benchmark_no_deps_template + name: benchmark_no_deps_template + depends_on: + - name: version_expansions_gen + variant: generate-tasks-for-version + commands: + - func: "do benchmark setup no fetch" + - func: "run benchmark tests" + vars: + resmoke_args: --help + resmoke_jobs_max: 1 + suite: benchmark_suite + # THIS HAS COPIES IN # - etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml # - etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml @@ -299,7 +312,7 @@ tasks: content_type: application/tar display_name: Benchmarks - - <<: *benchmark_template + - <<: *benchmark_no_deps_template name: benchmarks_sep tags: [ @@ -308,12 +321,39 @@ tasks: "benchmarks_sep", ] commands: - - func: "do benchmark setup" + - func: "do benchmark setup no fetch" + - func: "get engflow creds" + - func: "scons compile" + vars: + targets: >- + install-sep_bm + archive-sep_bm + bazel_build_tags: --bazel-build-tag=sep_bm + compiling_for_test: true + # scons compile resets install_dir + - command: expansions.update + display_name: "expansions fix install_dir" + params: + updates: + - key: install_dir + value: build/install/bin + - func: "f_expansions_write" - func: "run benchmark tests" vars: suite: benchmarks_sep exec_timeout_secs: 28800 # 8 hour timeout. resmoke_jobs_max: 1 + install_dir: build/install/bin + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + local_file: src/sep_bm.${ext|tgz} + remote_file: ${project}/${compile_variant}/${version_id}/binaries/sep_bm-${revision_order_id}.${ext|tgz} + bucket: mciuploads + permissions: public-read + content_type: application/tar + display_name: Benchmarks - <<: *gen_task_template name: concurrency_multitenancy_with_atlas_proxy_jscore_passthrough_gen diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml index 1fd5312803e..463954c8648 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml @@ -258,7 +258,6 @@ buildvariants: scons_cache_scope: shared compile_variant: *al2023-arm64-sep-benchmark tasks: - - name: compile_upload_benchmarks_TG - name: .benchmarks_sep ### Query Patch-Specific Build Variants ### diff --git a/site_scons/site_tools/mongo_benchmark.py b/site_scons/site_tools/mongo_benchmark.py index 9beb9e05710..59c3cb54761 100644 --- a/site_scons/site_tools/mongo_benchmark.py +++ b/site_scons/site_tools/mongo_benchmark.py @@ -35,6 +35,7 @@ BAZEL_BENCHMARK_TAGS["first_half_bm"] = [] BAZEL_BENCHMARK_TAGS["second_half_bm"] = [] BAZEL_BENCHMARK_TAGS["storage_bm"] = [] BAZEL_BENCHMARK_TAGS["sharding_bm"] = [] +BAZEL_BENCHMARK_TAGS["sep_bm"] = [] def exists(env): diff --git a/src/mongo/db/BUILD.bazel b/src/mongo/db/BUILD.bazel index 66c45397aa4..5ce44c5a7bb 100644 --- a/src/mongo/db/BUILD.bazel +++ b/src/mongo/db/BUILD.bazel @@ -4222,6 +4222,7 @@ mongo_cc_benchmark( "service_entry_point_bm_fixture.h", "service_entry_point_shard_role_bm.cpp", ], + tags = ["sep_bm"], deps = [ ":dbdirectclient", ":mongod_options_init", diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 53f60cb379a..6bb3d35e55a 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -273,9 +273,7 @@ env.CppUnitTest( ) env.Benchmark( - target="service_entry_point_shard_role_bm", - source=[], - LIBDEPS=[], + target="service_entry_point_shard_role_bm", source=[], LIBDEPS=[], BAZEL_BENCHMARK_TAG="sep_bm" ) env.Benchmark( diff --git a/src/mongo/s/BUILD.bazel b/src/mongo/s/BUILD.bazel index e61832cb57f..62b906d893a 100644 --- a/src/mongo/s/BUILD.bazel +++ b/src/mongo/s/BUILD.bazel @@ -1209,6 +1209,7 @@ mongo_cc_benchmark( "//src/mongo/db:profiler_bm_fixture.h", "//src/mongo/db:service_entry_point_bm_fixture.h", ], + tags = ["sep_bm"], deps = [ ":startup_initialization", "//src/mongo/db:read_write_concern_defaults_mock", diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index e15c48d01d7..18fede74685 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -72,6 +72,7 @@ env.Benchmark( target="service_entry_point_router_role_bm", source=[], LIBDEPS=[], + BAZEL_BENCHMARK_TAG="sep_bm", ) env.CppUnitTest(