Skip to content

Merge upstream→gfx11 - #1381

Merged
eble-amd merged 382 commits into
gfx11from
eble.merge-from-upstream
Oct 19, 2026
Merged

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

Conversation

@eble-amd

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

Copy link
Copy Markdown

Purpose

Merge 9b2f34c from upstream to gfx11 in stages determined by conflicts. My individual commits have brief notes on conflict resolution which are gathered here (and lightly edited) for convenience.

  1. from dc2e8f1 ([ROCm][Perf] W4A16: keep skinny GEMM zero-points packed 4-bit vllm-project/vllm#54965)
    Since this work originated here, we're leaving the local branch as it is and just recording a merge.
  2. from ceaa9f9
    Conflict resolution: Before, gfx11 had "dflare" in the list of supported methods. Now, it is absent from the list of unsupported methods.
  3. from 8c1557a
    Ruff formatting configuration changed upstream.
    • for conflicting hunks, kept gfx11 side and then ran pre-commit
    • hand-edited a benchmark script to copy a function parameter description from one function to related functions
  4. from d7e755c
    Choose the upstream versioning changes over gfx11's 8ef3e3c. Also revert the portion of the earlier 6742a6b which 8ef3e3c says didn't suffice.

Validation (agentic)

Base edd1baf (gfx11); PR 0e01145 (upstream through 9b2f34c). Radeon 8060S (gfx1151), ROCm 10.2.0a20261015, torch 2.13.0, Triton 3.8.0. Online serving, batch size 1; base and PR runs alternated in one session. Medians over runs.

Case Runs base/PR TTFT ms base TTFT ms PR Δ TPOT ms base TPOT ms PR Δ Acceptance length base Acceptance length PR
Qwen3.6-35B-A3B W4A16, 4k prefix + 1k text + image 4/3 502.5 503.5 +0.2% 12.30 12.23 -0.5% — —
Qwen3.6-35B-A3B W4A16 MTP, MMStar 5/4 199.9 198.1 -0.9% 9.96 10.01 +0.5% 1.849 1.846
Qwen3-30B-A3B AWQ EAGLE3, AIME 2/2 220.2 221.1 +0.4% 13.98 13.98 0.0% 2.594 2.594
Gemma-4-31B-IT AWQ MTP, MMStar 2/2 1228.0 1233.0 +0.4% 36.06 36.10 +0.1% 2.932 2.932
Gemma-4-E4B-IT AWQ DFlare, RoboVQA 2/2 307.3 307.6 +0.1% 6.00 6.01 +0.2% 6.909 6.909
Qwen3-VL-4B-Instruct AWQ, image 2/2 675.7 676.0 0.0% 14.19 14.15 -0.3% — —

Server-reported input and output token counts are identical between base and PR in every case.

No regression was found in the tested cases.

Excluded: one run of the PR version in which both Qwen3.6 cases had TTFT 10-14% higher (every request, not just the tail) with unchanged TPOT. The other cases in that run, and all other PR runs of both Qwen3.6 cases, match base.


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.

shaohuaxi and others added 30 commits September 16, 2026 14:07
…em (vllm-project#56988)

Signed-off-by: 子华 <huaxi.shx@alibaba-inc.com>
Co-authored-by: Codex <noreply@openai.com>
…project#54014)

Signed-off-by: Alex <jihui.huang@daocloud.io>
Signed-off-by: AlexHuang <alex.tech.lab@outlook.com>
Signed-off-by: Alex <alex.tech.lab@outlook.com>
Co-authored-by: OpenAI Codex <codex@openai.com>
Co-authored-by: Itay Etelis <92247226+Etelis@users.noreply.github.com>
Signed-off-by: freyfwt <110148731+freyfwt@users.noreply.github.com>
Signed-off-by: freyfwt <freytian1996@gmail.com>
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Jiangyun Zhu <riverclouds.zhu@qq.com>
…request admission (vllm-project#57050)

Signed-off-by: Wei Zhao <51183510+wzhao18@users.noreply.github.com>
vllm-project#55991)

Signed-off-by: Zheng Gong <zgong@amd.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: TJian <tunjian.tan@embeddedllm.com>
…ct#51787)

Signed-off-by: mindungil <alswnsrlf12@naver.com>
Co-authored-by: Or Ozeri <oro@il.ibm.com>
…on CPU (vllm-project#56985)

Signed-off-by: jiang1.li <jiang1.li@intel.com>
…m-project#56527) (vllm-project#56576)

Signed-off-by: amasen02 <amasen02@users.noreply.github.com>
Co-authored-by: amasen02 <amasen02@users.noreply.github.com>
…oundary tokens (vllm-project#56635)

Signed-off-by: DEV TYAGI <devtyagi3909@gmail.com>
…revent log suppression (vllm-project#51366)

Signed-off-by: wenjinhust <wenjin.sh@huawei.com>
…lm-project#56538)

Co-authored-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Signed-off-by: Julien Darve <jdarve@NVIDIA.com>
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
…0s (vllm-project#56912)

Signed-off-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: Kunshang Ji <kunshang.ji@intel.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
…ject#56568)

Signed-off-by: Canlin <canlinguosdu@gmail.com>
Co-authored-by: Codex <noreply@openai.com>
…llm-project#54923)

Signed-off-by: R <Ganesh.R@amd.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Signed-off-by: shaolila <shaolila@buaa.edu.cn>
Co-authored-by: shaolila <shaolila@buaa.edu.cn>
…ache (vllm-project#56935)

Signed-off-by: Yongye Zhu <yongye@inferact.ai>
Signed-off-by: 云挚 <ningyunxiao.nyx@antgroup.com>
Signed-off-by: Yongye Zhu <zyy1102000@gmail.com>
Co-authored-by: Yongye Zhu <yongye@inferact.ai>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yunxiao Ning <73625538+foraxe@users.noreply.github.com>
Co-authored-by: AI Assistant <noreply@openai.com>
…t#48599)

Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…llm-project#56034)

Signed-off-by: Harshit Kedia <harshit@sarvam.ai>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…llm-project#52370)

Signed-off-by: Vineeth Sai <vineethsai4444@gmail.com>
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
…llm-project#57140)

Signed-off-by: Arpan Tripathi <tripathiarpan20@gmail.com>
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: Xavier Lyu <9938360+xavierlyu@users.noreply.github.com>
Co-authored-by: Bohdan Podziubanchuk <114604629+Danbog32@users.noreply.github.com>
Co-authored-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: Codex <noreply@openai.com>
…vllm-project#51483)

Signed-off-by: Oleksandr Zakharchuk <oleksandr.zakharchuk@gmail.com>
Signed-off-by: zjy0516 <riverclouds.zhu@qq.com>
Co-authored-by: zjy0516 <riverclouds.zhu@qq.com>
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ect#53555)

Signed-off-by: linitra24 <Joy25810@foxmail.com>
Signed-off-by: linitra24 <renshuang.zhou@daocloud.io>
Co-authored-by: Jee Jee Li <pandaleefree@gmail.com>
…7148)

Signed-off-by: linitra24 <renshuang.zhou@daocloud.io>
…t#54016)

Signed-off-by: LopezCastroRoberto <robertol.c510@gmail.com>
Co-authored-by: Lucas Wilkinson <lwilkins@redhat.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…t#55557)

Signed-off-by: Andrea Semeraro <andrea.semeraro@sezione1.it>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Jiangyun Zhu <riverclouds.zhu@qq.com>
JaredforReal and others added 14 commits September 20, 2026 18:15
…er stride in the NVIDIA prefill seed kernel (vllm-project#57477)

Signed-off-by: Jared Wen <w13431838023@gmail.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…llm-project#57534)

Signed-off-by: Jared Wen <jaredwen@inferact.ai>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…load (GLM-5.3-Flash kpool tail and QSA) (vllm-project#56810)

Signed-off-by: Jared Wen <jaredwen@inferact.ai>
Signed-off-by: Jared Wen <w13431838023@gmail.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Zhewen Li <zhewenli@inferact.ai>
…dexerTopk dispatcher (vllm-project#57546)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
…lm-project#43310)

Signed-off-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: aoshen02 <aoshen@inferact.ai>
Co-authored-by: Codex <codex@openai.com>
…ject#57784)

Signed-off-by: Zyann7 <62597503+Zyann7@users.noreply.github.com>
Co-authored-by: Abatom <182586866+Abatom@users.noreply.github.com>
Since this work originated here, we're leaving the local branch as it is
and just recording a merge.

    commit dc2e8f1
    Author: Matthias Gehre
    Date:   Mon Sep 14 11:40:25 2026 +0200

    [ROCm][Perf] W4A16: keep skinny GEMM zero-points packed 4-bit (vllm-project#54965)

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Conflict resolution: Before, gfx11 had "dflare" in the list of
_supported_ methods.  Now, it is absent from the list of _unsupported_
methods.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Ruff formatting configuration changed upstream.  Conflict resolution:

* kept gfx11 side and then ran pre-commit
* hand-edited a benchmark script to copy a function parameter
  description from one function to related functions

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
Conflict resolution: Choose the upstream versioning changes over gfx11's
8ef3e3c.  Also revert the portion of
the earlier 6742a6b which
8ef3e3c says didn't suffice.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
@eble-amd

Copy link
Copy Markdown
Author

There's a dependency issue in the build. I don't know why I didn't hit that in my own builds, but I'll mark this PR as a draft while I investigate.

@eble-amd
eble-amd marked this pull request as draft October 16, 2026 13:32
@eble-amd

Copy link
Copy Markdown
Author

There's a dependency issue in the build. I don't know why I didn't hit that in my own builds, but I'll mark this PR as a draft while I investigate.

I reproduced this when I tried to build just now. This didn't happen yesterday. I'm continuing to investigate.

Resolved conflicts in
tests/kernels/attention/test_rocm_rdna_singleseq_hip.py by taking the
gfx11 version.  The conflicts appeared to arise from reformatting
comment strings in the merge branch.

Signed-off-by: Dan Eble <Dan.Eble@amd.com>
@eble-amd
eble-amd force-pushed the eble.merge-from-upstream branch from 38510d2 to e48ada2 Compare October 19, 2026 13:38
@eble-amd
eble-amd marked this pull request as ready for review October 19, 2026 13:49
@eble-amd

Copy link
Copy Markdown
Author

There's a dependency issue in the build. I don't know why I didn't hit that in my own builds, but I'll mark this PR as a draft while I investigate.

I reproduced this when I tried to build just now. This didn't happen yesterday. I'm continuing to investigate.

#1382 fixed that.

Our gfx11 branch has advanced since I first tested this merge. I have merged those changes into this PR. The conflicts arose from changes in comment formatting, so I propose to try to save time by not repeating A/B testing with a new baseline. It's important to press forward with updating gfx11 to catch up with upstream main.

@eble-amd

Copy link
Copy Markdown
Author

The kernel correctness tests have been waiting more than an hour for a runner. I have run them in my local workspace.

Command:

python -m pytest -v tests/kernels/moe/test_hybrid_w4a16_moe.py tests/kernels/quantization/test_hybrid_w4a16_triton.py tests/kernels/quantization/test_rdna_hybrid_w4a16.py tests/kernels/quantization/test_rocm_compressed_tensors_w4a16.py tests/kernels/quantization/test_rocm_skinny_gemms.py tests/kernels/quantization/test_dynamic_int8_lm_head.py tests/kernels/test_wvsplitk_fused_silu.py tests/models/multimodal/processing/test_openvla.py

Output (tail):

======================================= warnings summary =======================================
.venv/lib/python3.12/site-packages/torch/jit/_script.py:365: 14 warnings
  /scratch/eble/vllm/.venv/lib/python3.12/site-packages/torch/jit/_script.py:365: DeprecationWarning: `torch.jit.script_method` is deprecated. Please switch to `torch.compile` or `torch.export`.
    warnings.warn(

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
================== 562 passed, 2492 skipped, 14 warnings in 289.88s (0:04:49) ==================

@eble-amd
eble-amd merged commit 38e70e9 into gfx11 Oct 19, 2026
12 of 13 checks passed
@eble-amd
eble-amd deleted the eble.merge-from-upstream branch October 19, 2026 14:56
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.