fix(cmake): unify tablegen headers generation dependencies

2026-02-08 19:44:57 -05:00 · 2022-03-25 16:16:08 +01:00
parent 2c4d399575
commit 9ccced7d93
28 changed files with 33 additions and 22 deletions
--- a/compiler/include/concretelang/Conversion/CMakeLists.txt
+++ b/compiler/include/concretelang/Conversion/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name Conversion)
 add_public_tablegen_target(ConcretelangConversionPassIncGen)
-
+add_dependencies(mlir-headers ConcretelangConversionPassIncGen)

 add_subdirectory(FHEToTFHE)
 add_subdirectory(TFHEToConcrete)
--- a/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt
+++ b/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_TARGET_DEFINITIONS Patterns.td)
 mlir_tablegen(Patterns.h.inc -gen-rewriters -name FHE)
 add_public_tablegen_target(FHEToTFHEPatternsIncGen)
+add_dependencies(mlir-headers FHEToTFHEPatternsIncGen)

 add_concretelang_doc(Patterns FHEToTFHEPatterns concretelang/ -gen-pass-doc)
--- a/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt
+++ b/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_TARGET_DEFINITIONS Patterns.td)
 mlir_tablegen(Patterns.h.inc -gen-rewriters -name TFHE)
 add_public_tablegen_target(TFHEToConcretePatternsIncGen)
+add_dependencies(mlir-headers TFHEToConcretePatternsIncGen)

 add_concretelang_doc(Patterns TFHEToConcretePatterns concretelang/ -gen-pass-doc)
--- a/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt
+++ b/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt
@@ -3,4 +3,4 @@ mlir_tablegen(MANP.h.inc -gen-pass-decls -name Analysis)
 mlir_tablegen(MANP.capi.h.inc -gen-pass-capi-header --prefix Analysis)
 mlir_tablegen(MANP.capi.cpp.inc -gen-pass-capi-impl --prefix Analysis)
 add_public_tablegen_target(MANPPassIncGen)
-
+add_dependencies(mlir-headers MANPPassIncGen)
--- a/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt
+++ b/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(LLVM_TARGET_DEFINITIONS Tiling.td)
 mlir_tablegen(Tiling.h.inc -gen-pass-decls -name Transforms)
 add_public_tablegen_target(ConcretelangFHELinalgTilingPassIncGen)
+add_dependencies(mlir-headers ConcretelangFHELinalgTilingPassIncGen)
--- a/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt
+++ b/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt
@@ -3,4 +3,4 @@ mlir_tablegen(Autopar.h.inc -gen-pass-decls -name Analysis)
 mlir_tablegen(Autopar.capi.h.inc -gen-pass-capi-header --prefix Analysis)
 mlir_tablegen(Autopar.capi.cpp.inc -gen-pass-capi-impl --prefix Analysis)
 add_public_tablegen_target(AutoparPassIncGen)
-
+add_dependencies(mlir-headers AutoparPassIncGen)
--- a/compiler/include/concretelang/Transforms/CMakeLists.txt
+++ b/compiler/include/concretelang/Transforms/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(LLVM_TARGET_DEFINITIONS Bufferize.td)
 mlir_tablegen(Bufferize.h.inc -gen-pass-decls -name Transforms)
 add_public_tablegen_target(ConcretelangTransformsPassIncGen)
