Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tests/integration/defs/perf/open_search_db_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
"d_p99_e2el",
]

# Default threshold values for performance regression detection
POST_MERGE_THRESHOLD = 0.05
PRE_MERGE_THRESHOLD = 0.1

# Fields for scenario-only matching for recipe tests.
# Unlike regular tests that match on all config fields, recipes match only on the benchmark
# scenario, allowing the underlying config to change while still comparing against baselines
Expand Down
14 changes: 11 additions & 3 deletions tests/integration/defs/perf/test_perf_sanity.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ class DisaggConfig:

def __init__(
self,
name: str,
disagg_serving_type: str,
hostname: str,
numa_bind: bool,
Expand All @@ -472,6 +473,7 @@ def __init__(
hardware: dict,
server_env_var: str,
):
self.name = name
self.disagg_serving_type = disagg_serving_type
self.hostname = hostname
self.numa_bind = numa_bind
Expand Down Expand Up @@ -971,7 +973,7 @@ def _parse_disagg_config_file(self, config_file_path: str, config_file: str):
# Create ctx server config
ctx_server_config_data = {
"concurrency": max(concurrency_values),
"name": f"ctx_{config_file_base_name}",
"name": config_file_base_name,
"model_name": model_name,
"gpus_per_node": gpus_per_node,
**worker_config.get("ctx", {}),
Expand All @@ -980,7 +982,7 @@ def _parse_disagg_config_file(self, config_file_path: str, config_file: str):
# Create gen server config
gen_server_config_data = {
"concurrency": max(concurrency_values),
"name": f"gen_{config_file_base_name}",
"name": config_file_base_name,
"model_name": model_name,
"gpus_per_node": gpus_per_node,
**worker_config.get("gen", {}),
Expand All @@ -991,6 +993,7 @@ def _parse_disagg_config_file(self, config_file_path: str, config_file: str):

# Create disagg config
disagg_config = DisaggConfig(
name=config_file_base_name,
disagg_serving_type=disagg_serving_type,
hostname=socket.gethostname(),
numa_bind=numa_bind,
Expand Down Expand Up @@ -1249,6 +1252,10 @@ def add_dict_prefix(config_dict: dict, prefix_name: str) -> dict:
new_data.update(job_config)
new_data.update(server_config_dict)
new_data.update(client_config_dict)
# Add test_case_name for convenient filtering on OpenSearch
new_data["s_test_case_name"] = (
f"{new_data['s_server_name']}-{new_data['s_client_name']}"
)

for metric_name in PERF_METRIC_LOG_QUERIES:
if metric_name in self._test_results[cmd_idx]:
Expand Down Expand Up @@ -1308,12 +1315,13 @@ def add_dict_prefix(config_dict: dict, prefix_name: str) -> dict:
"l_num_gen_servers": num_gen_servers,
}
new_data.update(job_config)

if num_ctx_servers > 0:
new_data.update(ctx_server_config_dict)
if num_gen_servers > 0:
new_data.update(gen_server_config_dict)
new_data.update(client_config_dict)
# Add test_case_name for convenient filtering on OpenSearch
new_data["s_test_case_name"] = f"{disagg_config.name}-{client_config['name']}"

for metric_name in PERF_METRIC_LOG_QUERIES:
if metric_name in self._test_results[cmd_idx]:
Expand Down
Loading