Skip to content

[https://nvbugs/6390307][fix] Update trtllm-gen FMHA JIT libraries - #15974

Merged
bobboli merged 1 commit into
NVIDIA:mainfrom
bobboli:fix/update-trtllm-gen-fmha-libs
Jul 9, 2026
Merged

[https://nvbugs/6390307][fix] Update trtllm-gen FMHA JIT libraries#15974
bobboli merged 1 commit into
NVIDIA:mainfrom
bobboli:fix/update-trtllm-gen-fmha-libs

Conversation

@bobboli

@bobboli bobboli commented Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Description

Refresh the x86_64 and aarch64 FMHA JIT static libraries from the matching FMHA source snapshot.

  • Force numInstsKv=2 for skip-softmax generation kernels.
  • Preserve sm_103a in multi-instance NVRTC linking.
  • Synchronize FmhaAutoTuner.h, FmhaOptions.h, and KernelTraits.h with the libraries.
  • Keep all other exported headers and existing cubins unchanged.
  • Remove the related NVBug 6388157 and 6390307 test waivers.

Addresses https://nvbugs/6390307 and https://nvbugs/6428176

Test Coverage

  • CUDA 13.0 x86_64 and aarch64 FMHA public-library builds passed.
  • tekit:latest Release build_wheel_targets passed.
  • B300 4-GPU skip-softmax integration tests passed for BF16 and FP8 KV configurations.
  • 8/8 native B300 Blackwell Ultra FMHA tests passed.

PR Checklist

  • Please check this after reviewing the checklist in the PR template as appropriate for this PR.

@bobboli
bobboli requested review from PerkzZheng and Tom-Zheng July 6, 2026 10:12
@bobboli bobboli changed the title [TRTLLM-12988][fix] Update trtllm-gen FMHA JIT libraries [https://nvbugs/6390307][fix] Update trtllm-gen FMHA JIT libraries Jul 6, 2026
@bobboli
bobboli force-pushed the fix/update-trtllm-gen-fmha-libs branch 3 times, most recently from 1dd1179 to 83709cc Compare July 7, 2026 08:20
@bobboli
bobboli marked this pull request as ready for review July 7, 2026 08:24
@bobboli

bobboli commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

/bot run --post-merge --disable-fail-fast

@bobboli
bobboli enabled auto-merge (squash) July 7, 2026 08:26
@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR modifies a diagnostic check in KernelTraits.h to suppress an informational hint for generation kernels that skip softmax, updates the corresponding prebuilt trtllmGen library binaries (aarch64 and x86_64) via Git LFS pointers, and removes now-obsolete test waivers for the related skip-softmax attention test.

Changes

Skip-softmax attention fix

Layer / File(s) Summary
Suppress diagnostic hint for skip-softmax generation kernels
cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/trtllmGen_fmha_export/KernelTraits.h
Adds isGenerationSkipsSoftmax check to conditionally bypass the TLLM_CHECK_INFO hint when generation kernels skip softmax when possible.
Updated prebuilt kernel libraries
cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/{aarch64,x86_64}-linux-gnu/libTrtLlmGen*.a
Git LFS pointers (oid/size) updated for four static library artifacts to reflect rebuilt binaries.
Removed obsolete test waivers
tests/integration/test_lists/waives.txt
Removed four SKIP waiver entries for test_skip_softmax_attention_4gpus across sparsity/fp8kv configurations, including DGX_B200-specific entries.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: QiJune, fredricz-20070104, Tabrizian

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title is concise, specific, and matches the main change: refreshing trtllm-gen FMHA JIT libraries.
Description check ✅ Passed The description covers the change, the rationale, and relevant test coverage, with the required sections present.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick comments (1)
cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/trtllmGen_fmha_export/KernelTraits.h (1)

182-184: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Declare the local as const.

isGenerationSkipsSoftmax is never reassigned after initialization.

♻️ Proposed fix
-      bool isGenerationSkipsSoftmax =
+      bool const isGenerationSkipsSoftmax =
           options.mSkipsSoftmaxWhenPossible && !isContextKernel(options.mFmhaKernelType);

As per coding guidelines, "A variable that is not modified after its initialization should be declared as const" and should use east-const style (int const x).

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/trtllmGen_fmha_export/KernelTraits.h`
around lines 182 - 184, The local flag in KernelTraits::isGenerationSkipsSoftmax
is only initialized and never reassigned, so declare it as const using
east-const style. Update the declaration in the generation-kernel softmax check
to use a const local while keeping the existing condition logic unchanged.

Source: Coding guidelines

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In
`@cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/trtllmGen_fmha_export/KernelTraits.h`:
- Around line 182-184: The local flag in KernelTraits::isGenerationSkipsSoftmax
is only initialized and never reassigned, so declare it as const using
east-const style. Update the declaration in the generation-kernel softmax check
to use a const local while keeping the existing condition logic unchanged.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 38e1df50-b447-424f-af3e-089cc7c7c45e

📥 Commits

Reviewing files that changed from the base of the PR and between 0b0fd54 and 83709cc.

📒 Files selected for processing (6)
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/aarch64-linux-gnu/libTrtLlmGen.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/aarch64-linux-gnu/libTrtLlmGenFmhaLib.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/x86_64-linux-gnu/libTrtLlmGen.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/x86_64-linux-gnu/libTrtLlmGenFmhaLib.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/trtllmGen_fmha_export/KernelTraits.h
  • tests/integration/test_lists/waives.txt
💤 Files with no reviewable changes (1)
  • tests/integration/test_lists/waives.txt

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #57976 [ run ] triggered by Bot. Commit: 83709cc Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #57976 [ run ] completed with state FAILURE. Commit: 83709cc
/LLM/main/L0_MergeRequest_PR pipeline #46650 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@bobboli
bobboli force-pushed the fix/update-trtllm-gen-fmha-libs branch 2 times, most recently from 7cec8b7 to 944a450 Compare July 8, 2026 14:40
@bobboli

bobboli commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

/bot run --post-merge --disable-fail-fast

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58250 [ run ] triggered by Bot. Commit: 944a450 Link to invocation

@bobboli

bobboli commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

/bot kill

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58251 [ kill ] triggered by Bot. Commit: 944a450 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58250 [ run ] completed with state ABORTED. Commit: 944a450

Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58251 [ kill ] completed with state SUCCESS. Commit: 944a450
Successfully killed previous jobs for commit 944a450

Link to invocation

Refresh x86_64 and aarch64 FMHA JIT libraries for skip-softmax
generation and sm_103a NVRTC linking.

Synchronize FmhaAutoTuner, FmhaOptions, and KernelTraits with the
matching FMHA snapshot. Retain all other exported headers and cubins.

Remove the related test waivers.

Refs NVBug 6388157
Refs NVBug 6390307
Refs TRTLLM-12988
Refs TRTLLM-12990

Signed-off-by: Bo Li <22713281+bobboli@users.noreply.github.com>
@bobboli
bobboli force-pushed the fix/update-trtllm-gen-fmha-libs branch from 944a450 to 501d7cd Compare July 8, 2026 15:11
@bobboli

bobboli commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

/bot run --post-merge --disable-fail-fast

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58257 [ run ] triggered by Bot. Commit: 501d7cd Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58257 [ run ] completed with state FAILURE. Commit: 501d7cd
/LLM/main/L0_MergeRequest_PR pipeline #46897 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@bobboli

bobboli commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator Author

/bot run --reuse-test

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58388 [ run ] triggered by Bot. Commit: 501d7cd Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58388 [ run ] completed with state SUCCESS. Commit: 501d7cd
/LLM/main/L0_MergeRequest_PR pipeline #47014 completed with status: 'FAILURE'

CI Report

⚠️ Action Required:

  • Please check the failed tests and fix your PR
  • If you cannot view the failures, ask the CI triggerer to share details
  • Once fixed, request an NVIDIA team member to trigger CI again

CI Agent Failure Analysis

Link to invocation

@bobboli

bobboli commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator Author

/bot run --reuse-test

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58455 [ run ] triggered by Bot. Commit: 501d7cd Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #58455 [ run ] completed with state SUCCESS. Commit: 501d7cd
/LLM/main/L0_MergeRequest_PR pipeline #47067 completed with status: 'SUCCESS'

CI Report

Link to invocation

@bobboli
bobboli merged commit 6e3c3bf into NVIDIA:main Jul 9, 2026
13 checks passed
@github-actions

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown

LFS objects already in storage (4 files) — no sync needed.

These LFS-tracked files are already present in this repository's LFS storage:

  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/aarch64-linux-gnu/libTrtLlmGen.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/aarch64-linux-gnu/libTrtLlmGenFmhaLib.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/x86_64-linux-gnu/libTrtLlmGen.a
  • cpp/tensorrt_llm/kernels/trtllmGenKernels/fmha/lib/x86_64-linux-gnu/libTrtLlmGenFmhaLib.a

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.

3 participants