[llvm] r209269 - [modules] Add module maps for LLVM. These are not quite ready for prime-time
Alp Toker
alp at nuanti.com
Tue May 20 21:14:02 PDT 2014
On 21/05/2014 05:46, Richard Smith wrote:
> Author: rsmith
> Date: Tue May 20 21:46:14 2014
> New Revision: 209269
>
> URL: http://llvm.org/viewvc/llvm-project?rev=209269&view=rev
> Log:
> [modules] Add module maps for LLVM. These are not quite ready for prime-time
> yet, but only a few more Clang patches need to land. (I have 'ninja check'
> passing locally.)
>
> Added:
> llvm/trunk/include/llvm-c/module.modulemap
> llvm/trunk/include/llvm/module.modulemap
> llvm/trunk/include/llvm/module.modulemap.build
> llvm/trunk/lib/AsmParser/module.modulemap
> llvm/trunk/lib/Bitcode/module.modulemap
> llvm/trunk/lib/CodeGen/module.modulemap
> llvm/trunk/lib/DebugInfo/module.modulemap
> llvm/trunk/lib/IR/module.modulemap
> llvm/trunk/lib/TableGen/module.modulemap
> llvm/trunk/utils/TableGen/module.modulemap
And the award for silliest filename goes to..
> Modified:
> llvm/trunk/include/llvm/CMakeLists.txt
>
> Added: llvm/trunk/include/llvm-c/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm-c/module.modulemap (added)
> +++ llvm/trunk/include/llvm-c/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1,5 @@
> +module LLVM_C {
> + requires cplusplus
> + umbrella "."
> + module * { export * }
> +}
>
> Modified: llvm/trunk/include/llvm/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CMakeLists.txt?rev=209269&r1=209268&r2=209269&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/CMakeLists.txt (original)
> +++ llvm/trunk/include/llvm/CMakeLists.txt Tue May 20 21:46:14 2014
> @@ -12,3 +12,9 @@ if( MSVC_IDE OR XCODE )
> set_target_properties(llvm_headers_do_not_build PROPERTIES FOLDER "Misc"
> EXCLUDE_FROM_DEFAULT_BUILD ON)
> endif()
> +
> +# If we're doing an out-of-tree build, copy a module map for generated
> +# header files into the build area.
> +if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
> + configure_file(module.modulemap.build module.modulemap COPYONLY)
> +endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
>
> Added: llvm/trunk/include/llvm/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/module.modulemap (added)
> +++ llvm/trunk/include/llvm/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1,177 @@
> +module LLVM_Analysis {
> + requires cplusplus
> + umbrella "Analysis"
> + module * { export * }
> + exclude header "Analysis/BlockFrequencyInfoImpl.h"
> +}
> +
> +module LLVM_AsmParser { requires cplusplus umbrella "AsmParser" module * { export * } }
> +
> +// A module covering CodeGen/ and Target/. These are intertwined
> +// and codependent, and thus notionally form a single module.
> +module LLVM_Backend {
> + requires cplusplus
> +
> + module CodeGen {
> + umbrella "CodeGen"
> + module * { export * }
> +
> + // FIXME: Why is this excluded?
> + exclude header "CodeGen/MachineValueType.h"
> +
> + // Exclude these; they're intended to be included into only a single
> + // translation unit (or none) and aren't part of this module.
> + exclude header "CodeGen/CommandFlags.h"
> + exclude header "CodeGen/LinkAllAsmWriterComponents.h"
> + exclude header "CodeGen/LinkAllCodegenComponents.h"
> + }
> +
> + module Target {
> + umbrella "Target"
> + module * { export * }
> + }
> +
> + // FIXME: Where should this go?
> + module Analysis_BlockFrequencyInfoImpl {
> + header "Analysis/BlockFrequencyInfoImpl.h"
> + export *
> + }
> +}
> +
> +module LLVM_Bitcode { requires cplusplus umbrella "Bitcode" module * { export * } }
> +module LLVM_Config { requires cplusplus umbrella "Config" module * { export * } }
> +module LLVM_DebugInfo { requires cplusplus umbrella "DebugInfo" module * { export * } }
> +module LLVM_ExecutionEngine {
> + requires cplusplus
> +
> + umbrella "ExecutionEngine"
> + module * { export * }
> +
> + // Exclude this; it's an optional component of the ExecutionEngine.
> + exclude header "ExecutionEngine/OProfileWrapper.h"
> +
> + // Exclude these; they're intended to be included into only a single
> + // translation unit (or none) and aren't part of this module.
> + exclude header "ExecutionEngine/JIT.h"
> + exclude header "ExecutionEngine/MCJIT.h"
> + exclude header "ExecutionEngine/Interpreter.h"
> +}
> +
> +module LLVM_IR {
> + requires cplusplus
> +
> + // FIXME: Is this the right place for these?
> + module Pass { header "Pass.h" export * }
> + module PassSupport { header "PassSupport.h" export * }
> + module PassAnalysisSupport { header "PassAnalysisSupport.h" export * }
> + module PassRegistry { header "PassRegistry.h" export * }
> + module InitializePasses { header "InitializePasses.h" export * }
> +
> + umbrella "IR"
> + module * { export * }
> +
> + // We cannot have llvm/PassManager.h and llvm/IR/PassManager.h in the same TU,
> + // so we can't include llvm/IR/PassManager.h in the IR module.
> + exclude header "IR/PassManager.h"
> + exclude header "IR/LegacyPassManager.h"
> +
> + // Exclude this; it's intended for (repeated) textual inclusion.
> + exclude header "IR/Instruction.def"
> +}
> +
> +module LLVM_LegacyPassManager {
> + requires cplusplus
> + module CompatInterface { header "PassManager.h" export * }
> + module Implementation { header "IR/LegacyPassManager.h" export * }
> +}
> +
> +module LLVM_IR_PassManager {
> + requires cplusplus
> + // FIXME PR19358: This doesn't work! conflict LLVM_LegacyPassManager, "cannot use legacy pass manager and new pass manager in same file"
> + header "IR/PassManager.h"
> + export *
> +}
> +
> +module LLVM_IRReader { requires cplusplus umbrella "IRReader" module * { export * } }
> +module LLVM_LineEditor { requires cplusplus umbrella "LineEditor" module * { export * } }
> +module LLVM_LTO { requires cplusplus umbrella "LTO" module * { export * } }
> +
> +module LLVM_MC {
> + requires cplusplus
> +
> + // FIXME: Mislayered?
> + module Support_TargetRegistry {
> + header "Support/TargetRegistry.h"
> + export *
> + }
> +
> + umbrella "MC"
> + module * { export * }
> +
> + // Exclude this; it's fundamentally non-modular.
> + exclude header "MC/MCTargetOptionsCommandFlags.h"
> +}
> +
> +module LLVM_Object { requires cplusplus umbrella "Object" module * { export * } }
> +module LLVM_Option { requires cplusplus umbrella "Option" module * { export * } }
> +module LLVM_TableGen { requires cplusplus umbrella "TableGen" module * { export * } }
> +
> +module LLVM_Transforms {
> + requires cplusplus
> + umbrella "Transforms"
> + module * { export * }
> +
> + // FIXME: Excluded because it does bad things with the legacy pass manager.
> + exclude header "Transforms/IPO/PassManagerBuilder.h"
> +}
> +
> +// A module covering ADT/ and Support/. These are intertwined and
> +// codependent, and notionally form a single module.
> +module LLVM_Utils {
> + module ADT {
> + requires cplusplus
> +
> + umbrella "ADT"
> + module * { export * }
> + }
> +
> + module Support {
> + requires cplusplus
> +
> + umbrella "Support"
> + module * { export * }
> +
> + // Exclude this; it's only included on Solaris.
> + exclude header "Support/Solaris.h"
> +
> + // Exclude this; it's only included on AIX and fundamentally non-modular.
> + exclude header "Support/AIXDataTypesFix.h"
> +
> + // Exclude this; it's fundamentally non-modular.
> + exclude header "Support/Debug.h"
> +
> + // Exclude this; it's fundamentally non-modular.
> + exclude header "Support/PluginLoader.h"
> +
> + // Exclude this; it's a weirdly-factored part of llvm-gcov and conflicts
> + // with the Analysis module (which also defines an llvm::GCOVOptions).
> + exclude header "Support/GCOV.h"
> +
> + // FIXME: Mislayered?
> + exclude header "Support/TargetRegistry.h"
> + }
> +}
> +
> +module LLVM_CodeGen_MachineValueType {
> + requires cplusplus
> + header "CodeGen/MachineValueType.h"
> + export *
> +}
> +
> +// This is used for a $src == $build compilation. Otherwise we use
> +// LLVM_Support_DataTypes_Build, defined in a module map that is
> +// copied into the build area.
> +module LLVM_Support_DataTypes_Src {
> + header "llvm/Support/DataTypes.h"
> + export *
> +}
>
> Added: llvm/trunk/include/llvm/module.modulemap.build
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap.build?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/module.modulemap.build (added)
> +++ llvm/trunk/include/llvm/module.modulemap.build Tue May 20 21:46:14 2014
> @@ -0,0 +1,5 @@
> +// This is copied into the build area for a $src != $build compilation.
> +module LLVM_Support_DataTypes {
> + header "Support/DataTypes.h"
> + export *
> +}
>
> Added: llvm/trunk/lib/AsmParser/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/module.modulemap (added)
> +++ llvm/trunk/lib/AsmParser/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module AsmParser { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/lib/Bitcode/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/module.modulemap (added)
> +++ llvm/trunk/lib/Bitcode/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module Bitcode { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/lib/CodeGen/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/module.modulemap (added)
> +++ llvm/trunk/lib/CodeGen/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module CodeGen { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/lib/DebugInfo/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/DebugInfo/module.modulemap (added)
> +++ llvm/trunk/lib/DebugInfo/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module DebugInfo { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/lib/IR/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/IR/module.modulemap (added)
> +++ llvm/trunk/lib/IR/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module IR { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/lib/TableGen/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/lib/TableGen/module.modulemap (added)
> +++ llvm/trunk/lib/TableGen/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1 @@
> +module TableGen { requires cplusplus umbrella "." module * { export * } }
>
> Added: llvm/trunk/utils/TableGen/module.modulemap
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/module.modulemap?rev=209269&view=auto
> ==============================================================================
> --- llvm/trunk/utils/TableGen/module.modulemap (added)
> +++ llvm/trunk/utils/TableGen/module.modulemap Tue May 20 21:46:14 2014
> @@ -0,0 +1,4 @@
> +module TableGen {
> + umbrella "."
> + module * { export * }
> +}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
--
http://www.nuanti.com
the browser experts
More information about the llvm-commits
mailing list