From c6f3fc49998503fbe769260150ca441e49a0819e Mon Sep 17 00:00:00 2001 From: Stephen Neuendorffer Date: Fri, 28 Feb 2020 12:16:10 -0800 Subject: [PATCH] Revert "[MLIR] Add support for libMLIR.so" This reverts commit 1246e867164b06fc3f0de6bfaaa0922d99cb5ce9. --- mlir/CMakeLists.txt | 4 +-- mlir/cmake/modules/AddMLIR.cmake | 31 ++--------------------- mlir/lib/Analysis/CMakeLists.txt | 4 +-- mlir/lib/Dialect/CMakeLists.txt | 3 ++- mlir/lib/EDSC/CMakeLists.txt | 4 +-- mlir/lib/ExecutionEngine/CMakeLists.txt | 2 +- mlir/lib/IR/CMakeLists.txt | 2 +- mlir/lib/Parser/CMakeLists.txt | 2 +- mlir/lib/Pass/CMakeLists.txt | 2 +- mlir/lib/Quantizer/CMakeLists.txt | 6 ++--- mlir/lib/Support/CMakeLists.txt | 6 ++--- mlir/lib/Target/CMakeLists.txt | 9 +++---- mlir/lib/Transforms/CMakeLists.txt | 2 +- mlir/lib/Transforms/Utils/CMakeLists.txt | 2 +- mlir/lib/Translation/CMakeLists.txt | 2 +- mlir/tools/CMakeLists.txt | 1 - mlir/tools/mlir-opt/CMakeLists.txt | 1 - mlir/tools/mlir-shlib/CMakeLists.txt | 42 -------------------------------- mlir/tools/mlir-shlib/mlir-shlib.cpp | 1 - 19 files changed, 26 insertions(+), 100 deletions(-) delete mode 100644 mlir/tools/mlir-shlib/CMakeLists.txt delete mode 100644 mlir/tools/mlir-shlib/mlir-shlib.cpp diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt index 50c1223..5afb039 100644 --- a/mlir/CMakeLists.txt +++ b/mlir/CMakeLists.txt @@ -34,11 +34,9 @@ include_directories( ${MLIR_INCLUDE_DIR}) add_subdirectory(include/mlir) add_subdirectory(lib) +add_subdirectory(tools) add_subdirectory(unittests) add_subdirectory(test) -# Tools needs to come late to ensure that MLIR_ALL_LIBS is populated. -# Generally things after this point may depend on MLIR_ALL_LIBS or libMLIR.so. -add_subdirectory(tools) if( LLVM_INCLUDE_EXAMPLES ) add_subdirectory(examples) diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake index cd7860c..d894453 100644 --- a/mlir/cmake/modules/AddMLIR.cmake +++ b/mlir/cmake/modules/AddMLIR.cmake @@ -49,41 +49,14 @@ function(add_mlir_dialect dialect dialect_doc_filename) add_dependencies(mlir-doc ${dialect_doc_filename}DocGen) endfunction() -# Declare a library which can be compiled in libMLIR.so -macro(add_mlir_library name) - cmake_parse_arguments(ARG - "SHARED;INSTALL_WITH_TOOLCHAIN" - "" - "ADDITIONAL_HEADERS" - ${ARGN}) - set(srcs) - if(ARG_SHARED) - set(LIBTYPE SHARED) - else() - # llvm_add_library ignores BUILD_SHARED_LIBS if STATIC is explicitly set, - # so we need to handle it here. - if(BUILD_SHARED_LIBS) - set(LIBTYPE SHARED) - else() - set(LIBTYPE STATIC) - endif() - if(NOT XCODE) - # The Xcode generator doesn't handle object libraries correctly. - list(APPEND LIBTYPE OBJECT) - endif() - set_property(GLOBAL APPEND PROPERTY MLIR_ALL_LIBS ${name}) - endif() - add_llvm_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs}) -endmacro(add_mlir_library) - # Declare the library associated with a dialect. function(add_mlir_dialect_library name) set_property(GLOBAL APPEND PROPERTY MLIR_DIALECT_LIBS ${name}) - add_mlir_library(${ARGV}) + add_llvm_library(${ARGV}) endfunction(add_mlir_dialect_library) # Declare the library associated with a conversion. function(add_mlir_conversion_library name) set_property(GLOBAL APPEND PROPERTY MLIR_CONVERSION_LIBS ${name}) - add_mlir_library(${ARGV}) + add_llvm_library(${ARGV}) endfunction(add_mlir_conversion_library) diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt index 77bae1d..5df7fce 100644 --- a/mlir/lib/Analysis/CMakeLists.txt +++ b/mlir/lib/Analysis/CMakeLists.txt @@ -12,7 +12,7 @@ set(LLVM_OPTIONAL_SOURCES Verifier.cpp ) -add_mlir_library(MLIRAnalysis +add_llvm_library(MLIRAnalysis CallGraph.cpp InferTypeOpInterface.cpp Liveness.cpp @@ -35,7 +35,7 @@ add_mlir_library(MLIRAnalysis LLVMSupport ) -add_mlir_library(MLIRLoopAnalysis +add_llvm_library(MLIRLoopAnalysis AffineAnalysis.cpp AffineStructures.cpp LoopAnalysis.cpp diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt index 180ab07..d9d91b9 100644 --- a/mlir/lib/Dialect/CMakeLists.txt +++ b/mlir/lib/Dialect/CMakeLists.txt @@ -12,11 +12,12 @@ add_subdirectory(SPIRV) add_subdirectory(StandardOps) add_subdirectory(VectorOps) + set(LLVM_OPTIONAL_SOURCES Traits.cpp ) -add_mlir_library(MLIRDialect +add_llvm_library(MLIRDialect Traits.cpp ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt index 0a4f275..660efc5b 100644 --- a/mlir/lib/EDSC/CMakeLists.txt +++ b/mlir/lib/EDSC/CMakeLists.txt @@ -3,7 +3,7 @@ set(LLVM_OPTIONAL_SOURCES CoreAPIs.cpp ) -add_mlir_library(MLIREDSC +add_llvm_library(MLIREDSC Builders.cpp ADDITIONAL_HEADER_DIRS @@ -15,7 +15,7 @@ add_mlir_library(MLIREDSC LLVMSupport ) -add_mlir_library(MLIREDSCInterface +add_llvm_library(MLIREDSCInterface CoreAPIs.cpp ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt index 92673da..c24917c1 100644 --- a/mlir/lib/ExecutionEngine/CMakeLists.txt +++ b/mlir/lib/ExecutionEngine/CMakeLists.txt @@ -6,7 +6,7 @@ set(LLVM_OPTIONAL_SOURCES ) llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO") -add_mlir_library(MLIRExecutionEngine +add_llvm_library(MLIRExecutionEngine ExecutionEngine.cpp OptUtils.cpp diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt index 61313c52..80a9e4f 100644 --- a/mlir/lib/IR/CMakeLists.txt +++ b/mlir/lib/IR/CMakeLists.txt @@ -1,5 +1,5 @@ file(GLOB globbed *.c *.cpp) -add_mlir_library(MLIRIR +add_llvm_library(MLIRIR ${globbed} ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt index 14d64b3..978a674 100644 --- a/mlir/lib/Parser/CMakeLists.txt +++ b/mlir/lib/Parser/CMakeLists.txt @@ -1,4 +1,4 @@ -add_mlir_library(MLIRParser +add_llvm_library(MLIRParser Lexer.cpp Parser.cpp Token.cpp diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt index df116bf..9df404c 100644 --- a/mlir/lib/Pass/CMakeLists.txt +++ b/mlir/lib/Pass/CMakeLists.txt @@ -1,5 +1,5 @@ file(GLOB globbed *.c *.cpp) -add_mlir_library(MLIRPass +add_llvm_library(MLIRPass ${globbed} ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt index f646f6a..5b52b2a 100644 --- a/mlir/lib/Quantizer/CMakeLists.txt +++ b/mlir/lib/Quantizer/CMakeLists.txt @@ -1,5 +1,5 @@ # Support. -add_mlir_library(MLIRQuantizerSupport +add_llvm_library(MLIRQuantizerSupport Support/Configuration.cpp Support/ConstraintAnalysisGraph.cpp Support/Metadata.cpp @@ -19,7 +19,7 @@ add_mlir_library(MLIRQuantizerSupport ) # Configurations. -add_mlir_library(MLIRQuantizerFxpMathConfig +add_llvm_library(MLIRQuantizerFxpMathConfig Configurations/FxpMathConfig.cpp ADDITIONAL_HEADER_DIRS @@ -38,7 +38,7 @@ add_mlir_library(MLIRQuantizerFxpMathConfig ) # Transforms. -add_mlir_library(MLIRQuantizerTransforms +add_llvm_library(MLIRQuantizerTransforms Transforms/AddDefaultStatsTestPass.cpp Transforms/InferQuantizedTypesPass.cpp Transforms/RemoveInstrumentationPass.cpp diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt index ae68601..140c2ce 100644 --- a/mlir/lib/Support/CMakeLists.txt +++ b/mlir/lib/Support/CMakeLists.txt @@ -7,7 +7,7 @@ set(LLVM_OPTIONAL_SOURCES TranslateClParser.cpp ) -add_mlir_library(MLIRSupport +add_llvm_library(MLIRSupport FileUtilities.cpp StorageUniquer.cpp ToolUtilities.cpp @@ -20,7 +20,7 @@ add_mlir_library(MLIRSupport ${LLVM_PTHREAD_LIB} ) -add_mlir_library(MLIROptLib +add_llvm_library(MLIROptLib MlirOptMain.cpp ADDITIONAL_HEADER_DIRS @@ -34,7 +34,7 @@ add_mlir_library(MLIROptLib LLVMSupport ) -add_mlir_library(MLIRTranslateClParser +add_llvm_library(MLIRTranslateClParser TranslateClParser.cpp ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/Target/CMakeLists.txt b/mlir/lib/Target/CMakeLists.txt index f5cfa91..93f997f 100644 --- a/mlir/lib/Target/CMakeLists.txt +++ b/mlir/lib/Target/CMakeLists.txt @@ -1,4 +1,4 @@ -add_mlir_library(MLIRTargetLLVMIRModuleTranslation +add_llvm_library(MLIRTargetLLVMIRModuleTranslation LLVMIR/DebugTranslation.cpp LLVMIR/ModuleTranslation.cpp @@ -19,7 +19,7 @@ add_mlir_library(MLIRTargetLLVMIRModuleTranslation MLIRTranslation ) -add_mlir_library(MLIRTargetLLVMIR +add_llvm_library(MLIRTargetLLVMIR LLVMIR/ConvertFromLLVMIR.cpp LLVMIR/ConvertToLLVMIR.cpp @@ -36,8 +36,7 @@ add_mlir_library(MLIRTargetLLVMIR LLVMIRReader LLVMSupport ) - -add_mlir_library(MLIRTargetNVVMIR +add_llvm_library(MLIRTargetNVVMIR LLVMIR/ConvertToNVVMIR.cpp ADDITIONAL_HEADER_DIRS @@ -57,7 +56,7 @@ add_mlir_library(MLIRTargetNVVMIR LLVMSupport ) -add_mlir_library(MLIRTargetROCDLIR +add_llvm_library(MLIRTargetROCDLIR LLVMIR/ConvertToROCDLIR.cpp ADDITIONAL_HEADER_DIRS diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt index 8a1c53b..980a357 100644 --- a/mlir/lib/Transforms/CMakeLists.txt +++ b/mlir/lib/Transforms/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(Utils) -add_mlir_library(MLIRTransforms +add_llvm_library(MLIRTransforms AffineDataCopyGeneration.cpp AffineLoopInvariantCodeMotion.cpp Canonicalizer.cpp diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt index f58f085..de33511 100644 --- a/mlir/lib/Transforms/Utils/CMakeLists.txt +++ b/mlir/lib/Transforms/Utils/CMakeLists.txt @@ -1,4 +1,4 @@ -add_mlir_library(MLIRTransformUtils +add_llvm_library(MLIRTransformUtils FoldUtils.cpp GreedyPatternRewriteDriver.cpp InliningUtils.cpp diff --git a/mlir/lib/Translation/CMakeLists.txt b/mlir/lib/Translation/CMakeLists.txt index feb94a2..b8e809f 100644 --- a/mlir/lib/Translation/CMakeLists.txt +++ b/mlir/lib/Translation/CMakeLists.txt @@ -1,4 +1,4 @@ -add_mlir_library(MLIRTranslation +add_llvm_library(MLIRTranslation Translation.cpp ADDITIONAL_HEADER_DIRS diff --git a/mlir/tools/CMakeLists.txt b/mlir/tools/CMakeLists.txt index 1fd8945..e3faaca 100644 --- a/mlir/tools/CMakeLists.txt +++ b/mlir/tools/CMakeLists.txt @@ -4,4 +4,3 @@ add_subdirectory(mlir-opt) add_subdirectory(mlir-tblgen) add_subdirectory(mlir-translate) add_subdirectory(mlir-vulkan-runner) -add_subdirectory(mlir-shlib) diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt index d419e10..0eaed46 100644 --- a/mlir/tools/mlir-opt/CMakeLists.txt +++ b/mlir/tools/mlir-opt/CMakeLists.txt @@ -4,7 +4,6 @@ set(LLVM_OPTIONAL_SOURCES set(LIB_LIBS MLIRAnalysis - MLIRIR MLIRLLVMIR MLIROptLib MLIRParser diff --git a/mlir/tools/mlir-shlib/CMakeLists.txt b/mlir/tools/mlir-shlib/CMakeLists.txt deleted file mode 100644 index e9b2963..0000000 --- a/mlir/tools/mlir-shlib/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -# Building libmlir-cpp.so fails if LLVM_ENABLE_PIC=Off -if (NOT LLVM_ENABLE_PIC) - return() -endif() - -# Building libmlir-cpp.so may not work on MSVC -if (MSVC) - return() -endif() - -get_property(mlir_libs GLOBAL PROPERTY MLIR_ALL_LIBS) -list(REMOVE_DUPLICATES mlir_libs) - -foreach (lib ${mlir_libs}) - if(XCODE) - # Xcode doesn't support object libraries, so we have to trick it into - # linking the static libraries instead. - list(APPEND _DEPS "-force_load" ${lib}) - else() - list(APPEND _OBJECTS $) - endif() - list(APPEND _DEPS $) -endforeach () - -if(MLIR_LINK_MLIR_DYLIB) - set(INSTALL_WITH_TOOLCHAIN INSTALL_WITH_TOOLCHAIN) -endif() - -# libMLIR.so depends on LLVM components. To avoid multiple -# copies of those LLVM components, libMLIR.so depends on libLLVM.so. -# This probably won't work if some LLVM components are not included -# in libLLVM.so. -if(LLVM_BUILD_LLVM_DYLIB) - add_llvm_library(MLIR - SHARED - ${INSTALL_WITH_TOOLCHAIN} - - mlir-shlib.cpp - ) - target_link_libraries(MLIR PRIVATE LLVM ${LLVM_PTHREAD_LIB}) - whole_archive_link(MLIR ${mlir_libs}) -endif() diff --git a/mlir/tools/mlir-shlib/mlir-shlib.cpp b/mlir/tools/mlir-shlib/mlir-shlib.cpp deleted file mode 100644 index 0093622..0000000 --- a/mlir/tools/mlir-shlib/mlir-shlib.cpp +++ /dev/null @@ -1 +0,0 @@ -// Intentionally empty source file to make CMake happy -- 2.7.4