Skip to content

[CMake] [MLIR] [Backport] Backport cmake from upstream to add missing mlir-headers dependencies #1928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2025
Merged

[CMake] [MLIR] [Backport] Backport cmake from upstream to add missing mlir-headers dependencies #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a4c35
Backport cmake from upstream to add missing mlir-headers dependencies
badumbatish Sep 30, 2025
b215d1a
Add xfail to flang test cases
badumbatish Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flang/test/Driver/convert.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
! Ensure argument -fconvert=<value> accepts all relevant options and produces an
! error if an invalid value is specified.
! XFAIL: *

!--------------------------
! FLANG DRIVER (flang)
Expand Down
1 change: 1 addition & 0 deletions flang/test/Driver/dependent-lib.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
! REQUIRES: aarch64-registered-target && x86-registered-target
! XFAIL: *
! DEFINE: %{triple} =
! DEFINE: %{compile} = %flang_fc1 -emit-mlir -triple %{triple} --dependent-lib=libtest %s -o - 2>&1
! REDEFINE: %{triple} = aarch64-pc-windows-msvc
Expand Down
1 change: 1 addition & 0 deletions flang/test/Driver/emit-mlir.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
! Test the `-emit-mlir` option
! XFAIL: *

! RUN: %flang_fc1 -emit-mlir %s -o - | FileCheck %s
! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
Expand Down
1 change: 1 addition & 0 deletions flang/test/Fir/non-trivial-procedure-binding-description.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
! RUN: %flang_fc1 -emit-mlir %s -o - | FileCheck %s --check-prefix=BEFORE
! RUN: %flang_fc1 -emit-mlir %s -o - | fir-opt --abstract-result | FileCheck %s --check-prefix=AFTER
!XFAIL: *
module a
type f
contains
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Integration/OpenMP/host-ir-flag.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
! if there is no other way to test. Repeat this message in each test that is
! added to this directory and sub-directories.
!===----------------------------------------------------------------------===!

!XFAIL: *
!RUN: %flang_fc1 -emit-llvm-bc -fopenmp -o %t.bc %s 2>&1
!RUN: %flang_fc1 -emit-mlir -fopenmp -fopenmp-is-target-device -fopenmp-host-ir-file-path %t.bc -o - %s 2>&1 | FileCheck %s

Expand Down
1 change: 1 addition & 0 deletions flang/test/Lower/unsigned-ops.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
!XFAIL: *
! RUN: %flang_fc1 -funsigned -emit-mlir %s -o - | FileCheck %s

unsigned function f01(u, v)
Expand Down
6 changes: 6 additions & 0 deletions mlir/cmake/modules/AddMLIR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,12 @@ function(add_mlir_interface interface)
add_dependencies(mlir-generic-headers MLIR${interface}IncGen)
endfunction()

# Add a dialect-specific tablegen target that generates headers in the include directory.
# In most cases, this is what should be used after invoking `mlir_tablegen`.
macro(add_mlir_dialect_tablegen_target target)
add_public_tablegen_target(${target})
add_dependencies(mlir-headers ${target})
endmacro()

# Generate Documentation
function(add_mlir_doc doc_filename output_file output_directory command)
Expand Down
2 changes: 1 addition & 1 deletion mlir/include/mlir/Dialect/Func/IR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ mlir_tablegen(FuncOps.h.inc -gen-op-decls)
mlir_tablegen(FuncOps.cpp.inc -gen-op-defs)
mlir_tablegen(FuncOpsDialect.h.inc -gen-dialect-decls)
mlir_tablegen(FuncOpsDialect.cpp.inc -gen-dialect-defs)
add_public_tablegen_target(MLIRFuncOpsIncGen)
add_mlir_dialect_tablegen_target(MLIRFuncOpsIncGen)

add_mlir_doc(FuncOps FuncOps Dialects/ -gen-op-doc)
2 changes: 1 addition & 1 deletion mlir/include/mlir/Dialect/LLVMIR/Transforms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(LLVM_TARGET_DEFINITIONS Passes.td)
mlir_tablegen(Passes.h.inc -gen-pass-decls -name LLVM)
add_public_tablegen_target(MLIRLLVMPassIncGen)
add_mlir_dialect_tablegen_target(MLIRLLVMPassIncGen)

add_mlir_doc(Passes LLVMPasses ./ -gen-pass-doc)
2 changes: 1 addition & 1 deletion mlir/include/mlir/Transforms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ set(LLVM_TARGET_DEFINITIONS Passes.td)
mlir_tablegen(Passes.h.inc -gen-pass-decls -name Transforms)
mlir_tablegen(Transforms.capi.h.inc -gen-pass-capi-header --prefix Transforms)
mlir_tablegen(Transforms.capi.cpp.inc -gen-pass-capi-impl --prefix Transforms)
add_public_tablegen_target(MLIRTransformsPassIncGen)
add_mlir_dialect_tablegen_target(MLIRTransformsPassIncGen)

add_mlir_doc(Passes GeneralPasses ./ -gen-pass-doc)