[flang] Remove `LINK_WITH_FIR` cmake switch

[SouraVX]

Summary

Most components required for this are already there.

Build and Testing clean.
ninja check-flang

[tskeith]

flang/CMakeLists.txt

216

Is this used?

217

I don't think this message is needed any more.

[SouraVX]

Addressed @tskeith comments.

flang/CMakeLists.txt

216

Seems like not needed.

217

Removed thanks!

flang/CMakeLists.txt

 cmake_minimum_required(VERSION 3.13.4)
 
 set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
 
-option(LINK_WITH_FIR "Link driver with FIR and LLVM" ON)
 option(FLANG_BUILD_NEW_DRIVER "Build the flang compiler driver" OFF)
 
 # Flang requires C++17.
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(FLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   include(AddLLVM)
   include(HandleLLVMOptions)
   include(VersionFromVCS)
 
   if(FLANG_BUILD_NEW_DRIVER)
     include(AddClang)
   endif()
 
-  if(LINK_WITH_FIR)
-    include(TableGen)
-    find_package(MLIR REQUIRED CONFIG)
-    # Use SYSTEM for the same reasons as for LLVM includes
-    include_directories(SYSTEM ${MLIR_INCLUDE_DIRS})
-    # If the user specifies a relative path to MLIR_DIR, the calls to include
-    # MLIR modules fail. Append the absolute path to MLIR_DIR instead.
-    get_filename_component(MLIR_DIR_ABSOLUTE ${MLIR_DIR} REALPATH)
-    list(APPEND CMAKE_MODULE_PATH ${MLIR_DIR_ABSOLUTE})
-    include(AddMLIR)
-    find_program(MLIR_TABLEGEN_EXE "mlir-tblgen" ${LLVM_TOOLS_BINARY_DIR}
-      NO_DEFAULT_PATH)
-  endif()
 
   option(LLVM_INSTALL_TOOLCHAIN_ONLY
     "Only include toolchain files in the 'install' target." OFF)
   option(LLVM_FORCE_USE_OLD_HOST_TOOLCHAIN
     "Set to ON to force using an old, unsupported host toolchain." OFF)
 
 
   # Add LLVM include files as if they were SYSTEM because there are complex unused
else()
 
   if(FLANG_STANDALONE_BUILD)
     set(FLANG_BINARY_DIR ${CMAKE_BINARY_DIR}/tools/flang)
   else()
     set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
   endif()
 
   set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}")
-  if (LINK_WITH_FIR)
-    set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --src-root
-    set(MLIR_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --includedir
-    set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include)
-    set(MLIR_TABLEGEN_EXE $<TARGET_FILE:mlir-tblgen>)
-    include_directories(SYSTEM ${MLIR_INCLUDE_DIR})
-    include_directories(SYSTEM ${MLIR_TABLEGEN_OUTPUT_DIR})
-  endif()
-endif()
 
 if(FLANG_BUILD_NEW_DRIVER)
     # TODO: Remove when libclangDriver is lifted out of Clang
     if(FLANG_STANDALONE_BUILD)
       set(CLANG_INCLUDE_DIR ${CLANG_INCLUDE_DIRS} )
       # No need to specify TableGen output dir as that's embedded in CLANG_DIR
     else()
       set(CLANG_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../clang/include )
       # Specify TableGen output dir for things like DiagnosticCommonKinds.inc,
       # DiagnosticDriverKinds.inc (required for reporting diagnostics)
       set(CLANG_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/clang/include)
       include_directories(SYSTEM ${CLANG_TABLEGEN_OUTPUT_DIR})
     endif()
     include_directories(SYSTEM ${CLANG_INCLUDE_DIR})
 endif()
 
-if(LINK_WITH_FIR)
-  # tco tool and FIR lib output directories
-  if(FLANG_STANDALONE_BUILD)
-    set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/bin)
-    set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/lib)
-  endif()
-  # Always build tco tool
-  set(LLVM_BUILD_TOOLS ON)
-  set(LLVM_COMMON_COMPONENTS Support)
-  message(STATUS "Linking driver with FIR and LLVM, using LLVM components: ${LLVM_COMMON_COMPONENTS}")
-endif()
 
 # Add Flang-centric modules to cmake path.
 include_directories(BEFORE
   ${FLANG_BINARY_DIR}/include
   ${FLANG_SOURCE_DIR}/include)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 if (NOT DEFAULT_SYSROOT)
   set(DEFAULT_SYSROOT "" CACHE PATH

flang/include/flang/CMakeLists.txt

-if(LINK_WITH_FIR)
-  add_subdirectory(Optimizer)
-endif()

flang/lib/CMakeLists.txt

 add_subdirectory(Common)
 add_subdirectory(Evaluate)
 add_subdirectory(Decimal)
 add_subdirectory(Lower)
 add_subdirectory(Parser)
 add_subdirectory(Semantics)
 
 if(FLANG_BUILD_NEW_DRIVER)
   add_subdirectory(Frontend)
   add_subdirectory(FrontendTool)
 endif()
 
-if(LINK_WITH_FIR)
-  add_subdirectory(Optimizer)
-endif()

flang/test/CMakeLists.txt

 
 set(FLANG_TEST_PARAMS
   flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
 
 set(FLANG_TEST_DEPENDS
   f18 FileCheck count not module_files
 )
 
-if (LINK_WITH_FIR)
-  list(APPEND FLANG_TEST_DEPENDS tco)
-endif()
 
 if (FLANG_BUILD_NEW_DRIVER)
   list(APPEND FLANG_TEST_DEPENDS flang-new)
 endif()
 
 if (FLANG_INCLUDE_TESTS)
   if (FLANG_GTEST_AVAIL)
     list(APPEND FLANG_TEST_DEPENDS FlangUnitTests)

flang/tools/CMakeLists.txt

 #===-- tools/CMakeLists.txt ------------------------------------------------===#
 #
 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #
 #===------------------------------------------------------------------------===#
 
 add_subdirectory(f18)
 if(FLANG_BUILD_NEW_DRIVER)
   add_subdirectory(flang-driver)
 endif()
-if(LINK_WITH_FIR)
-  add_subdirectory(tco)
-endif()
 add_subdirectory(f18-parse-demo)