[llvm] f288c21 - Revert "[CMAKE] Plumb include_directories() into tablegen()"

Stephen Neuendorffer via llvm-commits llvm-commits at lists.llvm.org
Fri Apr 3 11:07:04 PDT 2020


Good Idea!  I'll do that.

Steve

On Fri, Apr 3, 2020 at 10:57 AM Tom Stellard via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> On 04/03/2020 10:48 AM, Stephen Neuendorffer via llvm-commits wrote:
> >
> > Author: Stephen Neuendorffer
> > Date: 2020-04-03T10:47:36-07:00
> > New Revision: f288c216875d6cba6465230cbb0677e839775cd9
> >
> > URL:
> https://github.com/llvm/llvm-project/commit/f288c216875d6cba6465230cbb0677e839775cd9
> > DIFF:
> https://github.com/llvm/llvm-project/commit/f288c216875d6cba6465230cbb0677e839775cd9.diff
> >
> > LOG: Revert "[CMAKE] Plumb include_directories() into tablegen()"
> >
> > This reverts commit ae044c5b0caa095602b6ef4cca40d57efc26a8f6.
> >
> > This breaks the buildbots, which use an older version of cmake.
> >
>
> Would you be able to add a comment to the code where you wanted
> to make the change.  Something like:
>
> FIXME: With cmake X.Y we could simplify this by ...
>
> It's helpful when deciding which version to upgrade to have
> this documented in some way.  I started doing this the last
> time this happened to me:
>
>
> https://github.com/llvm/llvm-project/blob/master/clang/tools/clang-shlib/CMakeLists.txt#L22
>
> -Tom
>
> > Added:
> >
> >
> > Modified:
> >     clang/cmake/modules/AddClang.cmake
> >     llvm/cmake/modules/TableGen.cmake
> >     mlir/cmake/modules/AddMLIR.cmake
> >     mlir/examples/toy/Ch3/CMakeLists.txt
> >     mlir/examples/toy/Ch4/CMakeLists.txt
> >     mlir/examples/toy/Ch4/include/toy/CMakeLists.txt
> >     mlir/examples/toy/Ch5/CMakeLists.txt
> >     mlir/examples/toy/Ch5/include/toy/CMakeLists.txt
> >     mlir/examples/toy/Ch6/CMakeLists.txt
> >     mlir/examples/toy/Ch6/include/toy/CMakeLists.txt
> >     mlir/examples/toy/Ch7/CMakeLists.txt
> >     mlir/examples/toy/Ch7/include/toy/CMakeLists.txt
> >
> > Removed:
> >
> >
> >
> >
> ################################################################################
> > diff  --git a/clang/cmake/modules/AddClang.cmake
> b/clang/cmake/modules/AddClang.cmake
> > index c1bb386de6f7..577cc11ab015 100644
> > --- a/clang/cmake/modules/AddClang.cmake
> > +++ b/clang/cmake/modules/AddClang.cmake
> > @@ -17,7 +17,7 @@ function(clang_tablegen)
> >      message(FATAL_ERROR "SOURCE source-file required by clang_tablegen")
> >    endif()
> >
> > -  set( CLANG_TABLEGEN_ARGUMENTS "" )
> > +  set( CLANG_TABLEGEN_ARGUMENTS -I ${CLANG_SOURCE_DIR}/include )
> >    set( LLVM_TARGET_DEFINITIONS ${CTG_SOURCE} )
> >    tablegen(CLANG ${CTG_UNPARSED_ARGUMENTS} ${CLANG_TABLEGEN_ARGUMENTS})
> >
> >
> > diff  --git a/llvm/cmake/modules/TableGen.cmake
> b/llvm/cmake/modules/TableGen.cmake
> > index 8d0c5afabe96..632f69aa3386 100644
> > --- a/llvm/cmake/modules/TableGen.cmake
> > +++ b/llvm/cmake/modules/TableGen.cmake
> > @@ -2,6 +2,10 @@
> >  # Extra parameters for `tblgen' may come after `ofn' parameter.
> >  # Adds the name of the generated file to TABLEGEN_OUTPUT.
> >
> > +if(LLVM_MAIN_INCLUDE_DIR)
> > +  set(LLVM_TABLEGEN_FLAGS -I ${LLVM_MAIN_INCLUDE_DIR})
> > +endif()
> > +
> >  function(tablegen project ofn)
> >    # Validate calling context.
> >    if(NOT ${project}_TABLEGEN_EXE)
> > @@ -71,8 +75,6 @@ function(tablegen project ofn)
> >      set(tblgen_change_flag "--write-if-changed")
> >    endif()
> >
> > -  get_directory_property(includes "INCLUDE_DIRECTORIES")
> > -  list(TRANSFORM includes PREPEND -I)
> >    # We need both _TABLEGEN_TARGET and _TABLEGEN_EXE in the  DEPENDS list
> >    # (both the target and the file) to have .inc files rebuilt on
> >    # a tablegen change, as cmake does not propagate file-level
> dependencies
> > @@ -84,7 +86,6 @@ function(tablegen project ofn)
> >    # but lets us having smaller and cleaner code here.
> >    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
> >      COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I
> ${CMAKE_CURRENT_SOURCE_DIR}
> > -    ${includes}
> >      ${LLVM_TABLEGEN_FLAGS}
> >      ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
> >      ${tblgen_change_flag}
> >
> > diff  --git a/mlir/cmake/modules/AddMLIR.cmake
> b/mlir/cmake/modules/AddMLIR.cmake
> > index 7449f54ea877..2adb8f2f2935 100644
> > --- a/mlir/cmake/modules/AddMLIR.cmake
> > +++ b/mlir/cmake/modules/AddMLIR.cmake
> > @@ -1,5 +1,5 @@
> >  function(mlir_tablegen ofn)
> > -  tablegen(MLIR ${ARGV})
> > +  tablegen(MLIR ${ARGV} "-I${MLIR_MAIN_SRC_DIR}"
> "-I${MLIR_INCLUDE_DIR}")
> >    set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT}
> ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
> >        PARENT_SCOPE)
> >  endfunction()
> >
> > diff  --git a/mlir/examples/toy/Ch3/CMakeLists.txt
> b/mlir/examples/toy/Ch3/CMakeLists.txt
> > index ef70dcbac309..4dab5e4d0626 100644
> > --- a/mlir/examples/toy/Ch3/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch3/CMakeLists.txt
> > @@ -1,4 +1,3 @@
> > -include_directories(include)
> >  add_subdirectory(include)
> >
> >  set(LLVM_LINK_COMPONENTS
> > @@ -6,7 +5,7 @@ set(LLVM_LINK_COMPONENTS
> >    )
> >
> >  set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
> > -mlir_tablegen(ToyCombine.inc -gen-rewriters)
> > +mlir_tablegen(ToyCombine.inc -gen-rewriters
> "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
> >  add_public_tablegen_target(ToyCh3CombineIncGen)
> >
> >  add_toy_chapter(toyc-ch3
> > @@ -21,6 +20,7 @@ add_toy_chapter(toyc-ch3
> >    ToyCh3CombineIncGen
> >    )
> >
> > +include_directories(include/)
> >  include_directories(${CMAKE_CURRENT_BINARY_DIR})
> >  include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
> >  target_link_libraries(toyc-ch3
> >
> > diff  --git a/mlir/examples/toy/Ch4/CMakeLists.txt
> b/mlir/examples/toy/Ch4/CMakeLists.txt
> > index ae30a691894e..3589b10645a6 100644
> > --- a/mlir/examples/toy/Ch4/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch4/CMakeLists.txt
> > @@ -1,4 +1,3 @@
> > -include_directories(include)
> >  add_subdirectory(include)
> >
> >  set(LLVM_LINK_COMPONENTS
> > @@ -6,7 +5,7 @@ set(LLVM_LINK_COMPONENTS
> >    )
> >
> >  set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
> > -mlir_tablegen(ToyCombine.inc -gen-rewriters)
> > +mlir_tablegen(ToyCombine.inc -gen-rewriters
> "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
> >  add_public_tablegen_target(ToyCh4CombineIncGen)
> >
> >  add_toy_chapter(toyc-ch4
> > @@ -23,6 +22,7 @@ add_toy_chapter(toyc-ch4
> >    ToyCh4CombineIncGen
> >    )
> >
> > +include_directories(include/)
> >  include_directories(${CMAKE_CURRENT_BINARY_DIR})
> >  include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
> >  target_link_libraries(toyc-ch4
> >
> > diff  --git a/mlir/examples/toy/Ch4/include/toy/CMakeLists.txt
> b/mlir/examples/toy/Ch4/include/toy/CMakeLists.txt
> > index 7f60477fc272..798d0df1d8d6 100644
> > --- a/mlir/examples/toy/Ch4/include/toy/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch4/include/toy/CMakeLists.txt
> > @@ -1,6 +1,6 @@
> >  set(LLVM_TARGET_DEFINITIONS Ops.td)
> > -mlir_tablegen(Ops.h.inc -gen-op-decls)
> > -mlir_tablegen(Ops.cpp.inc -gen-op-defs)
> > +mlir_tablegen(Ops.h.inc -gen-op-decls
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> > +mlir_tablegen(Ops.cpp.inc -gen-op-defs
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> >  add_public_tablegen_target(ToyCh4OpsIncGen)
> >
> >  set(LLVM_TARGET_DEFINITIONS ShapeInferenceInterface.td)
> >
> > diff  --git a/mlir/examples/toy/Ch5/CMakeLists.txt
> b/mlir/examples/toy/Ch5/CMakeLists.txt
> > index ba3a88e03c0b..c3627cf11cd7 100644
> > --- a/mlir/examples/toy/Ch5/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch5/CMakeLists.txt
> > @@ -1,4 +1,3 @@
> > -include_directories(include)
> >  add_subdirectory(include)
> >
> >  set(LLVM_LINK_COMPONENTS
> > @@ -6,7 +5,7 @@ set(LLVM_LINK_COMPONENTS
> >    )
> >
> >  set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
> > -mlir_tablegen(ToyCombine.inc -gen-rewriters)
> > +mlir_tablegen(ToyCombine.inc -gen-rewriters
> "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
> >  add_public_tablegen_target(ToyCh5CombineIncGen)
> >
> >  add_toy_chapter(toyc-ch5
> > @@ -24,6 +23,7 @@ add_toy_chapter(toyc-ch5
> >    ToyCh5CombineIncGen
> >    )
> >
> > +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)
> >
> > diff  --git a/mlir/examples/toy/Ch5/include/toy/CMakeLists.txt
> b/mlir/examples/toy/Ch5/include/toy/CMakeLists.txt
> > index e8bd1fc0bc2e..aaa932896d0f 100644
> > --- a/mlir/examples/toy/Ch5/include/toy/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch5/include/toy/CMakeLists.txt
> > @@ -1,6 +1,6 @@
> >  set(LLVM_TARGET_DEFINITIONS Ops.td)
> > -mlir_tablegen(Ops.h.inc -gen-op-decls)
> > -mlir_tablegen(Ops.cpp.inc -gen-op-defs)
> > +mlir_tablegen(Ops.h.inc -gen-op-decls
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> > +mlir_tablegen(Ops.cpp.inc -gen-op-defs
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> >  add_public_tablegen_target(ToyCh5OpsIncGen)
> >
> >  set(LLVM_TARGET_DEFINITIONS ShapeInferenceInterface.td)
> >
> > diff  --git a/mlir/examples/toy/Ch6/CMakeLists.txt
> b/mlir/examples/toy/Ch6/CMakeLists.txt
> > index be797c6c1e96..5d39a9ab5fc1 100644
> > --- a/mlir/examples/toy/Ch6/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch6/CMakeLists.txt
> > @@ -1,4 +1,3 @@
> > -include_directories(include)
> >  add_subdirectory(include)
> >
> >  set(LLVM_LINK_COMPONENTS
> > @@ -7,7 +6,7 @@ set(LLVM_LINK_COMPONENTS
> >    )
> >
> >  set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
> > -mlir_tablegen(ToyCombine.inc -gen-rewriters)
> > +mlir_tablegen(ToyCombine.inc -gen-rewriters
> "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
> >  add_public_tablegen_target(ToyCh6CombineIncGen)
> >
> >  add_toy_chapter(toyc-ch6
> > @@ -26,6 +25,7 @@ add_toy_chapter(toyc-ch6
> >    ToyCh6CombineIncGen
> >    )
> >
> > +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)
> >
> > diff  --git a/mlir/examples/toy/Ch6/include/toy/CMakeLists.txt
> b/mlir/examples/toy/Ch6/include/toy/CMakeLists.txt
> > index c6adf5a15a73..aecf11fab6c9 100644
> > --- a/mlir/examples/toy/Ch6/include/toy/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch6/include/toy/CMakeLists.txt
> > @@ -1,6 +1,6 @@
> >  set(LLVM_TARGET_DEFINITIONS Ops.td)
> > -mlir_tablegen(Ops.h.inc -gen-op-decls)
> > -mlir_tablegen(Ops.cpp.inc -gen-op-defs)
> > +mlir_tablegen(Ops.h.inc -gen-op-decls
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> > +mlir_tablegen(Ops.cpp.inc -gen-op-defs
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> >  add_public_tablegen_target(ToyCh6OpsIncGen)
> >
> >  set(LLVM_TARGET_DEFINITIONS ShapeInferenceInterface.td)
> >
> > diff  --git a/mlir/examples/toy/Ch7/CMakeLists.txt
> b/mlir/examples/toy/Ch7/CMakeLists.txt
> > index 9a9f335d3a92..760052ee840f 100644
> > --- a/mlir/examples/toy/Ch7/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch7/CMakeLists.txt
> > @@ -1,4 +1,3 @@
> > -include_directories(include)
> >  add_subdirectory(include)
> >
> >  set(LLVM_LINK_COMPONENTS
> > @@ -7,7 +6,7 @@ set(LLVM_LINK_COMPONENTS
> >    )
> >
> >  set(LLVM_TARGET_DEFINITIONS mlir/ToyCombine.td)
> > -mlir_tablegen(ToyCombine.inc -gen-rewriters)
> > +mlir_tablegen(ToyCombine.inc -gen-rewriters
> "-I${CMAKE_CURRENT_SOURCE_DIR}/include")
> >  add_public_tablegen_target(ToyCh7CombineIncGen)
> >
> >  add_toy_chapter(toyc-ch7
> > @@ -26,6 +25,7 @@ add_toy_chapter(toyc-ch7
> >    ToyCh7CombineIncGen
> >    )
> >
> > +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)
> >
> > diff  --git a/mlir/examples/toy/Ch7/include/toy/CMakeLists.txt
> b/mlir/examples/toy/Ch7/include/toy/CMakeLists.txt
> > index 43eb23bf93b8..fa30bd2e8e03 100644
> > --- a/mlir/examples/toy/Ch7/include/toy/CMakeLists.txt
> > +++ b/mlir/examples/toy/Ch7/include/toy/CMakeLists.txt
> > @@ -1,6 +1,6 @@
> >  set(LLVM_TARGET_DEFINITIONS Ops.td)
> > -mlir_tablegen(Ops.h.inc -gen-op-decls)
> > -mlir_tablegen(Ops.cpp.inc -gen-op-defs)
> > +mlir_tablegen(Ops.h.inc -gen-op-decls
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> > +mlir_tablegen(Ops.cpp.inc -gen-op-defs
> "-I${CMAKE_CURRENT_SOURCE_DIR}/..")
> >  add_public_tablegen_target(ToyCh7OpsIncGen)
> >
> >  set(LLVM_TARGET_DEFINITIONS ShapeInferenceInterface.td)
> >
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
> >
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200403/1ec4a39e/attachment.html>


More information about the llvm-commits mailing list