unit build cmakes

makslevental · makslevental · commit ece06da1f617 · 2025-06-27T16:23:11.000-04:00
diff --git a/clang/examples/JumboSupport/JumboSupport.cpp b/clang/examples/JumboSupport/JumboSupport.cpp
@@ -61,7 +61,7 @@ class ASTConsumer : public clang::ASTConsumer {
 
 ASTConsumer *ASTConsumer::Instance = nullptr;
 
-class PPCallbacks : public clang::PPCallbacks {
+class UnityPPCallbacks : public clang::PPCallbacks {
   clang::Preprocessor &PP;
   clang::SourceManager &SM;
 
@@ -70,10 +70,11 @@ class PPCallbacks : public clang::PPCallbacks {
   std::set<std::string> DefinedMacros;
 
 public:
-  PPCallbacks(clang::Preprocessor &PP) : PP(PP), SM(PP.getSourceManager()) {}
+  UnityPPCallbacks(clang::Preprocessor &PP)
+      : PP(PP), SM(PP.getSourceManager()) {}
 
   static void Register(clang::Preprocessor &PP) {
-    PP.addPPCallbacks(std::make_unique<PPCallbacks>(PP));
+    PP.addPPCallbacks(std::make_unique<UnityPPCallbacks>(PP));
   }
 
   void
@@ -134,6 +135,10 @@ class JumboFrontendAction : public clang::PluginASTAction {
                  const std::vector<std::string> &args) override {
     return true;
   }
+
+  JumboFrontendAction::ActionType getActionType() override {
+    return AddBeforeMainAction;
+  }
 };
 
 class PragmaJumbo : public clang::PragmaHandler {
@@ -152,7 +157,7 @@ class PragmaJumbo : public clang::PragmaHandler {
       return;
     }
 
-    PPCallbacks::Register(PP);
+    UnityPPCallbacks::Register(PP);
   }
 };
 
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
@@ -1320,7 +1320,9 @@ add_subdirectory(lib/Demangle)
 add_subdirectory(lib/Support)
 add_subdirectory(lib/TableGen)
 
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 1)
 add_subdirectory(utils/TableGen)
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 0)
 
 add_subdirectory(include)
 
diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
@@ -1,5 +1,6 @@
 include(LLVM-Build)
 
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 1)
 # `Demangle', `Support' and `TableGen' libraries are added on the top-level
 # CMakeLists.txt
 
@@ -69,3 +70,5 @@ endif()
 # Component post-processing
 LLVMBuildResolveComponentsLink()
 LLVMBuildGenerateCFragment(OUTPUT ${LLVMCONFIGLIBRARYDEPENDENCIESINC})
+
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 0)
diff --git a/llvm/lib/Demangle/CMakeLists.txt b/llvm/lib/Demangle/CMakeLists.txt
@@ -10,3 +10,5 @@ add_llvm_component_library(LLVMDemangle
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/Demangle"
 
 )
