Refactor work with LLVM in VC

Remove redundant commands that are already handled by top-level cmake.

Author: aus-intel

IGC/VectorCompiler/CMakeLists.txt

@@ -42,60 +42,36 @@ message(STATUS "+++ Source/IGC/VectorCompiler +++")
 message(STATUS "[VC] Build proj: ${IGC_BUILD__PROJ__VectorCompiler}")
 
 # --- LLVM ---
-if(${IGC_OPTION__LLVM_FROM_SYSTEM} OR (WIN32 AND ${IGC_OPTION__LLVM_PREBUILDS}))
-  message(STATUS "[VC] Using system llvm")
+if(IGC_OPTION__LLVM_FROM_SYSTEM OR IGC_OPTION__LLVM_PREBUILDS)
+  message(STATUS "[VC] Using system or prebuilt llvm")
 
-  # Need to search for llvm-tblgen
   find_program(LLVM_TABLEGEN_EXE "llvm-tblgen"
-    ${LLVM_TOOLS_BINARY_DIR}
+    PATHS ${LLVM_TOOLS_BINARY_DIR}
     NO_DEFAULT_PATH
     )
-  if(LLVM_TABLEGEN_EXE-NOTFOUND)
-    message(FATAL_ERROR "[VC] llvm-tblgen is not found")
+  if(NOT LLVM_TABLEGEN_EXE)
+    message(FATAL_ERROR "[VC] Tablegen is not found! Please specify LLVM_TABLEGEN_EXE to tblgen executable")
   endif()
   message(STATUS "[VC] Found tblgen: ${LLVM_TABLEGEN_EXE}")
-
-  # find_package was called by igc cmake, no need to do it again.
 else()
-  # Prebuilt llvm does not have tblgen...
-  if(${IGC_OPTION__LLVM_PREBUILDS})
-    message(FATAL_ERROR "[VC] vector compiler with prebuilt llvm is not supported")
-  endif()
-
-  # In last scenario we are building with llvm so every target is defined
-  # and LLVMConfig will only set needed variables.
   message(STATUS "[VC] Using llvm source build")
-  set(LLVM_BUILD_DIR "${LLVM_SOURCE_DIR}/../../build/src")
-  set(LLVM_CMAKE_DIR "${LLVM_BUILD_DIR}/lib/cmake/llvm")
-  message(STATUS "[VC] LLVMConfig.cmake location: ${LLVM_CMAKE_DIR}")
-  find_package(LLVM REQUIRED
-    HINTS ${LLVM_CMAKE_DIR}
-    NO_DEFAULT_PATH
-    )
 
-  # We have executable target, use it.
+  # Set correct module path.
+  set(LLVM_CMAKE_DIR "${LLVM_SOURCE_DIR}/cmake/modules")
+
   set(LLVM_TABLEGEN_EXE "llvm-tblgen")
   message(STATUS "[VC] Using executable target llvm-tlbgen for tablegenning")
-  # IGC has its own special cmake for external llvm.
-  # It sets LLVM_INCLUDE_DIRS instead of LLVM_INCLUDE_DIR.
-  set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIRS})
 endif()
 
-# Now find_package was called in all cases and we have all needed variables.
 set(CMAKE_MODULE_PATH
   ${LLVM_CMAKE_DIR}
   ${CMAKE_MODULE_PATH}
   )
 
 include(AddLLVM)
-
-set(LLVM_MAIN_INCLUDE_DIR ${LLVM_INCLUDE_DIR})
 include(TableGen)
 # Set LLVM_TABLEGEN_FLAGS manually based on include dirs.
-list(TRANSFORM LLVM_INCLUDE_DIR PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLAGS)
-
-message(STATUS "[VC] Including llvm headers: ${LLVM_INCLUDE_DIR}")
-include_directories(${LLVM_INCLUDE_DIR})
+list(TRANSFORM LLVM_INCLUDE_DIRS PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLAGS)
 
 # --- VISA ---
 

IGC/VectorCompiler/cmake/spirv.cmake

@@ -97,6 +97,11 @@ set(MAKE_EXEC ${CMAKE_MAKE_PROGRAM})
 message(STATUS "[VC] SPIRVDLL_SRC = ${SPIRVDLL_SRC}")
 message(STATUS "[VC] SPIRV_SRC = ${SPIRV_SRC}")
 
+# LLVM DIR should be present in external build but can be missing with
+# in-tree build so set it manually in this case.
+if(NOT LLVM_DIR)
+  set(LLVM_DIR ${LLVM_BINARY_DIR}/lib/cmake/llvm)
+endif()
 if(DEFINED SPIRVDLL_SRC)
   if(NOT EXISTS ${SPIRVDLL_SRC})
     message(FATAL_ERROR "[VC] Cannot find SPIRVDLL sources in ${SPIRVDLL_SRC}")

external/llvm/llvm.cmake

@@ -140,7 +140,7 @@ if(${IGC_OPTION__LLVM_SOURCES})
 elseif(${IGC_OPTION__LLVM_PREBUILDS})
   message(STATUS "[IGC] IGC will take LLVM prebuilts.")
   message(STATUS "[IGC] LLVM prebuilts folder : ${IGC_OPTION__LLVM_PREBUILDS_DIR}")
-  include(${IGC_LLVM_PATCHER_DIR}/llvm_prebuilt.cmake)
+  include(${IGC_LLVM_TOOLS_DIR}/llvm_prebuilt.cmake)
 elseif(${IGC_OPTION__LLVM_FROM_SYSTEM})
   message(STATUS "[IGC] IGC will take LLVM from system.")
 endif()