Skip to content

Enable cuDNN SDPA for contrib Attention#29717

Open
mastryukov1990 wants to merge 3 commits into
microsoft:mainfrom
mastryukov1990:codex/attention-cudnn-padding-mask
Open

Enable cuDNN SDPA for contrib Attention#29717
mastryukov1990 wants to merge 3 commits into
microsoft:mainfrom
mastryukov1990:codex/attention-cudnn-padding-mask

Conversation

@mastryukov1990

Copy link
Copy Markdown

Description

Enable the existing cuDNN SDPA runner for the CUDA implementation of the contrib Attention operator when:

  • the input type is FP16 or BF16;
  • the mask is absent or is a compact 1D key sequence-length mask;
  • past/present KV cache inputs are not used; and
  • cuDNN reports support for the concrete attention shape.

On Hopper and newer GPUs, cuDNN SDPA is auto-preferred consistently with MultiHeadAttention. Explicit kernel selection continues to be respected. Raw attention masks and cache paths remain on their existing kernels.

The new test forces cuDNN SDPA and uses a partial sequence-length mask, verifying that the masked key/value token is excluded from both output positions.

Motivation and Context

Transformer optimizer fusions can produce com.microsoft::Attention nodes with compact sequence-length masks. Although cuDNN SDPA was enabled for MultiHeadAttention and GroupQueryAttention in #28849, the legacy fused Attention path did not dispatch to the shared cuDNN runner. On an H100, all 24 attention nodes in a BGE encoder consequently selected the math kernel.

This change reuses the existing cuDNN implementation and eligibility checks rather than adding another attention kernel.

Performance

Exact A/B comparison using the same patched build of current main, with cuDNN auto-dispatch disabled for the baseline via ORT_ENABLE_CUDNN_FLASH_ATTENTION=0:

Batch × sequence Baseline rows/s cuDNN SDPA rows/s Speedup
65 × 696 156.80 546.11 3.48×
12 × 1600 50.50 209.29 4.14×
12 × 3072 20.03 93.43 4.67×

Environment: NVIDIA H100 (SM90), CUDA 12.8, cuDNN frontend 1.24, FP16 BGE encoder with right-padded batches. Debug dispatch confirmed CUDNN_FLASH_ATTENTION for 24/24 fused Attention nodes.

Numerical comparison against the same build with cuDNN disabled, over sampled embeddings:

  • maximum absolute difference: 0.001465;
  • minimum cosine similarity: 0.999955.

Validation

  • Full CUDA build completed successfully.
  • ContribOpAttentionTest.CudnnFlashAttentionWithKeySequenceLengthMask: passed and reported SdpaKernel=CUDNN_FLASH_ATTENTION.
  • ContribOpAttentionTest.*: 46/46 passed (one pre-existing disabled test).
  • clang-format --dry-run --Werror on all changed files.
  • git diff --check.

Route eligible FP16 and BF16 Attention nodes with compact sequence-length masks through the existing cuDNN SDPA runner on Hopper and newer GPUs. Keep raw masks and cache paths on the existing kernels.
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@microsoft-github-policy-service

Copy link
Copy Markdown
Contributor

@mastryukov1990 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@mastryukov1990

Copy link
Copy Markdown
Author

@tianleiwu Could you please take a look and approve the pending GitHub Actions workflows when you have a chance? This PR extends the cuDNN SDPA integration from #28849 to the fused contrib Attention operator with compact 1D sequence-length masks. I validated the dispatch on H100 (24/24 BGE attention nodes selected cuDNN), the full ContribOpAttentionTest.* suite passed (46/46), and the exact same-build A/B showed a 3.48–4.67× throughput improvement. Thanks!

Copilot AI 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.

Pull request overview

This PR extends the CUDA implementation of the contrib com.microsoft::Attention operator to reuse the existing cuDNN SDPA (Flash Attention) runner when eligible (FP16/BF16, no raw mask, no KV cache, and cuDNN reports support), aligning its dispatch behavior more closely with existing MultiHeadAttention/GroupQueryAttention integration.

Changes:

  • Add cuDNN SDPA enable/auto-enable flags to the contrib CUDA Attention kernel and compute cuDNN eligibility early in dispatch.
  • Route eligible contrib Attention executions to AttentionKernel_CudnnFlashAttention, including temp-space allocator wiring for the cuDNN runner.
  • Add a new contrib Attention test using a 1D key sequence-length mask intended to exercise the cuDNN SDPA path.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
onnxruntime/test/contrib_ops/attention_op_test.cc Adds a new CUDA-focused test case using a 1D key sequence-length mask and env-var kernel selection controls.
onnxruntime/contrib_ops/cuda/bert/attention.h Adds member flags to track explicit and auto cuDNN SDPA enablement for contrib Attention.
onnxruntime/contrib_ops/cuda/bert/attention.cc Implements cuDNN SDPA eligibility checks and dispatch integration for contrib Attention, and propagates the selection into workspace sizing and execution data.

