Make intrinsics module searching more robust

.gitignore

@@ -0,0 +1,60 @@
+#==============================================================================#
+# This file specifies intentionally untracked files that git should ignore.
+# See: http://www.kernel.org/pub/software/scm/git/docs/gitignore.html
+#
+# This file is intentionally different from the output of `git svn show-ignore`,
+# as most of those are useless.
+#==============================================================================#
+
+#==============================================================================#
+# File extensions to be ignored anywhere in the tree.
+#==============================================================================#
+# Temp files created by most text editors.
+*~
+# Merge files created by git.
+*.orig
+# Byte compiled python modules.
+*.pyc
+# vim swap files
+.*.sw?
+.sw?
+#OS X specific files.
+.DS_store
+
+# Nested build directory
+/build
+
+#==============================================================================#
+# Explicit files to ignore (only matches one).
+#==============================================================================#
+# Various tag programs
+/tags
+/TAGS
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+.gitusers
+autom4te.cache
+cscope.files
+cscope.out
+autoconf/aclocal.m4
+autoconf/autom4te.cache
+/compile_commands.json
+tags
+# Visual Studio built-in CMake configuration
+/CMakeSettings.json
+# CLion project configuration
+/.idea
+
+#==============================================================================#
+# Directories to ignore (do not add trailing '/'s, they skip symlinks).
+#==============================================================================#
+# Sphinx build tree, if building in-source dir.
+GenXIntrinsics/docs/_build
+GenXIntrinsics/docs/autogenerated
+# VS2017 and VSCode config files.
+.vscode
+.vs
+# clangd index
+.clangd

CMakeLists.txt

@@ -1,12 +1,22 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 cmake_minimum_required(VERSION 3.13.4)
 
 set(LLVM_GENX_INTRINSICS_VERSION 1.0)
 
