[MLIR] Remove unneeded LLVMDialect.h include in ControlFlowToSCF.cpp

[RoboTux]

This fixes the following failure when doing a clean build (in particular
no .ninja* lying around) of lib/libMLIRControlFlowToSCF.a only:

In file included from llvm/include/llvm/IR/Module.h:22,
                 from mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h:37,
                 from mlir/lib/Conversion/ControlFlowToSCF/ControlFlowToSCF.cpp:19
llvm/include/llvm/IR/Attributes.h:90:14: fatal error: llvm/IR/Attributes.inc: No such file or directory

[llvmbot]

@llvm/pr-subscribers-mlir

Author: Thomas Preud'homme (RoboTux)

Changes

This fixes the following failure when doing a clean build (in particular
no .ninja* lying around) of lib/libMLIRControlFlowToSCF.a only:

In file included from llvm/include/llvm/IR/Module.h:22,
                 from mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h:37,
                 from mlir/lib/Conversion/ControlFlowToSCF/ControlFlowToSCF.cpp:19
llvm/include/llvm/IR/Attributes.h:90:14: fatal error: llvm/IR/Attributes.inc: No such file or directory

---

Full diff: https://github.com/llvm/llvm-project/pull/113560.diff

1 Files Affected:

• (modified) mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt (+1)

diff --git a/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt b/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt
index e2f1677b1d0695..9a3f2dfc3799fd 100644
--- a/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt
+++ b/mlir/lib/Conversion/ControlFlowToSCF/CMakeLists.txt
@@ -12,6 +12,7 @@ add_mlir_conversion_library(MLIRControlFlowToSCF
   MLIRArithDialect
   MLIRControlFlowDialect
   MLIRFuncDialect
+  MLIRLLVMDialect
   MLIRSCFDialect
   MLIRUBDialect
   MLIRPass

[zero9178]

There shouldn't be any dependency on the LLVM dialect in that pass that I am aware of, so I'd much rather remove the include than add a false library dependency.

This seems to also be what was done in #104832 but was seemingly reverted for unrelated reasons.
Could you try removing the include instead?

[joker-eph]

The proper fix would be an interface I think, the commit you mention is using a string to work around, but that looks a bit like a hack to me.

[zero9178]

The proper fix would be an interface I think, the commit you mention is using a string to work around, but that looks a bit like a hack to me.

I think you may be mixing the changes done to SCFToControlFlow in that PR with the ones in ControlFlowToSCF, where the PR only removes the include, nothing else.

Fully agree otherwise.

[zero9178]

LGTM!