[AIROCMLIR-1056] LLVM Upstream Merge - June 2026

[mirza-halilcevic]

Motivation

LLVM upstream bump for June 2026.

Technical Details

Build fixes

• Bufferization API (external/llvm-project/.../Bufferize.cpp): Update the unknownTypeConverterFn lambda in getPartialBufferizationOptions() to the new upstream signature (TensorLikeType → BufferLikeType instead of TensorType → MemRefType), matching the other updated call sites.
• MFMAPermB namespace move (MfmaInsnGroup.{h,cpp}): Upstream moved the MFMAPermB enum from the amdgpu namespace to ROCDL. Updated the field type, initializers, and using declarations, and added the ROCDLDialect.h include.
• DenseMapInfo refactor (RockPipeline.cpp, BufferLoadMerge.cpp): Upstream reworked DenseMap to track occupied buckets via a separate bit-vector, so DenseMapInfo no longer exposes getEmptyKey()/getTombstoneKey() and now auto-provides an enum specialization. Removed the now-redundant custom DenseMapInfo<MemoryAccessType> specialization and dropped the empty/tombstone-key guard from SimpleOperationInfo::isEqual (mirroring the upstream CSE change).

Test fixes

• Lit internal-shell migration (mlir/test/lit.cfg.py, mlir/test/e2e/lit.cfg.py, mlir/test/fusion/e2e/lit.cfg.py): ShTest(execute_external=True) is removed in upstream lit. Switched all three configs to default to the internal shell (honoring LIT_USE_INTERNAL_SHELL), matching upstream MLIR's own lit.cfg.py.
• Pipeline dump expectations (rocmlir-driver/pipelines.mlir, runner-pipelines.mlir): Refresh -dump-pipelines FileCheck expectations for new upstream pass options/passes: linalg-morph-ops's new category-to-named option, and convert-vector-to-llvm's new enable-gep-inbounds-nuw option.
• ROCDL buffer op cache-policy operand (prepare_llvm.mlir, add_alias_info.mlir): Upstream changed rocdl.raw.ptr.buffer.store and rocdl.raw.ptr.buffer.load.lds so the trailing cache-policy operand is now a cache-policy-family keyword or a 32-bit integer literal instead of an SSA value. Updated the test IR accordingly.

Diff Files

• diff -rup llvm-project/llvm rocMLIR/external/llvm-project/llvm
  llvm-diff.txt
• diff -rup llvm-project/mlir rocMLIR/external/llvm-project/mlir
  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: APPROVE -- submitted as COMMENT (automated reviews are advisory)  ·  Findings: 0 (0 Critical, 0 Major, 0 Minor)

---

Scope

LLVM upstream merge (June 2026). The vast majority of the diff is vendored external/llvm-project changes (out of scope for rocMLIR review). The rocMLIR-side changes are 12 files: build fixes to MfmaInsnGroup.{h,cpp}, BufferLoadMerge.cpp, RockPipeline.cpp; test-infra updates to three lit.cfg.py files; FileCheck expectation refreshes in four .mlir tests; and a regenerated librockcompiler_deps.cmake.

Findings

No blocking issues found in the rocMLIR-side changes.

• MfmaInsnGroup.h/.cpp: clean amdgpu::MFMAPermB → ROCDL::MFMAPermB migration; the new mlir/Dialect/LLVMIR/ROCDLDialect.h include is placed in correct lexicographic order after AMDGPUDialect.h, and every using ROCDL::MFMAPermB; / MFMAPermB::none site is consistent.
• BufferLoadMerge.cpp / RockPipeline.cpp: removal of the custom DenseMapInfo<MemoryAccessType> specialization and of the empty/tombstone-key guard in SimpleOperationInfo::isEqual correctly tracks the upstream DenseMap rework. MemoryAccessType values (READ=1, WRITE=2, UNKNOWN=3) don't collide with the auto-provided enum specialization's sentinels, so the DenseSet<pair<GpuAllocOp, DependencyType>> usage remains sound.
• The three lit.cfg.py files default to the internal shell while honoring LIT_USE_INTERNAL_SHELL (ShTest(execute_external=not use_lit_shell)), matching upstream MLIR's own config after execute_external=True removal.
• librockcompiler_deps.cmake is the regenerated dependency list, satisfying the checklist item requiring it be updated when dependencies change.

Notes

• The .mlir FileCheck refreshes (pipelines.mlir, runner-pipelines.mlir, prepare_llvm.mlir, add_alias_info.mlir) are mechanical expectation updates for new upstream pass options and the ROCDL buffer-op cache-policy operand form; correctness rests on check-mlir passing.
• Pre-existing (out of scope): MfmaInsnGroup.cpp has no SPDX license header, and RockPipeline.cpp uses std::set/std::vector/std::map where LLVM ADTs are usually preferred — neither introduced by this PR.
• Recent commit history shows external/llvm-project changes carried under a separate [EXTERNAL]-prefixed commit, consistent with the repository convention.

CI status

No failing or cancelled checks in the pre-fetched status (only detect passing and the auto-review pipeline in progress). The unchecked PR/Nightly/Weekly boxes in the description are the author's manual checklist, not CI signal.