From b0c594fd422417e1e290da166b566c7bee74644b Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 12 Dec 2011 22:45:54 +0000 Subject: [PATCH] LLVMBuild: Introduce a common section which currently has a list of the subdirectories to traverse into. - Originally I wanted to avoid this and just autoscan, but this has one key flaw in that new subdirectories can not automatically trigger a rerun of the llvm-build tool. This is particularly a pain when switching back and forth between trees where one has added a subdirectory, as the dependencies will tend to be wrong. This will also eliminates FIXME implicitly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146436 91177308-0d34-0410-b5e6-96231b3b80d8 --- LLVMBuild.txt | 3 ++ lib/Analysis/LLVMBuild.txt | 3 ++ lib/Bitcode/LLVMBuild.txt | 3 ++ lib/CodeGen/LLVMBuild.txt | 3 ++ lib/ExecutionEngine/LLVMBuild.txt | 3 ++ lib/LLVMBuild.txt | 3 ++ lib/MC/LLVMBuild.txt | 3 ++ lib/Target/ARM/LLVMBuild.txt | 3 ++ lib/Target/CBackend/LLVMBuild.txt | 3 ++ lib/Target/CellSPU/LLVMBuild.txt | 3 ++ lib/Target/CppBackend/LLVMBuild.txt | 3 ++ lib/Target/Hexagon/LLVMBuild.txt | 6 ++- lib/Target/Hexagon/TargetInfo/LLVMBuild.txt | 1 - lib/Target/LLVMBuild.txt | 3 ++ lib/Target/MBlaze/LLVMBuild.txt | 3 ++ lib/Target/MSP430/LLVMBuild.txt | 3 ++ lib/Target/Mips/LLVMBuild.txt | 3 ++ lib/Target/PTX/LLVMBuild.txt | 3 ++ lib/Target/PowerPC/LLVMBuild.txt | 3 ++ lib/Target/Sparc/LLVMBuild.txt | 3 ++ lib/Target/X86/LLVMBuild.txt | 3 ++ lib/Target/XCore/LLVMBuild.txt | 3 ++ lib/Transforms/LLVMBuild.txt | 3 ++ tools/LLVMBuild.txt | 3 ++ utils/LLVMBuild.txt | 3 ++ utils/llvm-build/llvmbuild/main.py | 46 +++++++++++++++++---- 26 files changed, 112 insertions(+), 10 deletions(-) diff --git a/LLVMBuild.txt b/LLVMBuild.txt index 63ca344908a..e763fd2afee 100644 --- a/LLVMBuild.txt +++ b/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = bindings docs examples lib projects runtime tools utils + [component_0] type = Group name = Miscellaneous diff --git a/lib/Analysis/LLVMBuild.txt b/lib/Analysis/LLVMBuild.txt index eddcc170bb6..a8a8079d1e5 100644 --- a/lib/Analysis/LLVMBuild.txt +++ b/lib/Analysis/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = IPA + [component_0] type = Library name = Analysis diff --git a/lib/Bitcode/LLVMBuild.txt b/lib/Bitcode/LLVMBuild.txt index ffea08ae4eb..af9936bbe82 100644 --- a/lib/Bitcode/LLVMBuild.txt +++ b/lib/Bitcode/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = Reader Writer + [component_0] type = Group name = Bitcode diff --git a/lib/CodeGen/LLVMBuild.txt b/lib/CodeGen/LLVMBuild.txt index 60334c6ffb9..fee0347ea65 100644 --- a/lib/CodeGen/LLVMBuild.txt +++ b/lib/CodeGen/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = AsmPrinter SelectionDAG + [component_0] type = Library name = CodeGen diff --git a/lib/ExecutionEngine/LLVMBuild.txt b/lib/ExecutionEngine/LLVMBuild.txt index f16c98574fe..d4269692c7c 100644 --- a/lib/ExecutionEngine/LLVMBuild.txt +++ b/lib/ExecutionEngine/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = Interpreter JIT MCJIT RuntimeDyld + [component_0] type = Library name = ExecutionEngine diff --git a/lib/LLVMBuild.txt b/lib/LLVMBuild.txt index 50fb23c6178..e22b8cd406b 100644 --- a/lib/LLVMBuild.txt +++ b/lib/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = Analysis Archive AsmParser Bitcode CodeGen DebugInfo ExecutionEngine Linker MC Object Support TableGen Target Transforms VMCore + [component_0] type = Group name = Libraries diff --git a/lib/MC/LLVMBuild.txt b/lib/MC/LLVMBuild.txt index c8cc3d51aad..f35dbe4d5d3 100644 --- a/lib/MC/LLVMBuild.txt +++ b/lib/MC/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = MCDisassembler MCParser + [component_0] type = Library name = MC diff --git a/lib/Target/ARM/LLVMBuild.txt b/lib/Target/ARM/LLVMBuild.txt index de7af054ab2..fd4b3a33de1 100644 --- a/lib/Target/ARM/LLVMBuild.txt +++ b/lib/Target/ARM/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = ARM diff --git a/lib/Target/CBackend/LLVMBuild.txt b/lib/Target/CBackend/LLVMBuild.txt index ce9327a62b4..e64feb0e605 100644 --- a/lib/Target/CBackend/LLVMBuild.txt +++ b/lib/Target/CBackend/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = TargetInfo + [component_0] type = TargetGroup name = CBackend diff --git a/lib/Target/CellSPU/LLVMBuild.txt b/lib/Target/CellSPU/LLVMBuild.txt index 4071fa68fc2..277620bf4e5 100644 --- a/lib/Target/CellSPU/LLVMBuild.txt +++ b/lib/Target/CellSPU/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = CellSPU diff --git a/lib/Target/CppBackend/LLVMBuild.txt b/lib/Target/CppBackend/LLVMBuild.txt index 49358309dd0..122b5e7502f 100644 --- a/lib/Target/CppBackend/LLVMBuild.txt +++ b/lib/Target/CppBackend/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = TargetInfo + [component_0] type = TargetGroup name = CppBackend diff --git a/lib/Target/Hexagon/LLVMBuild.txt b/lib/Target/Hexagon/LLVMBuild.txt index a9524dbfb40..ed64aaa6d17 100644 --- a/lib/Target/Hexagon/LLVMBuild.txt +++ b/lib/Target/Hexagon/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./lib/Target/Hexagon/LLVMBuild.txt ----------------------*- Conf -*--===; +;===- ./lib/Target/Hexagon/LLVMBuild.txt -----------------------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = TargetInfo + [component_0] type = TargetGroup name = Hexagon @@ -27,4 +30,3 @@ name = HexagonCodeGen parent = Hexagon required_libraries = AsmPrinter CodeGen Core HexagonInfo SelectionDAG Support Target MC add_to_library_groups = Hexagon - diff --git a/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt b/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt index b5d0972f15d..7b87be3e05a 100644 --- a/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt +++ b/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt @@ -21,4 +21,3 @@ name = HexagonInfo parent = Hexagon required_libraries = MC Support add_to_library_groups = Hexagon - diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt index 358cbc81d57..5a42ca5efb0 100644 --- a/lib/Target/LLVMBuild.txt +++ b/lib/Target/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = ARM CBackend CellSPU CppBackend Hexagon MBlaze MSP430 Mips PTX PowerPC Sparc X86 XCore + ; This is a special group whose required libraries are extended (by llvm-build) ; with the best execution engine (the native JIT, if available, or the ; interpreter). diff --git a/lib/Target/MBlaze/LLVMBuild.txt b/lib/Target/MBlaze/LLVMBuild.txt index 426e98ff807..0b290076a4e 100644 --- a/lib/Target/MBlaze/LLVMBuild.txt +++ b/lib/Target/MBlaze/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = MBlaze diff --git a/lib/Target/MSP430/LLVMBuild.txt b/lib/Target/MSP430/LLVMBuild.txt index 7cd4b7c713e..51d9702ac56 100644 --- a/lib/Target/MSP430/LLVMBuild.txt +++ b/lib/Target/MSP430/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = MSP430 diff --git a/lib/Target/Mips/LLVMBuild.txt b/lib/Target/Mips/LLVMBuild.txt index 7609e788df5..bcd32bc0005 100644 --- a/lib/Target/Mips/LLVMBuild.txt +++ b/lib/Target/Mips/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = Mips diff --git a/lib/Target/PTX/LLVMBuild.txt b/lib/Target/PTX/LLVMBuild.txt index 5cf694ca351..15a1eb53283 100644 --- a/lib/Target/PTX/LLVMBuild.txt +++ b/lib/Target/PTX/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = PTX diff --git a/lib/Target/PowerPC/LLVMBuild.txt b/lib/Target/PowerPC/LLVMBuild.txt index 6287ce2a4a9..95fac5471ec 100644 --- a/lib/Target/PowerPC/LLVMBuild.txt +++ b/lib/Target/PowerPC/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = InstPrinter MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = PowerPC diff --git a/lib/Target/Sparc/LLVMBuild.txt b/lib/Target/Sparc/LLVMBuild.txt index 320ba839a9e..fe20d2f4bd1 100644 --- a/lib/Target/Sparc/LLVMBuild.txt +++ b/lib/Target/Sparc/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = Sparc diff --git a/lib/Target/X86/LLVMBuild.txt b/lib/Target/X86/LLVMBuild.txt index ac7a3cd21da..87305e0e5f5 100644 --- a/lib/Target/X86/LLVMBuild.txt +++ b/lib/Target/X86/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo Utils + [component_0] type = TargetGroup name = X86 diff --git a/lib/Target/XCore/LLVMBuild.txt b/lib/Target/XCore/LLVMBuild.txt index 35eb4f32abf..53b4a9e3f5f 100644 --- a/lib/Target/XCore/LLVMBuild.txt +++ b/lib/Target/XCore/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = MCTargetDesc TargetInfo + [component_0] type = TargetGroup name = XCore diff --git a/lib/Transforms/LLVMBuild.txt b/lib/Transforms/LLVMBuild.txt index 255e0409edf..b2ef49a4c63 100644 --- a/lib/Transforms/LLVMBuild.txt +++ b/lib/Transforms/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = IPO InstCombine Instrumentation Scalar Utils + [component_0] type = Group name = Transforms diff --git a/tools/LLVMBuild.txt b/tools/LLVMBuild.txt index 195546be486..aba990f5211 100644 --- a/tools/LLVMBuild.txt +++ b/tools/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = bugpoint llc lli llvm-ar llvm-as llvm-bcanalyzer llvm-cov llvm-diff llvm-dis llvm-dwarfdump llvm-extract llvm-ld llvm-link llvm-mc llvm-nm llvm-objdump llvm-prof llvm-ranlib llvm-rtdyld llvm-size llvm-stub macho-dump opt + [component_0] type = Group name = Tools diff --git a/utils/LLVMBuild.txt b/utils/LLVMBuild.txt index 3fc90e9389b..382bfd31447 100644 --- a/utils/LLVMBuild.txt +++ b/utils/LLVMBuild.txt @@ -15,6 +15,9 @@ ; ;===------------------------------------------------------------------------===; +[common] +subdirectories = TableGen unittest + [component_0] type = Group name = BuildTools diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py index 550c7403034..279a10f5f19 100644 --- a/utils/llvm-build/llvmbuild/main.py +++ b/utils/llvm-build/llvmbuild/main.py @@ -214,14 +214,45 @@ class LLVMProjectInfo(object): info_basedir[ci.subpath] = info_basedir.get(ci.subpath, []) + [ci] + # Compute the list of subdirectories to scan. + subpath_subdirs = {} + for ci in self.component_infos: + # Ignore root components. + if ci.subpath == '/': + continue + + # Otherwise, append this subpath to the parent list. + parent_path = os.path.dirname(ci.subpath) + subpath_subdirs[parent_path] = parent_list = subpath_subdirs.get( + parent_path, set()) + parent_list.add(os.path.basename(ci.subpath)) + # Generate the build files. for subpath, infos in info_basedir.items(): # Order the components by name to have a canonical ordering. infos.sort(key = lambda ci: ci.name) # Format the components into llvmbuild fragments. - fragments = filter(None, [ci.get_llvmbuild_fragment() - for ci in infos]) + fragments = [] + + # Add the common fragments. + subdirectories = subpath_subdirs.get(subpath) + if subdirectories: + fragment = """\ +subdirectories = %s +""" % (" ".join(sorted(subdirectories)),) + fragments.append(("common", fragment)) + + # Add the component fragments. + num_common_fragments = len(fragments) + for ci in infos: + fragment = ci.get_llvmbuild_fragment() + if fragment is None: + continue + + name = "component_%d" % (len(fragments) - num_common_fragments) + fragments.append((name, fragment)) + if not fragments: continue @@ -242,7 +273,7 @@ class LLVMProjectInfo(object): if ln.startswith(';'): comment_block += ln elif ln.startswith('[') and ln.endswith(']\n'): - comments_map[ln[:-1]] = comment_block + comments_map[ln[1:-2]] = comment_block else: comment_block = "" f.close() @@ -275,15 +306,16 @@ class LLVMProjectInfo(object): ;===------------------------------------------------------------------------===; """ % header_string - for i,fragment in enumerate(fragments): - name = '[component_%d]' % i + # Write out each fragment.each component fragment. + for name,fragment in fragments: comment = comments_map.get(name) if comment is not None: f.write(comment) - print >>f, name + print >>f, "[%s]" % name f.write(fragment) - if fragment is not fragments[-1]: + if fragment is not fragments[-1][1]: print >>f + f.close() def write_library_table(self, output_path): -- 2.34.1