[AIROCMLIR-1056] LLVM Upstream Merge - June...August 2026

[mirza-halilcevic]

Motivation

LLVM upstream bump for June-August 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).
• splitFlatOffset signature (external/llvm-project/.../SIRegisterInfo.cpp): Upstream replaced the uint64_t FLAT discriminant with the scoped AMDGPU::FlatAddrSpace enum (llvm/llvm-project#200431), so the SIInstrFlags::FlatScratch argument in the SVS constant-offset fold no longer converts. Pass AMDGPU::FlatAddrSpace::FlatScratch instead. Note this arrives late because [EXTERNAL][AMDGPU] Fold constant offset into SV form addressing in SVS #2435 landed on develop on 2026-08-03, after this branch's June subtree pull.
• APFloat::convert inexact status for zero-less / sign-less formats (Rock/utility/builderUtils.{h,cpp}, rocmlir-gen.cpp): Upstream's APFloat::convert now reports opInexact (and snaps to the nearest representable value) when the target format has no encoding for the value; i.e. zero for Float8E8M0FNU (!hasZero) or negatives for sign-less formats (!hasSignedRepr). createConstantFloatOp/createFloatSplatTensor asserted status == opOK, so building a zero constant of an E8M0 scale operand (e.g. the scaled-GEMM input fill in rocmlir-gen) aborted with an assertion failure, cascading into most check-rocmlir failures. Added isAcceptableConversionStatus() to tolerate that unavoidable inexactness while still catching genuine precision loss.

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.
• prolog-epilog pass rename (eliminate-frame-index-flat-scratch-svs.mir): Upstream no longer registers the hyphenated -run-pass=prolog-epilog spelling; the remaining 129 CodeGen tests use prologepilog. Updated both RUN lines. Codegen is unchanged; the test passes against its existing autogenerated CHECK lines.
• MemRef strict-properties alignment (mlir/test/**, incl. CAPI/reduce_fusible.cpp): The MemRef dialect now uses strict properties in its assembly format, so the inherent alignment attribute can no longer be parsed from the discardable attr-dict. Rewrote memref.alloc/memref.alloca/memref.global from {alignment = N : i64} to the custom-format alignment = N (keeping any other discardable attrs), in both IR and CHECK lines.
• amdgpu.raw_buffer_* mandatory boundsCheck keyword (emulate-narrow-type.mlir, buffer-load-merge.mlir, lowering_global_load_store.mlir, buffer_atomic_emulation.mlir, ...): boundsCheck(<bool>) is now a required leading keyword for raw_buffer_load/store/atomic_* instead of an attr-dict entry. Added boundsCheck(true) for the default cases and converted {boundsCheck = false} to boundsCheck(false).
• BitEnumAttr quoting for features (rock-gemm-mixed-input-types.mlir, gridwise_attention_accel_lowering{,_gqa}.mlir, fold_broadcast.mlir, integration/multibuffer/test_multi_buffer_full.mlir, many fusion/*): Upstream now prints multi-bit and none bit-enum values quoted (features = "mfma|dot|atomic_add", features = "none"), and the bare pipe-separated form no longer parses. Quoted features = ... on rock.gemm/rock.gridwise_attention_accel/rock.blockwise_gemm_accel in IR and CHECK lines (single-bit values like dot stay bare, matching the printer).
• rocdl.load.to.lds / rocdl.raw.ptr.buffer.load.lds alias attrs as properties (add_alias_info.mlir): these ops now emit alias_scopes/noalias_scopes in the <...> properties syntax instead of the {...} attr-dict. Updated the CHECK lines (separate from the cache-policy-operand change above).
• rocdl.make.buffer.rsrc numRecords type (prepare_llvm.mlir): the op now prints/parses the numRecords operand type in its signature, so : !llvm.ptr to <8> became : !llvm.ptr, i64 to <8>.
• amdgpu.wmma clamp flag and empty attr-dict spacing (lowering_wmma_gemm.mlir, lowering_xdlops_gemm.mlir): clamp is now an oilist keyword (... + %c clamp : instead of ... {clamp}), and amdgpu.mfma/wmma with no discardable attrs print no attr-dict, so CHECK patterns like + [[c]] {{.*}} : were tightened to + [[c]]{{.*}} :.
• Attribute print-order changes (num_cu.mlir, waves_per_eu.mlir, quant-dot-scaled-to-matmul-t-block-scaled.mlir): inherent attributes that became properties now print after the discardable attr-dict; gpu.func's known_block_size/known_grid_size moved to the end, and tosa.matmul_t_block_scaled's block_size now prints after perf_config. Reordered the affected CHECK-SAME lines (no value changes).

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.

[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: 2 (0 Critical, 0 Major, 2 Minor)

---

Scope

June 2026 LLVM upstream bump. The vast majority of the diff is the external/llvm-project subtree pull, which I treated as vendored upstream content and did not review line-by-line. I reviewed the 12 rocMLIR-proper files the merge required:

• C++ build fixes — MfmaInsnGroup.{h,cpp} (amdgpu::MFMAPermB → ROCDL::MFMAPermB), RockPipeline.cpp (drop custom DenseMapInfo<MemoryAccessType>), BufferLoadMerge.cpp (drop empty/tombstone guard in SimpleOperationInfo::isEqual).
• Test fixes — three lit.cfg.py internal-shell migrations, -dump-pipelines expectation refreshes, ROCDL buffer-op cache-policy operand updates.
• Build deps — librockcompiler_deps.cmake drops MLIRNVGPUDialect.

Findings

Two Minor cleanups; nothing blocking. See inline comments on mlir/test/Dialect/Rock/add_alias_info.mlir:38 and mlir/include/mlir/Dialect/Rock/IR/MfmaInsnGroup.h:18.

Notes

Spot-checks that came back clean:

• I verified the DenseMap rework against the vendored header: external/llvm-project/llvm/include/llvm/ADT/DenseMapInfo.h no longer declares getEmptyKey()/getTombstoneKey(), and lines 138-149 now provide the auto enum specialization. So both the RockPipeline.cpp and BufferLoadMerge.cpp deletions are required, and the new enum info hashes MemoryAccessType through uint32_t exactly as the removed custom one did — no behavior change.
• All three lit.cfg.py files already have import os and import lit.util at the top, so the new lit.util.pythonize_bool call resolves; the block matches upstream MLIR's own config verbatim.
• The refreshed pass-option strings (category-to-named, enable-gep-inbounds-nuw) are inserted in the correct alphabetical slot that -dump-pipelines emits.

Out of scope, for a possible follow-up (pre-existing lines, not touched here):

• MfmaInsnGroupSelectKeyInfo in MfmaInsnGroup.h:96-104 still defines getEmptyKey()/getTombstoneKey(), which are now dead under the new DenseMap — the same dead code this PR removed from RockPipeline.cpp.
• SimpleOperationInfo in BufferLoadMerge.cpp:40 now overrides both members of its llvm::DenseMapInfo<Operation *> base, so the inheritance is vestigial.

One behavioral note worth confirming rather than a defect: on Linux the lit default flips from the external (bash) shell to lit's internal shell for all three suites. That is upstream-mandated and matches upstream MLIR, but it is a real change for E2E RUN lines, so the premerge lit run is the thing to watch.

CI status

No check is in the fail or cancel bucket. C/C++ premerge checks is still IN_PROGRESS — for a bump of this size that job is the primary correctness signal (in particular for the ROCDL::MFMAPermB type change flowing into MFMA emission, which I could not verify statically), so please confirm it goes green before merging.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2427      +/-   ##
===========================================
+ Coverage    82.57%   83.64%   +1.07%     
===========================================
  Files          120      121       +1     
  Lines        42852    43167     +315     
  Branches      7110     7179      +69     
===========================================
+ Hits         35381    36105     +724     
+ Misses        4815     4504     -311     
+ Partials      2656     2558      -98     

Flag	Coverage Δ
gfx120x	83.47% <ø> (+0.94%)	⬆️
gfx950	83.39% <ø> (+1.05%)	⬆️
mfma	83.47% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 44 files with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[pabloantoniom]

Only one comment and note that CI is currently red, the rest looks good to me

[pabloantoniom]

Why is this necessary? It was not necessary before right? Same for mhal-emulate-narrow-type and lower-affine

[Copilot]

Copilot wasn't able to review this pull request because it exceeds the maximum diff size. Try reducing the number of changed files and lines, and requesting a review from Copilot again.