Comment thread onnxruntime/test/contrib_ops/attention_op_test.cc Outdated
@mastryukov1990

Copy link
Copy Markdown
Author

@tianleiwu The follow-up commit 55624f9 addresses the review feedback by asserting the actual cuDNN kernel selection. I validated it on H100: the targeted test passed (1/1) and the full ContribOpAttentionTest.* suite passed (46/46). All 31 workflows are awaiting approval again after the push. Could you please approve/start them when you have a chance? Thanks!

@mastryukov1990

Copy link
Copy Markdown
Author

The Linux TensorRT CI failure appears unrelated to this change. The Build Linux TensorRT x64 Release job failed while the Gradle wrapper was downloading gradle-8.7-bin.zip from services.gradle.org:

java.net.SocketTimeoutException: Connect timed out

The sibling TensorRT CUDA Minimal build completed successfully, so this looks like a transient network/infrastructure failure. A rerun of the failed job should be sufficient.

Failed job: https://github.com/microsoft/onnxruntime/actions/runs/29374987406/job/87230486564

@mastryukov1990

Copy link
Copy Markdown
Author

Sorry for tagging you again, @tianleiwu. The failed Linux TensorRT CI job appears to be a transient Gradle download timeout. Could you please rerun the failed job when you have a chance? Thank you!

@tianleiwu

Copy link
Copy Markdown
Contributor

Sorry for tagging you again, @tianleiwu. The failed Linux TensorRT CI job appears to be a transient Gradle download timeout. Could you please rerun the failed job when you have a chance? Thank you!

@mastryukov1990, CI pipeline has some issues right now (some jobs are queued forever). I could help trigger CIs later.

@mastryukov1990

Copy link
Copy Markdown
Author

Hi @tianleiwu, sorry to follow up again. The PR currently has 20 successful workflows and 11 cancelled ones (mostly Windows workflows, plus ONNX Runtime CUDA Builds); none are queued or running now. Is the CI infrastructure healthy enough to rerun the cancelled workflows at this point, or should we wait a bit longer? If it is safe now, could you please trigger them? Thank you!

@tianleiwu

Copy link
Copy Markdown
Contributor

@mastryukov1990, please merge latest main branch, which has a commit for CI pool change.

@mastryukov1990

Copy link
Copy Markdown
Author

@tianleiwu Done — I merged the latest main (f05b21861c) into the PR branch in 9ec8479931. The merge was conflict-free, and the PR diff remains limited to the original three files. The new workflows are now awaiting approval. Thank you!

@tianleiwu tianleiwu 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.

Reviewed the cuDNN SDPA enablement for the fused contrib Attention kernel. The change reuses the shared cudnn_sdpa::is_stable/is_supported predicate and AttentionKernel_CudnnFlashAttention dispatch already used by MultiHeadAttention, so no new kernel is introduced.

Verified against the surrounding paths:

  • Mutual exclusion preservedcudnn_sdpa_supported correctly gates off flash, the fused TRT runner, and memory-efficient attention; the QkvToContext <= 1 fused-kernel assert still holds.
  • QKV format is valid — with cuDNN selected, PrepareQkv_Attention falls into the unfused branch producing Q_K_V_BNSH, which CudnnFlashAttention/build_graph explicitly accept and stride correctly.
  • Workspace sizing is correctGetAttentionWorkspaceSize(..., cudnn_sdpa_supported, false) returns the full qkv_bytes transpose buffer (previously this arg was hard-coded false).
  • Safe defaultAttentionData::kernel_type defaults to AttentionKernel_Default, so non-eligible calls keep their existing dispatch.
  • Test validates both kernel selection (SdpaKernel=CUDNN_FLASH_ATTENTION) and numerics (masked key/value token excluded from both outputs), and skips cleanly when cuDNN is unavailable.

No blocking issues. One maintainability suggestion left inline regarding the implicit attention_bias safety invariant.


const bool cudnn_sdpa_enabled = enable_cudnn_flash_attention_ ||
(auto_enable_cudnn_flash_attention_ && sm >= 90);
const bool cudnn_sdpa_supported = cudnn_sdpa_enabled &&

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.

Unlike the flash path (nullptr == attention_bias) and unlike MultiHeadAttention (which adds an explicit cudnn_sdpa_bias_ok term), this predicate does not mention attention_bias. An Attention node with an attention_bias input plus no/1D mask will now newly dispatch to cuDNN and forward the bias.

This is correct here only because the fused Attention op is always self-attention with no past/present, so sequence_length == total_sequence_length and cuDNN never selects the bottom-right causal alignment that is incompatible with bias (exactly the case MHA's cudnn_sdpa_bias_ok protects against). Broadcast dims are also set by CheckInputs, so data flow is fine.

The safety relies on an implicit, untested invariant. Consider a short comment documenting why bias is safe here (s_q == s_kv ⇒ TOP_LEFT causal), and/or a test covering the attention_bias + cuDNN combination, so a future change that relaxes the no-past/present restriction doesn't silently route an unsupported bias + bottom-right case to cuDNN.

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