Skip to content

[https://nvbugs/5829830][fix] Declare the var in the correct scope - #11066

Merged
ziyixiong-nv merged 1 commit into
NVIDIA:release/1.2from
ziyixiong-nv:dev-fxiong-bug5829830
Jan 30, 2026
Merged

[https://nvbugs/5829830][fix] Declare the var in the correct scope#11066
ziyixiong-nv merged 1 commit into
NVIDIA:release/1.2from
ziyixiong-nv:dev-fxiong-bug5829830

Conversation

@ziyixiong-nv

@ziyixiong-nv ziyixiong-nv commented Jan 28, 2026

Copy link
Copy Markdown
Collaborator

Summary by CodeRabbit

  • Refactor
    • Optimized memory synchronization and buffer management in compute kernel execution paths for improved efficiency.

✏️ Tip: You can customize this high-level summary in your review settings.

Description

The change is required because of https://github.com/NVIDIA/TensorRT-LLM/blob/main/cpp/kernels/xqa/mha_sm90.cu#L1419 .

Test Coverage

PR Checklist

Please review the following before submitting your PR:

  • PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.

  • PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.

  • Test cases are provided for new code paths (see test instructions)

  • Any new dependencies have been scanned for license and vulnerabilities

  • CODEOWNERS updated if ownership changes

  • Documentation updated as needed

  • Update tava architecture diagram if there is a significant design change in PR.

  • The reviewers assigned automatically/manually are appropriate for the PR.

  • Please check this after reviewing the above items as appropriate for this PR.

GitHub Bot Help

/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...

Provide a user friendly way for developers to interact with a Jenkins server.

Run /bot [-h|--help] to print this help message.

See details below for each supported subcommand.

Details

run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental)]

Launch build/test pipelines. All previously running jobs will be killed.

--reuse-test (optional)pipeline-id (OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.

--disable-reuse-test (OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.

--disable-fail-fast (OPTIONAL) : Disable fail fast on build/tests/infra failures.

--skip-test (OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.

--stage-list "A10-PyTorch-1, xxx" (OPTIONAL) : Only run the specified test stages. Examples: "A10-PyTorch-1, xxx". Note: Does NOT update GitHub check status.

--gpu-type "A30, H100_PCIe" (OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.

--test-backend "pytorch, cpp" (OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.

--only-multi-gpu-test (OPTIONAL) : Only run the multi-GPU tests. Note: Does NOT update GitHub check status.

--disable-multi-gpu-test (OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.

--add-multi-gpu-test (OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline.

--post-merge (OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.

--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" (OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".

--detailed-log (OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.

--debug (OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in the stage-list parameter to access the appropriate container environment. Note: Does NOT update GitHub check status.

For guidance on mapping tests to stage names, see docs/source/reference/ci-overview.md
and the scripts/test_to_stage_mapping.py helper.

kill

kill

Kill all running builds associated with pull request.

skip

skip --comment COMMENT

Skip testing for latest commit on pull request. --comment "Reason for skipping build/test" is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

reuse-pipeline

reuse-pipeline

Reuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.

@ziyixiong-nv

Copy link
Copy Markdown
Collaborator Author

/bot run

@coderabbitai

coderabbitai Bot commented Jan 28, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

Modified conditional compilation logic in the MHA CUDA kernel to conditionally include VT (vital V) buffers and synchronization barriers when SWAP_AB is not defined, while removing their usage from the XVGemm path in non-SWAP_AB branches to align synchronization strategies.

Changes

Cohort / File(s) Summary
MHA kernel synchronization refactoring
cpp/kernels/xqa/mha_sm90.cu
Added conditional guards (#if !SWAP_AB) around VT buffer and barrier declarations (vtBar, vtBuf) to control their inclusion based on compilation flags. Removed corresponding VT-related barrier/buffer usage from XVGemm execution paths in non-SWAP_AB branch to maintain coherent synchronization strategy across conditional pathways.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 1 | ❌ 2
❌ Failed checks (2 warnings)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Description check ⚠️ Warning PR description is incomplete with missing key information sections. Add a clear explanation of the issue and solution in the Description section, and list the test cases that validate these changes in the Test Coverage section.
✅ Passed checks (1 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main fix: moving variable declarations to the correct scope, which aligns with the code changes that conditionally declare VT buffers and barriers based on preprocessor definitions.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Tip

🧪 Unit Test Generation v2 is now available!

We have significantly improved our unit test generation capabilities.

To enable: Add this to your .coderabbit.yaml configuration:

reviews:
  finishing_touches:
    unit_tests:
      enabled: true

Try it out by using the @coderabbitai generate unit tests command on your code files or under ✨ Finishing Touches on the walkthrough!

Have feedback? Share your thoughts on our Discord thread!


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #33881 [ run ] triggered by Bot. Commit: 16ef556

@mikeiovine mikeiovine left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Do any tests need to be unwaived? Also, I think we need to merge the fix to release/1.2

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #33881 [ run ] completed with state SUCCESS. Commit: 16ef556
/LLM/main/L0_MergeRequest_PR pipeline #26127 completed with status: 'FAILURE'

⚠️ 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

@ziyixiong-nv
ziyixiong-nv force-pushed the dev-fxiong-bug5829830 branch from 16ef556 to e8c293d Compare January 29, 2026 01:30
@ziyixiong-nv
ziyixiong-nv requested a review from a team January 29, 2026 01:30
@ziyixiong-nv
ziyixiong-nv requested review from a team as code owners January 29, 2026 01:30
@ziyixiong-nv

Copy link
Copy Markdown
Collaborator Author

Do any tests need to be unwaived? Also, I think we need to merge the fix to release/1.2

Retargeted it to release/1.2. The test is not in waive list, so we don't need to unwaive anything.

@ziyixiong-nv

Copy link
Copy Markdown
Collaborator Author

/bot run

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #33938 [ run ] triggered by Bot. Commit: e8c293d

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #33938 [ run ] completed with state SUCCESS. Commit: e8c293d
/LLM/release-1.2/L0_MergeRequest_PR pipeline #262 completed with status: 'SUCCESS'

@ziyixiong-nv
ziyixiong-nv enabled auto-merge (squash) January 29, 2026 07:56
@ziyixiong-nv
ziyixiong-nv disabled auto-merge January 30, 2026 00:08
@ziyixiong-nv
ziyixiong-nv enabled auto-merge (squash) January 30, 2026 00:10
@ziyixiong-nv
ziyixiong-nv disabled auto-merge January 30, 2026 00:12
Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
@ziyixiong-nv
ziyixiong-nv force-pushed the dev-fxiong-bug5829830 branch from e8c293d to b078e62 Compare January 30, 2026 00:14
@ziyixiong-nv

Copy link
Copy Markdown
Collaborator Author

/bot run --reuse-pipeline

@ziyixiong-nv
ziyixiong-nv enabled auto-merge (squash) January 30, 2026 00:15
@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #34139 Bot args parsing error: usage: /bot [-h]
{run,kill,skip,submit,reviewers,reuse-pipeline,reuse-review} ...
/bot: error: unrecognized arguments: --reuse-pipeline

@ziyixiong-nv

Copy link
Copy Markdown
Collaborator Author

/bot reuse-pipeline

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #34145 [ reuse-pipeline ] triggered by Bot. Commit: b078e62

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #34145 [ reuse-pipeline ] completed with state SUCCESS. Commit: b078e62
Reusing PR_Github #33938 for commit b078e62

@ziyixiong-nv
ziyixiong-nv merged commit 8e3d1be into NVIDIA:release/1.2 Jan 30, 2026
5 checks passed
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Feb 13, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Feb 13, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Feb 13, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Feb 13, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
dominicshanshan pushed a commit to dominicshanshan/TensorRT-LLM that referenced this pull request Feb 13, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
chzblych pushed a commit that referenced this pull request Feb 15, 2026
…11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
peihu-nv pushed a commit to peihu-nv/TensorRT-LLM that referenced this pull request Feb 19, 2026
…VIDIA#11066)

Signed-off-by: ziyixiong-nv <219238287+ziyixiong-nv@users.noreply.github.com>
Signed-off-by: Wangshanshan <30051912+dominicshanshan@users.noreply.github.com>
Signed-off-by: peihu-nv <259410613+peihu-nv@users.noreply.github.com>
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.

4 participants