+
+set_target_properties(LLVMDemangle PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/llvm/utils/TableGen/Basic/CMakeLists.txt b/llvm/utils/TableGen/Basic/CMakeLists.txt
@@ -27,3 +27,5 @@ target_include_directories(LLVMTableGenBasic
   INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
   )
+
+set_target_properties(LLVMTableGenBasic PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
@@ -60,3 +60,4 @@ add_mlir_library(MLIRAnalysis
   MLIRViewLikeInterface
   )
 
+set_target_properties(obj.MLIRAnalysis PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt b/mlir/lib/Conversion/LLVMCommon/CMakeLists.txt
@@ -17,3 +17,5 @@ add_mlir_conversion_library(MLIRLLVMCommonConversion
   MLIRSupport
   MLIRTransforms
   )
+
+set_target_properties(obj.MLIRLLVMCommonConversion PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt
@@ -22,3 +22,5 @@ add_mlir_conversion_library(MLIRSCFToGPU
   MLIRSideEffectInterfaces
   MLIRTransforms
   )
+
+set_target_properties(obj.MLIRSCFToGPU PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt
@@ -25,3 +25,4 @@ add_mlir_conversion_library(MLIRShapeToStandard
   MLIRSCFDialect
   MLIRTransforms
   )
+set_target_properties(obj.MLIRShapeToStandard PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Debug/CMakeLists.txt b/mlir/lib/Debug/CMakeLists.txt
@@ -17,3 +17,4 @@ add_mlir_library(MLIRDebug
   MLIRObservers
 )
 
+set_target_properties(obj.MLIRDebug PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
@@ -44,3 +44,4 @@ add_mlir_dialect_library(MLIRAffineTransforms
   MLIRVectorUtils
   )
 
+set_target_properties(obj.MLIRAffineTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt
@@ -36,3 +36,4 @@ add_mlir_dialect_library(MLIRArithTransforms
   MLIRValueBoundsOpInterface
   MLIRVectorDialect
   )
+set_target_properties(obj.MLIRArithTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Bufferization/Transforms/CMakeLists.txt
@@ -42,3 +42,5 @@ add_mlir_dialect_library(MLIRBufferizationTransforms
   MLIRViewLikeInterface
   MLIRSupport
 )
+
+set_target_properties(obj.MLIRBufferizationTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -66,6 +66,7 @@ add_mlir_dialect_library(MLIRNVVMDialect
   MLIRSideEffectInterfaces
   MLIRInferIntRangeInterface
   )
+set_target_properties(obj.MLIRNVVMDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
 
 add_mlir_dialect_library(MLIRROCDLDialect
   IR/ROCDLDialect.cpp
diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
@@ -37,3 +37,4 @@ add_mlir_dialect_library(MLIRLinalgDialect
   MLIRValueBoundsOpInterface
   MLIRViewLikeInterface
   )
+set_target_properties(obj.MLIRLinalgDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -86,3 +86,4 @@ add_mlir_dialect_library(MLIRLinalgTransforms
   MLIRVectorUtils
   MLIRVectorToSCF
 )
+set_target_properties(obj.MLIRLinalgTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt
@@ -42,3 +42,4 @@ add_mlir_dialect_library(MLIRMemRefTransforms
   MLIRVectorDialect
 )
 
+set_target_properties(obj.MLIRMemRefTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Ptr/IR/CMakeLists.txt b/mlir/lib/Dialect/Ptr/IR/CMakeLists.txt
@@ -16,3 +16,5 @@ add_mlir_dialect_library(
   MLIRMemorySlotInterfaces
   MLIRViewLikeInterface
 )
+
+set_target_properties(obj.MLIRPtrDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt
@@ -42,3 +42,4 @@ add_mlir_dialect_library(MLIRSCFTransforms
   MLIRTransforms
   MLIRTransformUtils
 )
+set_target_properties(obj.MLIRSCFTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/IR/CMakeLists.txt
@@ -49,3 +49,4 @@ add_mlir_dialect_library(MLIRSPIRVDialect
   MLIRTransforms
   MLIRUBDialect
 )
+set_target_properties(obj.MLIRSPIRVDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
@@ -53,3 +53,4 @@ add_mlir_dialect_library(MLIRSparseTensorTransforms
   MLIRTransforms
   MLIRVectorDialect
 )
+set_target_properties(obj.MLIRSparseTensorTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt
@@ -40,3 +40,4 @@ add_mlir_dialect_library(MLIRTensorTransforms
   MLIRVectorUtils
   MLIRValueBoundsOpInterface
 )
+set_target_properties(obj.MLIRTensorTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt
@@ -52,3 +52,4 @@ add_mlir_dialect_library(MLIRVectorTransforms
   MLIRVectorInterfaces
   MLIRVectorUtils
   )
+set_target_properties(obj.MLIRVectorTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
@@ -70,3 +70,4 @@ add_mlir_library(MLIRIR
   MLIRSupport
   )
 
+set_target_properties(obj.MLIRIR PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
@@ -22,3 +22,4 @@ add_mlir_library(MLIRSupport
 
   LINK_LIBS PUBLIC
   ${LLVM_PTHREAD_LIB})
+set_target_properties(obj.MLIRSupport PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/TableGen/CMakeLists.txt b/mlir/lib/TableGen/CMakeLists.txt
@@ -41,7 +41,7 @@ llvm_add_library(MLIRTableGen STATIC
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/TableGen
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
 )
-set_target_properties(MLIRTableGen PROPERTIES FOLDER "MLIR/Tablegenning")
+set_target_properties(MLIRTableGen PROPERTIES FOLDER "MLIR/Tablegenning" UNITY_BUILD_BATCH_SIZE 1)
 
 mlir_check_all_link_libraries(MLIRTableGen)
 
diff --git a/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt b/mlir/lib/Tools/PDLL/CodeGen/CMakeLists.txt
@@ -8,3 +8,4 @@ add_mlir_library(MLIRPDLLCodeGen
   MLIRPDLDialect
   MLIRSupport
   )
+set_target_properties(obj.MLIRPDLLCodeGen PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
@@ -39,3 +39,5 @@ add_mlir_library(MLIRTransforms
   MLIRTransformUtils
   MLIRUBDialect
   )
+
+set_target_properties(obj.MLIRTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -24,3 +24,5 @@ add_mlir_library(MLIRTransformUtils
   MLIRSubsetOpInterface
   MLIRRewrite
   )
+
+set_target_properties(obj.MLIRTransformUtils PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Analysis/CMakeLists.txt b/mlir/test/lib/Analysis/CMakeLists.txt
@@ -36,3 +36,6 @@ target_include_directories(MLIRTestAnalysis
   ${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
   )
+
+
+set_target_properties(MLIRTestAnalysis PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt b/mlir/test/lib/Conversion/FuncToLLVM/CMakeLists.txt
@@ -21,3 +21,4 @@ target_include_directories(MLIRTestFuncToLLVM
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../../Dialect/Test
   )
+set_target_properties(MLIRTestFuncToLLVM PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Dialect/Affine/CMakeLists.txt b/mlir/test/lib/Dialect/Affine/CMakeLists.txt
@@ -42,3 +42,4 @@ target_include_directories(MLIRAffineTransformsTestPasses
   ${CMAKE_CURRENT_BINARY_DIR}/../Test
   )
 
+set_target_properties(MLIRAffineTransformsTestPasses PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Dialect/Bufferization/CMakeLists.txt b/mlir/test/lib/Dialect/Bufferization/CMakeLists.txt
@@ -18,3 +18,5 @@ target_include_directories(MLIRBufferizationTestPasses
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../../Dialect/Test
   )
+
+set_target_properties(MLIRBufferizationTestPasses PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt
@@ -95,6 +95,7 @@ mlir_target_link_libraries(MLIRTestDialect PUBLIC
   MLIRValueBoundsOpInterface
   MLIRBufferizationDialect
 )
+set_target_properties(MLIRTestDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
 
 add_mlir_translation_library(MLIRTestFromLLVMIRTranslation
   TestFromLLVMIRTranslation.cpp
diff --git a/mlir/test/lib/Dialect/Transform/CMakeLists.txt b/mlir/test/lib/Dialect/Transform/CMakeLists.txt
@@ -26,3 +26,5 @@ mlir_target_link_libraries(MLIRTestTransformDialect PUBLIC
   MLIRTransformLoopExtension
   MLIRTransformPDLExtension
 )
+
+set_target_properties(MLIRTestTransformDialect PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt
@@ -44,3 +44,4 @@ target_include_directories(MLIRTestIR
   ${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
   )
+set_target_properties(MLIRTestIR PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Pass/CMakeLists.txt b/mlir/test/lib/Pass/CMakeLists.txt
@@ -27,3 +27,4 @@ target_include_directories(MLIRTestPass
   ${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
   )
+set_target_properties(MLIRTestPass PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -59,3 +59,5 @@ target_include_directories(MLIRTestTransforms
   ${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test
   ${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test
   )
+
+set_target_properties(MLIRTestTransforms PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
diff --git a/mlir/tools/mlir-tblgen/CMakeLists.txt b/mlir/tools/mlir-tblgen/CMakeLists.txt
@@ -39,5 +39,6 @@ add_tablegen(mlir-tblgen MLIR
 target_link_libraries(mlir-tblgen
   PRIVATE
   MLIRTblgenLib)
+set_target_properties(mlir-tblgen PROPERTIES UNITY_BUILD_BATCH_SIZE 1)
 
 mlir_check_all_link_libraries(mlir-tblgen)

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,5 @@ add_llvm_component_library(LLVMDemangle`
`10`	`10`	`"${LLVM_MAIN_INCLUDE_DIR}/llvm/Demangle"`
`11`	`11`
`12`	`12`	`)`
	`13`	`+`
	`14`	`+set_target_properties(LLVMDemangle PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,5 @@ target_include_directories(LLVMTableGenBasic`
`27`	`27`	`INTERFACE`
`28`	`28`	`$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>`
`29`	`29`	`)`
	`30`	`+`
	`31`	`+set_target_properties(LLVMTableGenBasic PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -60,3 +60,4 @@ add_mlir_library(MLIRAnalysis`
`60`	`60`	`MLIRViewLikeInterface`
`61`	`61`	`)`
`62`	`62`
	`63`	`+set_target_properties(obj.MLIRAnalysis PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,5 @@ add_mlir_conversion_library(MLIRLLVMCommonConversion`
`17`	`17`	`MLIRSupport`
`18`	`18`	`MLIRTransforms`
`19`	`19`	`)`
	`20`	`+`
	`21`	`+set_target_properties(obj.MLIRLLVMCommonConversion PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,5 @@ add_mlir_conversion_library(MLIRSCFToGPU`
`22`	`22`	`MLIRSideEffectInterfaces`
`23`	`23`	`MLIRTransforms`
`24`	`24`	`)`
	`25`	`+`
	`26`	`+set_target_properties(obj.MLIRSCFToGPU PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,4 @@ add_mlir_conversion_library(MLIRShapeToStandard`
`25`	`25`	`MLIRSCFDialect`
`26`	`26`	`MLIRTransforms`
`27`	`27`	`)`
	`28`	`+set_target_properties(obj.MLIRShapeToStandard PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,4 @@ add_mlir_library(MLIRDebug`
`17`	`17`	`MLIRObservers`
`18`	`18`	`)`
`19`	`19`
	`20`	`+set_target_properties(obj.MLIRDebug PROPERTIES UNITY_BUILD_BATCH_SIZE 1)`