[mlir] Add missing dependencies

[stephenneuendorffer]

Summary

This should solve some build errors using cmake + 'make'
This also continues some previous refactoring of the LLVM dialect to remove
dependence on the OpenMP dialect, which did not completely incorporate changes
to the header structure.

[rriddle]

mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt

9

Why is this necessary? I wouldn't expect anything here to depend on Linalg passes being generated.

[pawelo12345678]

Giving it a try, although I'll be able to see the result morning GMT.

Thanks for your help!

[stephenneuendorffer]

mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt

9

LinalgToLLVM.cpp includes Passes.h, but it seems like that is unnecessary, so I've removed it.

[pawelo12345678]

It has taken more time than I expected as building with make -j1 is the best way to ensure that the potential problem with generated headers can be replicated. I've tried the latest iteration of this patch and I can confirm that the problem has gone and this patch is an acceptable solution.

[mehdi_amini]

make -j1 only enforces a linear ordering, but does not guarantee that the dependencies are correct. You actually have more chances to hit a missing dependency with maximum parallelism.

In general missing dependencies for a target can be reproduced consistently by building only this target alone make <path to .o>

mlir/lib/Target/CMakeLists.txt

55

Which config is failing without linking this?

[stephenneuendorffer]

mlir/lib/Target/CMakeLists.txt

55

I added it because of the header dependence on ConvertToLLVMIR, but it could be handled by the transitive dependence on MLIRTargetLLVMIRModuleTranslation, I suppose. I don't recall if I saw a specific failure here.

[pawelo12345678]

ping: any chances for this being merged?

[stephenneuendorffer]

I think this is obsolete?

mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h

 // LLVM type system.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_
 #define MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_
 
 #include "mlir/Dialect/LLVMIR/LLVMTypes.h"
-#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/TypeSupport.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"

mlir/lib/Conversion/LinalgToLLVM/CMakeLists.txt

 add_mlir_conversion_library(MLIRLinalgToLLVM
   LinalgToLLVM.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/LinalgToLLVM
 
   DEPENDS
   MLIRConversionPassIncGen
+  MLIRLinalgPassIncGen
   intrinsics_gen
 
   LINK_COMPONENTS
   Core
 
   LINK_LIBS PUBLIC
   MLIRAffineToStandard
   MLIREDSC

mlir/lib/Target/CMakeLists.txt

add_mlir_translation_library(MLIRTargetLLVMIR
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR
 
   LINK_COMPONENTS
   Core
   IRReader
 
   LINK_LIBS PUBLIC
+  MLIROpenMP
   MLIRTargetLLVMIRModuleTranslation
   )
 
 add_mlir_translation_library(MLIRTargetNVVMIR
   LLVMIR/ConvertToNVVMIR.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR

mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp

 //===- ConvertToLLVMIR.cpp - MLIR to LLVM IR conversion -------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements a translation between the MLIR LLVM dialect and LLVM IR.
 //
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Target/LLVMIR.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
 
 #include "mlir/Target/LLVMIR/ModuleTranslation.h"
 #include "mlir/Translation.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/Support/ToolOutputFile.h"