+set(LLVM_GENX_INTRINSICS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 # check if we build inside llvm or not
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   get_filename_component(LLVM_CMAKE_PATH ${LLVM_DIR} ABSOLUTE BASE_DIR ${CMAKE_BINARY_DIR})
   set(BUILD_EXTERNAL YES)
-  if (NOT DEFINED INSTALL_REQUIRED)
+  if(NOT DEFINED INSTALL_REQUIRED)
     set(INSTALL_REQUIRED YES)
   endif()
   project(LLVM_GenXIntrinsics
@@ -36,28 +46,26 @@ else(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
   # LLVM_CMAKE_DIR is not set for non-standalone builds. Use LLVM_CMAKE_PATH
   # instead. (see clang/CMakeLists.txt)
-  if (NOT LLVM_CMAKE_DIR)
+  if(NOT LLVM_CMAKE_DIR)
     set(LLVM_CMAKE_DIR ${LLVM_CMAKE_PATH})
   endif()
-
-  # we require include_directories because other components may include intrinsics headers.
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/GenXIntrinsics/include)
-  include_directories(${CMAKE_CURRENT_BINARY_DIR}/GenXIntrinsics/include)
 endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
+if(LLVM_VERSION_MAJOR VERSION_LESS 8)
+  message(FATAL_ERROR "VC-intrinsics do not support ${LLVM_VERSION} LLVM version")
+endif()
+
 include(FindPythonInterp)
-if( NOT PYTHONINTERP_FOUND )
+if(NOT PYTHONINTERP_FOUND)
   message(FATAL_ERROR
 "Unable to find Python interpreter, required for builds and testing.
 
 Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
 endif()
 
-if( "${PYTHON_VERSION_STRING}" VERSION_LESS 2.7 )
+if("${PYTHON_VERSION_STRING}" VERSION_LESS 2.7)
   message(FATAL_ERROR "Python 2.7 or newer is required")
 endif()
 
 
 add_subdirectory(GenXIntrinsics)
-
-

GenXIntrinsics/CMakeLists.txt

@@ -1,14 +1,30 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 cmake_minimum_required(VERSION 3.13.4)
 include(GNUInstallDirs)
 
 set(GENX_INTRINSICS_MAIN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
+set(GENX_INTRINSICS_MAIN_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 if(IGC_INFRA)
   set(GENX_INTRINSICS_MAIN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
 endif()
 
 include(cmake/utils.cmake)
 
+# Global config.
+add_compile_definitions(VC_INTR_LLVM_VERSION_MAJOR=${LLVM_VERSION_MAJOR})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
 set(GENX_INTRINSICS_DESCRIPTION "GenXIntrinsicDescription.gen")
 
 add_subdirectory(include/llvm)
@@ -59,9 +75,16 @@ if(INSTALL_REQUIRED)
       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     )
 
+    # Legacy export. To remove when all clients switch to new name.
     install(EXPORT LLVMGenXIntrinsicsTargets
       FILE LLVMGenXIntrinsicsConfig.cmake
       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLVMGenXIntrinsics
     )
+
+    set(PACKAGE_NAME VCIntrinsics${LLVM_VERSION_MAJOR})
+    install(EXPORT LLVMGenXIntrinsicsTargets
+      FILE ${PACKAGE_NAME}Config.cmake
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}
+    )
   endif() # BUILD_EXTERNAL
 endif() # INSTALL_REQUIRED

GenXIntrinsics/cmake/utils.cmake

@@ -1,3 +1,11 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2020-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 # Convenience function to get list of LLVM components for
 # target_link_library. If LLVM was configured with llvm dylib, then
 # included in dylib llvm targets should be replaced with LLVM

GenXIntrinsics/docs/GenXLangRef.rst

@@ -1,3 +1,11 @@
+.. ========================= begin_copyright_notice ============================
+
+  Copyright (C) 2015-2021 Intel Corporation
+
+  SPDX-License-Identifier: MIT
+
+  =========================== end_copyright_notice =============================
+
 ============================
 LLVM IR for the GenX backend
 ============================

GenXIntrinsics/docs/LangRefIndex.rst

@@ -1,3 +1,11 @@
+.. ========================= begin_copyright_notice ============================
+
+  Copyright (C) 2019-2021 Intel Corporation
+
+  SPDX-License-Identifier: MIT
+
+  =========================== end_copyright_notice =============================
+
 VC Intrinsics documentation (language reference)
 ==================================================
 

GenXIntrinsics/docs/Makefile.sphinx

@@ -1,3 +1,11 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 # Minimal makefile for Sphinx documentation
 #
 

GenXIntrinsics/docs/ReadMe.txt

@@ -0,0 +1,8 @@
+<!---======================= begin_copyright_notice ============================
+
+Copyright (C) 2021 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ==========================-->
+

GenXIntrinsics/docs/conf.py

@@ -1,3 +1,11 @@
+# ========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+# =========================== end_copyright_notice =============================
+
 # -*- coding: utf-8 -*-
 #
 # VC Intrinsics documentation build configuration file.

GenXIntrinsics/include/llvm/CMakeLists.txt

@@ -1 +1,9 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 add_subdirectory(GenXIntrinsics)

GenXIntrinsics/include/llvm/GenXIntrinsics/CMakeLists.txt

@@ -1,3 +1,11 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2019-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${GENX_INTRINSICS_DESCRIPTION}
     COMMAND ${PYTHON_EXECUTABLE} -B
@@ -10,8 +18,44 @@ add_custom_command(
     COMMENT "Building ${GENX_INTRINSICS_DESCRIPTION}..."
 )
 
+find_first_existing_vc_file(intrinsics_vc "${GENX_INTRINSICS_MAIN_DIR}")
+
+set(version_inc ${CMAKE_CURRENT_BINARY_DIR}/GenXVersion.inc)
+
+if(LLVM_GENX_INTRINSICS_ROOT_DIR)
+  set(LLVM_GENX_INTRINSICS_REPO_DIR ${LLVM_GENX_INTRINSICS_ROOT_DIR})
+else()
+  set(LLVM_GENX_INTRINSICS_REPO_DIR ${GENX_INTRINSICS_MAIN_DIR}/..)
+endif()
+
+if(${LLVM_VERSION_MAJOR} LESS 9)
+  find_file(FOUND_VCS GetSVN.cmake PATHS ${LLVM_CMAKE_DIR} REQUIRED)
+  add_custom_command(
+    OUTPUT "${version_inc}"
+    COMMAND
+    ${CMAKE_COMMAND} "-DSOURCE_DIRS=${LLVM_GENX_INTRINSICS_REPO_DIR}"
+                     "-DNAMES=VCI"
+                     "-DHEADER_FILE=${version_inc}"
+                     -P "${FOUND_VCS}")
+else()
+  find_file(FOUND_VCS VersionFromVCS.cmake PATHS ${LLVM_CMAKE_DIR} REQUIRED)
+  add_custom_command(
+    OUTPUT "${version_inc}"
+    COMMAND
+    ${CMAKE_COMMAND} "-DSOURCE_DIR=${LLVM_GENX_INTRINSICS_REPO_DIR}"
+                     "-DNAME=VCI"
+                     "-DHEADER_FILE=${version_inc}"
+                     "-DVCS_SCRIPT=${FOUND_VCS}"
+                     -P "${CMAKE_CURRENT_SOURCE_DIR}/ConfigureVersionFile.cmake")
+endif()
+
+set_source_files_properties("${version_inc}"
+    PROPERTIES GENERATED TRUE
+    HEADER_FILE_ONLY TRUE)
+
 add_custom_target(GenXIntrinsicDescriptionGen
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GENX_INTRINSICS_DESCRIPTION}
+    ${version_inc}
 )
 add_custom_target(GenXIntrinsicsGen)
 add_dependencies(GenXIntrinsicsGen GenXIntrinsicDescriptionGen)

GenXIntrinsics/include/llvm/GenXIntrinsics/ConfigureVersionFile.cmake

@@ -0,0 +1,22 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2020-2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
+include(${VCS_SCRIPT})
+
+function(generate_version_file output_file)
+  get_source_info(${SOURCE_DIR} rev repo)
+  file(APPEND "${output_file}.txt" "#define ${NAME}_REVISION \"${rev}\"\n")
+  file(APPEND "${output_file}.txt" "#define ${NAME}_REPOSITORY \"${repo}\"\n")
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${output_file}.txt" "${output_file}")
+  file(REMOVE "${output_file}.txt")
+
+endfunction()
+
+generate_version_file(${HEADER_FILE})
+

GenXIntrinsics/include/llvm/GenXIntrinsics/GenXIntrOpts.h

@@ -1,16 +1,20 @@
-//===-- GenXIntrOpts.h - GenX Transformations -------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2020-2021 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+/*========================== begin_copyright_notice ============================
+
+This file is distributed under the University of Illinois Open Source License.
+See LICENSE.TXT for details.
+
+============================= end_copyright_notice ===========================*/
+
 // This header file defines prototypes for accessor functions that expose passes
 // in the GenX Intrinsics transformations library.
-//
-//===----------------------------------------------------------------------===//
 
 #ifndef LLVM_GENX_INTR_OPTS_H
 #define LLVM_GENX_INTR_OPTS_H