+add_dependencies(mlir-headers ConcretelangTransformsPassIncGen)
--- a/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt
+++ b/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt
@@ -4,6 +4,9 @@ add_mlir_public_c_api_library(CONCRETELANGCAPIFHE

  FHE.cpp

+  DEPENDS
+  mlir-headers
+
  LINK_LIBS PUBLIC
  MLIRCAPIIR
  FHEDialect
--- a/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt
+++ b/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt
@@ -4,6 +4,9 @@ add_mlir_public_c_api_library(CONCRETELANGCAPIFHELINALG

  FHELinalg.cpp

+  DEPENDS
+  mlir-headers
+
  LINK_LIBS PUBLIC
  MLIRCAPIIR
  FHELinalgDialect
--- a/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt
+++ b/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(BConcreteToBConcreteCAPI

  DEPENDS
  BConcreteDialect
-  ConcretelangConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt
+++ b/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_dialect_library(ConcreteToBConcrete
  DEPENDS
  ConcreteDialect
  BConcreteDialect
-  ConcretelangConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt
+++ b/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_dialect_library(FHETensorOpsToLinalg
  DEPENDS
  FHEDialect
  FHELinalgDialect
-  ConcretelangConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt
+++ b/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt
@@ -6,8 +6,7 @@ add_mlir_dialect_library(FHEToTFHE

  DEPENDS
  FHEDialect
-  FHEToTFHEPatternsIncGen
-  ConcretelangConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt
+++ b/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_dialect_library(MLIRLowerableDialectsToLLVM
  ADDITIONAL_HEADER_DIRS

  DEPENDS
-  ConcretelangConversionPassIncGen
+  mlir-headers
  
  LINK_LIBS PUBLIC
  ${dialect_libs}
--- a/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt
+++ b/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt
@@ -6,7 +6,7 @@ TFHEGlobalParametrization.cpp

  DEPENDS
  TFHEDialect
-  ConcretelangConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt
+++ b/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_dialect_library(TFHEToConcrete
  DEPENDS
  TFHEDialect
  ConcreteDialect
-  TFHEToConcretePatternsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(BConcreteDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/BConcrete

  DEPENDS
-  MLIRBConcreteOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(ConcreteDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/Concrete

  DEPENDS
-  MLIRConcreteOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt
+++ b/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_library(FHEDialectAnalysis

  DEPENDS
  FHEDialect
-  MANPPassIncGen
+  mlir-headers
  
  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Dialect/FHE/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/FHE/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(FHEDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/FHE

  DEPENDS
-  MLIRFHEOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(FHELinalgDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/FHELinalg

  DEPENDS
-  MLIRFHELinalgOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt
+++ b/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_library(FHELinalgDialectTransforms

  DEPENDS
  FHELinalgDialect
-  ConcretelangFHELinalgTilingPassIncGen
+  mlir-headers
  
  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt
+++ b/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt
@@ -9,7 +9,7 @@ add_mlir_library(RTDialectAnalysis

  DEPENDS
  RTDialect
-  AutoparPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR
--- a/compiler/lib/Dialect/RT/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/RT/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(RTDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/RT

  DEPENDS
-  MLIRRTOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt
+++ b/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_dialect_library(TFHEDialect
  ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/TFHE

  DEPENDS
-  MLIRTFHEOpsIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  MLIRIR)
--- a/compiler/lib/Support/CMakeLists.txt
+++ b/compiler/lib/Support/CMakeLists.txt
@@ -15,7 +15,7 @@ add_mlir_library(ConcretelangSupport
  ${PROJECT_SOURCE_DIR}/include/concretelang/Support

  DEPENDS
-  MLIRConversionPassIncGen
+  mlir-headers

  LINK_LIBS PUBLIC
  FHELinalgDialect
--- a/compiler/lib/Transforms/CMakeLists.txt
+++ b/compiler/lib/Transforms/CMakeLists.txt
@@ -6,7 +6,7 @@ add_mlir_library(ConcretelangTransforms

  DEPENDS
  MLIRTransforms
-  ConcretelangTransformsPassIncGen
+  mlir-headers
  
  LINK_LIBS PUBLIC
  MLIRMemRef
--- a/compiler/src/CMakeLists.txt
+++ b/compiler/src/CMakeLists.txt
@@ -5,6 +5,8 @@ llvm_update_compile_flags(concretecompiler)
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)

+add_dependencies(concretecompiler mlir-headers)
+
 if(CONCRETELANG_PARALLEL_EXECUTION_ENABLED)
  target_link_libraries(concretecompiler
    PRIVATE