From aaf66c73570447c23114cecf01f21705815f5ccd Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 6 Aug 2013 06:38:37 +0000 Subject: [PATCH] Target/*/CMakeLists.txt: Add the dependency to CommonTableGen explicitly for each corresponding CodeGen. Without explicit dependencies, both per-file action and in-CommonTableGen action could run in parallel. It races to emit *.inc files simultaneously. llvm-svn: 187780 --- llvm/lib/Target/AArch64/CMakeLists.txt | 2 ++ llvm/lib/Target/ARM/CMakeLists.txt | 2 +- llvm/lib/Target/Hexagon/CMakeLists.txt | 4 ++-- llvm/lib/Target/MSP430/CMakeLists.txt | 2 +- llvm/lib/Target/Mips/CMakeLists.txt | 2 +- llvm/lib/Target/NVPTX/CMakeLists.txt | 2 +- llvm/lib/Target/PowerPC/CMakeLists.txt | 2 +- llvm/lib/Target/R600/CMakeLists.txt | 2 +- llvm/lib/Target/Sparc/CMakeLists.txt | 2 +- llvm/lib/Target/SystemZ/CMakeLists.txt | 2 +- llvm/lib/Target/X86/CMakeLists.txt | 2 +- llvm/lib/Target/XCore/CMakeLists.txt | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/llvm/lib/Target/AArch64/CMakeLists.txt b/llvm/lib/Target/AArch64/CMakeLists.txt index 8164d6f73c97..0f2e81693198 100644 --- a/llvm/lib/Target/AArch64/CMakeLists.txt +++ b/llvm/lib/Target/AArch64/CMakeLists.txt @@ -28,6 +28,8 @@ add_llvm_target(AArch64CodeGen AArch64TargetObjectFile.cpp ) +add_dependencies(LLVMAArch64CodeGen AArch64CommonTableGen) + add_subdirectory(AsmParser) add_subdirectory(Disassembler) add_subdirectory(InstPrinter) diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt index b832508a086c..f271a932b540 100644 --- a/llvm/lib/Target/ARM/CMakeLists.txt +++ b/llvm/lib/Target/ARM/CMakeLists.txt @@ -49,7 +49,7 @@ add_llvm_target(ARMCodeGen Thumb2SizeReduction.cpp ) -add_dependencies(LLVMARMCodeGen intrinsics_gen) +add_dependencies(LLVMARMCodeGen ARMCommonTableGen intrinsics_gen) # workaround for hanging compilation on MSVC9, 10 if( MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1500 ) diff --git a/llvm/lib/Target/Hexagon/CMakeLists.txt b/llvm/lib/Target/Hexagon/CMakeLists.txt index 57044b27d67f..2b797910e435 100644 --- a/llvm/lib/Target/Hexagon/CMakeLists.txt +++ b/llvm/lib/Target/Hexagon/CMakeLists.txt @@ -9,8 +9,6 @@ tablegen(LLVM HexagonGenSubtargetInfo.inc -gen-subtarget) tablegen(LLVM HexagonGenDFAPacketizer.inc -gen-dfa-packetizer) add_public_tablegen_target(HexagonCommonTableGen) -set(LLVM_COMMON_DEPENDS intrinsics_gen) - add_llvm_target(HexagonCodeGen HexagonAsmPrinter.cpp HexagonCallingConvLower.cpp @@ -38,6 +36,8 @@ add_llvm_target(HexagonCodeGen HexagonCopyToCombine.cpp ) +add_dependencies(LLVMHexagonCodeGen HexagonCommonTableGen intrinsics_gen) + add_subdirectory(TargetInfo) add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/MSP430/CMakeLists.txt b/llvm/lib/Target/MSP430/CMakeLists.txt index f9ecaed83a6f..c9b3c3d0c8e3 100644 --- a/llvm/lib/Target/MSP430/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/CMakeLists.txt @@ -23,7 +23,7 @@ add_llvm_target(MSP430CodeGen MSP430MCInstLower.cpp ) -add_dependencies(LLVMMSP430CodeGen intrinsics_gen) +add_dependencies(LLVMMSP430CodeGen MSP430CommonTableGen intrinsics_gen) add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) diff --git a/llvm/lib/Target/Mips/CMakeLists.txt b/llvm/lib/Target/Mips/CMakeLists.txt index 6bca90082b48..aedb78bc4965 100644 --- a/llvm/lib/Target/Mips/CMakeLists.txt +++ b/llvm/lib/Target/Mips/CMakeLists.txt @@ -48,7 +48,7 @@ add_llvm_target(MipsCodeGen MipsSelectionDAGInfo.cpp ) -add_dependencies(LLVMMipsCodeGen intrinsics_gen) +add_dependencies(LLVMMipsCodeGen MipsCommonTableGen intrinsics_gen) add_subdirectory(InstPrinter) add_subdirectory(Disassembler) diff --git a/llvm/lib/Target/NVPTX/CMakeLists.txt b/llvm/lib/Target/NVPTX/CMakeLists.txt index a8293da7607f..be8d323c384d 100644 --- a/llvm/lib/Target/NVPTX/CMakeLists.txt +++ b/llvm/lib/Target/NVPTX/CMakeLists.txt @@ -29,7 +29,7 @@ set(NVPTXCodeGen_sources add_llvm_target(NVPTXCodeGen ${NVPTXCodeGen_sources}) -add_dependencies(LLVMNVPTXCodeGen intrinsics_gen) +add_dependencies(LLVMNVPTXCodeGen NVPTXCommonTableGen intrinsics_gen) add_subdirectory(TargetInfo) add_subdirectory(InstPrinter) diff --git a/llvm/lib/Target/PowerPC/CMakeLists.txt b/llvm/lib/Target/PowerPC/CMakeLists.txt index 737b52174e25..9a763f53a2d1 100644 --- a/llvm/lib/Target/PowerPC/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/CMakeLists.txt @@ -34,7 +34,7 @@ add_llvm_target(PowerPCCodeGen PPCSelectionDAGInfo.cpp ) -add_dependencies(LLVMPowerPCCodeGen intrinsics_gen) +add_dependencies(LLVMPowerPCCodeGen PowerPCCommonTableGen intrinsics_gen) add_subdirectory(AsmParser) add_subdirectory(InstPrinter) diff --git a/llvm/lib/Target/R600/CMakeLists.txt b/llvm/lib/Target/R600/CMakeLists.txt index 40d255a3e8ac..48f001bb2701 100644 --- a/llvm/lib/Target/R600/CMakeLists.txt +++ b/llvm/lib/Target/R600/CMakeLists.txt @@ -48,7 +48,7 @@ add_llvm_target(R600CodeGen SIRegisterInfo.cpp ) -add_dependencies(LLVMR600CodeGen intrinsics_gen) +add_dependencies(LLVMR600CodeGen AMDGPUCommonTableGen intrinsics_gen) add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) diff --git a/llvm/lib/Target/Sparc/CMakeLists.txt b/llvm/lib/Target/Sparc/CMakeLists.txt index 0ab7a1c88e03..acf749655811 100644 --- a/llvm/lib/Target/Sparc/CMakeLists.txt +++ b/llvm/lib/Target/Sparc/CMakeLists.txt @@ -22,7 +22,7 @@ add_llvm_target(SparcCodeGen SparcSelectionDAGInfo.cpp ) -add_dependencies(LLVMSparcCodeGen intrinsics_gen) +add_dependencies(LLVMSparcCodeGen SparcCommonTableGen intrinsics_gen) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/llvm/lib/Target/SystemZ/CMakeLists.txt b/llvm/lib/Target/SystemZ/CMakeLists.txt index cd01f1a56185..ab657f648b03 100644 --- a/llvm/lib/Target/SystemZ/CMakeLists.txt +++ b/llvm/lib/Target/SystemZ/CMakeLists.txt @@ -28,7 +28,7 @@ add_llvm_target(SystemZCodeGen SystemZTargetMachine.cpp ) -add_dependencies(LLVMSystemZCodeGen intrinsics_gen) +add_dependencies(LLVMSystemZCodeGen SystemZCommonTableGen intrinsics_gen) add_subdirectory(AsmParser) add_subdirectory(Disassembler) diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt index 7cb71f066cca..7e20151a19fc 100644 --- a/llvm/lib/Target/X86/CMakeLists.txt +++ b/llvm/lib/Target/X86/CMakeLists.txt @@ -53,7 +53,7 @@ endif() add_llvm_target(X86CodeGen ${sources}) -add_dependencies(LLVMX86CodeGen intrinsics_gen) +add_dependencies(LLVMX86CodeGen X86CommonTableGen intrinsics_gen) add_subdirectory(AsmParser) add_subdirectory(Disassembler) diff --git a/llvm/lib/Target/XCore/CMakeLists.txt b/llvm/lib/Target/XCore/CMakeLists.txt index d5bfddc23e0f..85d2a1ddda16 100644 --- a/llvm/lib/Target/XCore/CMakeLists.txt +++ b/llvm/lib/Target/XCore/CMakeLists.txt @@ -25,7 +25,7 @@ add_llvm_target(XCoreCodeGen XCoreSelectionDAGInfo.cpp ) -add_dependencies(LLVMXCoreCodeGen intrinsics_gen) +add_dependencies(LLVMXCoreCodeGen XCoreCommonTableGen intrinsics_gen) add_subdirectory(Disassembler) add_subdirectory(InstPrinter)