[all-commits] [llvm/llvm-project] eb6c41: [mlir][CF] Split `cf-to-llvm` from `func-to-llvm` ...

Fri Dec 20 04:47:07 PST 2024

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: eb6c4197d5263ed2e086925b2b2f032a19442d2b
      https://github.com/llvm/llvm-project/commit/eb6c4197d5263ed2e086925b2b2f032a19442d2b
  Author: Matthias Springer <me at m-sp.org>
  Date:   2024-12-20 (Fri, 20 Dec 2024)

  Changed paths:
    M flang/lib/Optimizer/CodeGen/CodeGen.cpp
    M mlir/include/mlir/Conversion/Passes.td
    M mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp
    M mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp
    M mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp
    A mlir/test/Conversion/ControlFlowToLLVM/branch.mlir
    R mlir/test/Conversion/ControlFlowToLLVM/invalid.mlir
    A mlir/test/Conversion/ControlFlowToLLVM/switch.mlir
    M mlir/test/Conversion/FuncToLLVM/convert-funcs.mlir
    M mlir/test/Conversion/FuncToLLVM/func-memref.mlir
    M mlir/test/Conversion/FuncToLLVM/func-to-llvm.mlir
    M mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
    M mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir
    M mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
    M mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
    M mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir
    M mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/runtime-verification.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-wcf-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-hwcf-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-dhwcf-call.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-one-shot-bufferize.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-padtensor.mlir
    M mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir
    M mlir/test/Integration/Dialect/MemRef/memref_abi.c
    M mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/0-d-vectors.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/broadcast.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/compress.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/constant-mask.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/contraction.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/create-mask-v4i1.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/create-mask.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/expand.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/extract-strided-slice.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/flat-transpose-col.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/flat-transpose-row.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/fma.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/gather.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/index-vectors.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/insert-strided-slice.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/maskedload.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/maskedstore.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/matrix-multiply-col.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/matrix-multiply-row.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/outerproduct-f32.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/outerproduct-i64.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/print-fp.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/print-int.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/realloc.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-f32-reassoc.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-f32.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-f64-reassoc.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-f64.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-i32.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-i4.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-i64.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-si4.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/reductions-ui4.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/scan.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/scatter.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/shape-cast.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/shuffle.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/shuffle16x16.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/sparse-dot-matvec.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/sparse-saxpy-jagged-matvec.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-read-1d.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-read-2d.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-read-3d.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-read.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-to-loops.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transfer-write.mlir
    M mlir/test/Integration/Dialect/Vector/CPU/transpose.mlir
    M mlir/test/lib/Dialect/LLVM/TestLowerToLLVM.cpp
    M mlir/test/mlir-cpu-runner/async-error.mlir
    M mlir/test/mlir-cpu-runner/async-group.mlir
    M mlir/test/mlir-cpu-runner/async-value.mlir
    M mlir/test/mlir-cpu-runner/async.mlir
    M mlir/test/mlir-cpu-runner/bare-ptr-call-conv.mlir
    M mlir/test/mlir-cpu-runner/copy.mlir
    M mlir/test/mlir-cpu-runner/memref-reinterpret-cast.mlir
    M mlir/test/mlir-cpu-runner/memref-reshape.mlir
    M mlir/test/mlir-cpu-runner/sgemm-naive-codegen.mlir
    M mlir/test/mlir-cpu-runner/unranked-memref.mlir
    M mlir/test/mlir-cpu-runner/utils.mlir
    M mlir/test/python/execution_engine.py
    M mlir/test/python/integration/dialects/linalg/opsrun.py
    M mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp

  Log Message:
  -----------
  [mlir][CF] Split `cf-to-llvm` from `func-to-llvm` (#120580)

Do not run `cf-to-llvm` as part of `func-to-llvm`. This commit fixes
https://github.com/llvm/llvm-project/issues/70982.

This commit changes the way how `func.func` ops are lowered to LLVM.
Previously, the signature of the entire region (i.e., entry block and
all other blocks in the `func.func` op) was converted as part of the
`func.func` lowering pattern.

Now, only the entry block is converted. The remaining block signatures
are converted together with `cf.br` and `cf.cond_br` as part of
`cf-to-llvm`. All unstructured control flow is not converted as part of
a single pass (`cf-to-llvm`). `func-to-llvm` no longer deals with
unstructured control flow.

Also add more test cases for control flow dialect ops.

Note: This PR is in preparation of #120431, which adds an additional
GPU-specific lowering for `cf.assert`. This was a problem because
`cf.assert` used to be converted as part of `func-to-llvm`.

Note for LLVM integration: If you see failures, add
`-convert-cf-to-llvm` to your pass pipeline.

To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications