Skip to content

Bump rocm-systems from 093b66c to 077d0d5#3956

Closed
dependabot[bot] wants to merge 1 commit intomainfrom
dependabot/submodules/main/rocm-systems-077d0d5
Closed

Bump rocm-systems from 093b66c to 077d0d5#3956
dependabot[bot] wants to merge 1 commit intomainfrom
dependabot/submodules/main/rocm-systems-077d0d5

Conversation

@dependabot
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 13, 2026 •
edited
Loading

Bumps rocm-systems from 093b66c to 077d0d5.

Commits
  • 077d0d5 Add WSL ABI compatibility check for DXG thunk (#3985)
  • 67bec9a AIRUNTIME-1893 - Fix __smid for GFX12 (RDNA4) architecture (#3841)
  • 0c35076 [AMD-SMI] Fix CI failure from stale repo in AlmaLinux8 Docker image (#4015)
  • 0d38731 Update TheRock reference (rocm-systems) - 2026-03-10 (#3930)
  • 3bfbadf ROCM-3970 - release mem object outside the critical region (#3913)
  • 439fb1c rocr: Replace repeated 'kAqlProfileLib' probes for each GPU
  • fb08634 Fix KFDTest SDMAFillDataPacket to support GFX12 (#3969)
  • 384af90 Update TheRock SHA in therock-rccl-ci-linux.yml to include rocprofiler MPI de...
  • c3796ce [hip-tests] Introduce new mechanism for tagging and disabling tests - Part 5 ...
  • 1ce7ea2 [rocshmem] CI: Disable RO flood testing, tracking issue AIROCSHMEM-324 (#3961)
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file submodules Pull requests that update submodules code labels Mar 13, 2026
@dependabot dependabot bot requested a review from a team as a code owner March 13, 2026 10:20
@dependabot dependabot bot added the submodules Pull requests that update submodules code label Mar 13, 2026
@dependabot dependabot bot mentioned this pull request Mar 13, 2026
Closed
@AmosLewis AmosLewis requested a review from geomin12 March 13, 2026 14:28
AmosLewis
AmosLewis approved these changes Mar 13, 2026
View reviewed changes
Copy link
Contributor

@AmosLewis AmosLewis left a comment

Choose a reason for hiding this comment

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

LGTM

@jayhawk-commits
Copy link
Contributor

jayhawk-commits commented Mar 13, 2026

TheRock CI checks not showing on the main screen here...

geomin12
geomin12 reviewed Mar 13, 2026
View reviewed changes
Copy link
Contributor

@geomin12 geomin12 left a comment

Choose a reason for hiding this comment

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

windows failed https://github.com/ROCm/TheRock/actions/runs/23046433626/job/66936677181?pr=3956 due to out of resources. will require a retry.

aside from that, tests seem good though

@dependabot
Bump rocm-systems from 093b66c to 077d0d5
e0b6004 
Bumps [rocm-systems](https://github.com/ROCm/rocm-systems) from `093b66c` to `077d0d5`.
- [Release notes](https://github.com/ROCm/rocm-systems/releases)
- [Commits](ROCm/rocm-systems@093b66c...077d0d5)

---
updated-dependencies:
- dependency-name: rocm-systems
  dependency-version: 077d0d5b7b0e7fb9f75c5e22a4cb9ac50df0bb18
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/submodules/main/rocm-systems-077d0d5 branch from 524f75d to e0b6004 Compare March 13, 2026 16:38
@AmosLewis
Copy link
Contributor

AmosLewis commented Mar 14, 2026 •
edited
Loading

CI Triage - Patch Conflict (Code Failure)

All 8 checks failed (re-triggered 3x, same failure). Root cause: patch conflict in Fetch sources for all Build jobs; CI Summary failed as cascade.

# Job Classification Error Job Link
1 CI Summary Cascade downstream builds failed job
2 Linux::gfx94X-dcgpu::release / Build Patch Conflict patch failed: device/device.cpp:777 job
3 Linux::gfx110X-all::release / Build Patch Conflict patch failed: device/device.cpp:777 job
4 Linux::gfx120X-all::release / Build Patch Conflict patch failed: device/device.cpp:777 job
5 Linux::gfx1151::release / Build Patch Conflict patch failed: device/device.cpp:777 job
6 Windows::gfx110X-all::release / Build release Patch Conflict patch failed: device/device.cpp:777 job
7 Windows::gfx120X-all::release / Build release Patch Conflict patch failed: device/device.cpp:777 job
8 Windows::gfx1151::release / Build release Patch Conflict patch failed: device/device.cpp:777 job

Root Cause: The patch 0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch cannot apply because the target line has shifted (patch expects line 777; 077d0d5 has it at line 811). On rocm-systems master the code has since changed to const bool kComgrVersioned = amd::IS_HIP; — so even a regenerated patch (false→true at line 811) will fail again on the next bump. Re-triggering does not help.

Action Required:

  • Permanent fix (recommended): Upstream the correct behavior in ROCm/rocm-systems (e.g. ensure kComgrVersioned is true for the Windows DLL consistency case, or align with amd::IS_HIP if that is correct for TheRock). Then remove patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch from TheRock so CI never applies it. Future bumps will not hit this patch conflict.
  • Temporary: Regenerate patch for 077d0d5 (line 811) only unblocks this bump; it will conflict again when bumping to a commit that has amd::IS_HIP.

cc @stellaraccident @geomin12

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Mar 16, 2026

Superseded by #3984.

@dependabot dependabot bot closed this Mar 16, 2026
@dependabot dependabot bot deleted the dependabot/submodules/main/rocm-systems-077d0d5 branch March 16, 2026 10:49
@chiranjeevipattigidi chiranjeevipattigidi mentioned this pull request Mar 16, 2026
Merged
@ScottTodd
Copy link
Member

ScottTodd commented Mar 16, 2026

Docs for how to work with patch files: https://github.com/ROCm/TheRock/tree/main/patches#resolving-conflicts-with-patches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@geomin12 geomin12 geomin12 left review comments

@AmosLewis AmosLewis AmosLewis approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file submodules Pull requests that update submodules code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jayhawk-commits @AmosLewis @ScottTodd @geomin12