[AIROCMLIR-891] LLVM Upstream Merge May

[djramic]

Motivation

Resolve: https://amd-hub.atlassian.net/browse/AIROCMLIR-891

Technical Details

Conflicts resolved:

• AMDGPUAsmPrinter.cpp: Kept rocMLIR's commented-out occupancy-warning block and adopted upstream's removal of the isGFX11Plus InstPrefSize block (now handled via STM.hasInstPrefSize()).
• AMDGPUToROCDL.cpp: Adopted the upstream conversion-pattern list, adding GlobalTransposeLoadOpLowering.
• EmulateNarrowType.cpp: Adopted the upstream version that adds the ConvertMemRefCast pattern and passes assumeAligned to the ConvertMemRefSubview/ConvertMemRefReinterpretCast constructors.

Diff files:
llvm-diff.txt
mlir-diff.txt

Test Plan

External Tests

• check-llvm
• check-mlir
  CI
• PR
• Nightly
• Weekly

Submission Checklist

• Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.

[Copilot]

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

[rocmlir-pr-reviewer]

Verdict: COMMENT  ·  Findings: 0 (0 Critical, 0 Major, 0 Minor)

---

Scope

LLVM upstream merge (~6000 files under external/llvm-project/). The only rocMLIR-side change in the diff is a regeneration of mlir/tools/rocmlir-lib/librockcompiler_deps.cmake, which the merge checklist requires when dependencies shift. Per the PR description, three upstream files needed manual conflict resolution: AMDGPUAsmPrinter.cpp, AMDGPUToROCDL.cpp, and EmulateNarrowType.cpp.

Findings

No blocking rocMLIR-side issues identified. The vast majority of the diff is verbatim upstream LLVM/MLIR content carried in by the merge and is out of scope for line-by-line rocMLIR review; the conflict resolutions described in the PR body (kept rocMLIR's commented-out occupancy-warning block, adopted upstream's InstPrefSize removal, picked up GlobalTransposeLoadOpLowering, adopted upstream ConvertMemRefCast/assumeAligned) look consistent with the surrounding upstream changes and the stated intent.

Notes

• The "external changes must be separate, prefixed [EXTERNAL]" rule from the checklist is not applied here because the PR's purpose is the upstream merge itself; the lone rocMLIR-side touch (librockcompiler_deps.cmake) is a mechanical regeneration tied to the merge and would be awkward to split off.
• Worth double-checking before merging that all three Test Plan boxes (PR / Nightly / Weekly) are exercised, since the Technical Details only call out check-llvm / check-mlir as passing.

CI status

• Jenkins: one run reports FAILURE (a second Jenkins entry is SUCCESS, but the failing one needs investigation).
• ml-ci-internal.amd.com: ERROR.

These red signals should be triaged before merge; with such a large surface area, a CI regression here is very likely real and not just infrastructure noise.

[justinrosner]

LLVM and MLIR diffs look good!