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

[MLIR] Refactor library handling for conversions. 

Collect a list of conversion libraries in cmake, so we don't have to
list these explicitly in most binaries.

Differential Revision: https://reviews.llvm.org/D75222
parent 58695528

mlir/cmake/modules/AddMLIR.cmake

+6 −0
Original line number Diff line number Diff line
@@ -54,3 +54,9 @@ function(add_mlir_dialect_library name) 
  set_property(GLOBAL APPEND PROPERTY MLIR_DIALECT_LIBS ${name})

  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_llvm_library(${ARGV})

endfunction(add_mlir_conversion_library)

mlir/examples/toy/Ch6/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line
@@ -28,18 +28,17 @@ include_directories(include/) 
include_directories(${CMAKE_CURRENT_BINARY_DIR})

include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)

get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)

target_link_libraries(toyc-ch6

  PRIVATE

    ${dialect_libs}

    MLIRAffineToStandard

    ${conversion_libs}

    MLIRAnalysis

    MLIRExecutionEngine

    MLIRIR

    MLIRLLVMIR

    MLIRLoopToStandard

    MLIRParser

    MLIRPass

    MLIRStandardToLLVM

    MLIRTargetLLVMIR

    MLIRTransforms

    )

mlir/examples/toy/Ch7/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line
@@ -28,17 +28,16 @@ include_directories(include/) 
include_directories(${CMAKE_CURRENT_BINARY_DIR})

include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)

get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)

get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)

target_link_libraries(toyc-ch7

  PRIVATE

    ${dialect_libs}

    MLIRAffineToStandard

    ${conversion_libs}

    MLIRAnalysis

    MLIRExecutionEngine

    MLIRIR

    MLIRLoopToStandard

    MLIRParser

    MLIRPass

    MLIRStandardToLLVM

    MLIRTargetLLVMIR

    MLIRTransforms

    )

mlir/lib/Conversion/AffineToStandard/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
add_llvm_library(MLIRAffineToStandard

add_mlir_conversion_library(MLIRAffineToStandard

  AffineToStandard.cpp



  ADDITIONAL_HEADER_DIRS

mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ if (MLIR_CUDA_CONVERSIONS_ENABLED) 
 list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")

endif()



add_llvm_library(MLIRGPUtoCUDATransforms ${SOURCES})

add_mlir_conversion_library(MLIRGPUtoCUDATransforms ${SOURCES})

target_link_libraries(MLIRGPUtoCUDATransforms

  MLIRGPU

  MLIRLLVMIR