Skip to content

To keep the nightly configuration overwrite pre-submit configuration#2123

Merged
dezhiAmd merged 2 commits into
ROCm:mainfrom
dezhiAmd:new_matrix
Nov 13, 2025
Merged

To keep the nightly configuration overwrite pre-submit configuration#2123
dezhiAmd merged 2 commits into
ROCm:mainfrom
dezhiAmd:new_matrix

Conversation

@dezhiAmd
Copy link
Copy Markdown
Contributor

@dezhiAmd dezhiAmd commented Nov 13, 2025

Motivation

The original code had a critical bug: when a gfx family appeared in multiple trigger types (e.g., gfx110x in both presubmit and nightly), its configuration was overwritten due to Python’s dictionary merge operator (|).
This caused:

  • PR builds to incorrectly use nightly configurations instead of presubmit.
  • Incorrect Windows runners being selected, leading to mismatched environments.

See related issue: #1097

Technical Details

Introduced a new function get_all_families_for_trigger_types() to replace amdgpu_family_info_matrix_all.
Key changes:

  • Accepts a list of trigger types (e.g., ['presubmit', 'postsubmit']).
  • Returns a combined family matrix where first occurrence wins for duplicates, ensuring deterministic behavior.
  • Preserves trigger-specific configurations without overwriting.

Test Plan

After the change, tests runs on runner "windows-gfx110X-gpu-rocm" with gfx family gfx110X-dgpu only happens nightly, not pre-submit

Test Result

Test pass

Submission Checklist

Signed-off-by: Liao <dezhliao@amd.com>
Signed-off-by: dezhliao <dezhliao@amd.com>
@dezhiAmd dezhiAmd changed the title New matrix To keep pre-submit configuration being overrided by the nightly configuration Nov 13, 2025
@dezhiAmd dezhiAmd changed the title To keep pre-submit configuration being overrided by the nightly configuration To keep the nightly configuration overwrite pre-submit configuration Nov 13, 2025
@dezhiAmd dezhiAmd marked this pull request as ready for review November 13, 2025 16:42
Copy link
Copy Markdown
Contributor

@amd-justchen amd-justchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests seem to be good!

@dezhiAmd dezhiAmd merged commit e58cbfb into ROCm:main Nov 13, 2025
111 of 113 checks passed
@github-project-automation github-project-automation Bot moved this from TODO to Done in TheRock Triage Nov 13, 2025
@dezhiAmd dezhiAmd deleted the new_matrix branch November 13, 2025 22:16
rponnuru5 pushed a commit that referenced this pull request Dec 9, 2025
…2123)

Fix PR builds to incorrectly use nightly configurations.

Signed-off-by: Liao <dezhliao@amd.com>
Signed-off-by: dezhliao <dezhliao@amd.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants