Skip to content

[ROCm] Merge upstream→gfx11 - #1347

Merged
eble-amd merged 240 commits into
gfx11from
eble.merge-from-upstream
Oct 6, 2026
Merged

eble-amd merged 240 commits into
gfx11from
eble.merge-from-upstream

Conversation

@eble-amd

@eble-amd eble-amd commented Oct 6, 2026 •

Copy link
Copy Markdown

Purpose

Merge b131311 from upstream to gfx11 in stages. Conflict resolution is recorded in my merge commits.

Test Plan & Result (agentic)

Run date: 2026-10-06, Strix Halo (gfx1151). ROCm/torch/Triton rocm10.2.0a20261006 on both sides.

  • A (baseline): 34a622ef5b1b (gfx11 after PR Merge KV cache refactor from upstream #1344)
  • B (candidate): 313fad5a83ee, merges of upstream 7156c63bef, 31739ceb0b, f79a2f5582,
    7c877062ac, b131311fb4
  • Same board, back-to-back, one run per case per side.

Verdict

5/5 PASS on both sides. All TTFT and decode deltas are within ±2.2%, i.e. run-to-run noise.
Input/output token counts and spec-decode acceptance are identical except one row (see notes).
Nothing in this set flags the merge.

A/B comparison (B relative to A)

case status A TTFT ms B TTFT ms Δ% A dec tok/s B dec tok/s Δ% accept. len A / B runner A → B
Qwen3.6-35B-A3B-W4A16-llmcompressor_VLM_4ksys_1k_320x240_100out_dyn-lm-int8g32 PASS 508.5 508.2 -0.1 80.44 80.33 -0.1 – V1 → V2
Qwen3.6-35B-A3B-W4A16-llmcompressor-mtpfix_VLM_dyn-lm-int8g32_MTP-mmstar PASS 221.0 216.2 -2.2 99.33 99.33 0.0 1.85 / 1.85 V1 → V2
Qwen3-30B-A3B-Instruct-2507-AWQ-4bit_specdec-eagle3-aime PASS 221.8 221.9 0.0 70.52 71.05 +0.8 2.59 / 2.59 V1 → V2
Gemma-4-E4B-IT_VLM_AWQ-INT4_DFlare-B16-K15_RoboVQA PASS 303.6 305.0 +0.5 166.32 166.14 -0.1 6.91 / 6.91 V2 → V2
Gemma-4-31B-IT_VLM_OpenNav_AWQ-4bit_MTP-mmstar PASS 1220.0 1220.0 0.0 27.57 27.49 -0.3 2.90 / 2.90 V2 → V2

Built-in sanity checks (1+1 / image colour) passed on both sides for every row except DFlare,
which skips them by config; DFlare instead requires spec-decode acceptance length ≥ 5.0, which
passed.

Notes

  • Cases: chosen for the merged changes most likely to reach gfx1151: upstream [Model Runner V2] Use MRV2 for all models by default vllm-project/vllm#53183
    makes Model Runner V2 the default for MoE/hybrid models (three rows switch V1 → V2), plus
    spec-decode changes (MTP, eagle3, DFlare) and multimodal processing refactors.
  • Qwen3.6 MTP-mmstar output tokens 1280 (A) vs 1267 (B). A build of the same source as A
    produced 1267 in an earlier run, so this is run-to-run variation, not the merge.

Essential Elements of an Effective PR Description Checklist
  • The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
  • The test plan, such as providing test command.
  • The test results, such as pasting the results comparison before and after, or e2e results
  • (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.
  • (Optional) Release notes update. If your change is user facing, please update the release notes draft in the Google Doc.

stefankoncarevic and others added 30 commits August 22, 2026 01:26
Signed-off-by: Stefan Koncarevic <Stefan.Koncarevic@amd.com>
…-experts KV group (vllm-project#53240)

Signed-off-by: Hollow Man <hollowman@opensuse.org>
…ing (vllm-project#53327)

Signed-off-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…t of the shared runner (vllm-project#53176)

Signed-off-by: Tianyu Guo <guoty@inferact.ai>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
)

Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…53213)

Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…project#50272)

Signed-off-by: jens.luecke <jens.luecke@liquid.ai>
Co-authored-by: Tonoken3 <sakamakismile@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…h.profiler traces (vllm-project#53182)

Signed-off-by: Rohan138 <rohanpotdar138@gmail.com>
Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
… 9%~25% TTFT improvement (vllm-project#52789)

Signed-off-by: yewentao256 <zhyanwentao@126.com>
Signed-off-by: Ziming Huang <zelda.huanghuang@gmail.com>
Signed-off-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
Co-authored-by: Ziming Huang <zelda.huanghuang@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…aders (vllm-project#50723)

Signed-off-by: Shuolei Wang <shuoleiwang123@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Signed-off-by: Zhou248 <630563665@qq.com>
…ject#52557)

Signed-off-by: Brian Woods <me@brian.biz>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Signed-off-by: Andreas Karatzas <Andreas.Karatzas@amd.com>
…ze overrides (vllm-project#52874)

Signed-off-by: Anmol Gupta <14880251+anmolgupt@users.noreply.github.com>
…llm-project#53372)

Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk>
Co-authored-by: Qwen Code <noreply@alibaba-inc.com>
…t#53358)

Signed-off-by: Kevin Luu <51931015+khluu@users.noreply.github.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: Wyett <wyettzeng@gmail.com>
Signed-off-by: wyett <wyettzeng@gmail.com>
…llm-project#53432)

Signed-off-by: Jensen Chen <a1043904820@gmail.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ject#52467)

Signed-off-by: frank-suwen <suwenw2@outlook.com>
Co-authored-by: Codex <noreply@openai.com>
Signed-off-by: Daniel Serebrenik <daserebrenik@nvidia.com>
…project#51034)

Signed-off-by: fuzzifikation <40043768+fuzzifikation@users.noreply.github.com>
zyongye and others added 19 commits August 28, 2026 10:45
…ect#54168)

Signed-off-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
…make w4a4 use the preshuffle triton+asm by default (vllm-project#53141)

Signed-off-by: Andy Friedrich <afriedri@amd.com>
Signed-off-by: afriedri <afriedri@amd.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
…-project#50969)

Signed-off-by: aoshen02 <aoshen02@users.noreply.github.com>
Signed-off-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: aoshen02 <aoshen02@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Co-authored-by: Andreas Karatzas <akaratza@amd.com>
…llm-project#53409)

Signed-off-by: Anni <dranox2222@gmail.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Signed-off-by: reidliu41 <reid201711@gmail.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
…ect#54079)

Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com>
…init (vllm-project#54247)

Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Kimi Code <noreply@moonshot.ai>
…m-project#54246)

Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Kimi Code <noreply@moonshot.ai>
…en no sync loads are scheduled (vllm-project#53333)

Signed-off-by: Summer Yang <girasoleyang@gmail.com>
Signed-off-by: Nick Hill <nickhill123@gmail.com>
Co-authored-by: Nick Hill <nickhill123@gmail.com>
…vllm-project#54152)

Signed-off-by: Oxana Korzh <okorzh@amd.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Douglas Lehr <91553416+dllehr-amd@users.noreply.github.com>
Signed-off-by: charlifu <charlifu@amd.com>
…54239)

Signed-off-by: Shinichi Hemmi <shemmi@preferred.jp>
File conflicts were mostly resolved automatically in meld.  There was
one easy manual resolution to cope with gfx11's added profiler scopes.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
There was a simple manual conflict resolution in
.github/workflows/pre-commit.yml where upstream changed a section that
gfx11 deleted.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
A conflict in vllm/transformers_utils/configs/speculators/algos.py was
just unrelated additions from both sides in the same spot.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
The conflict in vllm/model_executor/layers/utils.py was just both sides
adding imports in the same place.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
@eble-amd eble-amd changed the title Merge upstream→gfx11 [ROCm] Merge upstream→gfx11 Oct 6, 2026
Signed-off-by: Dan Eble <Dan.Eble@amd.com>
@eble-amd
eble-amd merged commit 3f2a71e into gfx11 Oct 6, 2026
8 checks passed
@eble-amd
eble-amd deleted the eble.merge-from-upstream branch October 6, 2026 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.