Commit dd046c96 authored by Stephen Neuendorffer's avatar Stephen Neuendorffer
Browse files

Revert "[MLIR] Add support for libMLIR.so" 

This reverts commit e17d9c11.
It breaks the build.
parent bc991500

mlir/CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -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)

mlir/cmake/modules/AddMLIR.cmake

+2 −8
Original line number Diff line number Diff line
@@ -49,20 +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)

  set_property(GLOBAL APPEND PROPERTY MLIR_ALL_LIBS ${name})

  add_llvm_library(${ARGV})

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)

mlir/lib/Analysis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

mlir/lib/Dialect/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -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

mlir/lib/EDSC/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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