Merge from branch sycl

# Conflicts:
#	clang/include/clang/Basic/DiagnosticSemaKinds.td

Author: jtmott-intel

.arclint

@@ -0,0 +1,12 @@
+{
+  "linters": {
+    "clang-format": {
+      "type": "script-and-regex",
+      "script-and-regex.script": "bash utils/arcanist/clang-format.sh",
+      "script-and-regex.regex": "/^(?P<severity>[[:alpha:]]+)\n(?P<message>[^\n]+)\n(====|(?P<line>\\d),(?P<char>\\d)\n(?P<original>.*)>>>>\n(?P<replacement>.*)<<<<\n)$/s",
+      "include": [
+        "(\\.(cc|cpp|h)$)"
+      ]
+    }
+  }
+}

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 * @bader
 
-clang/ @erichkeane @Fznamznon
+clang/ @Fznamznon @premanandrao @elizabethandrews
 
 clang/**/Driver @mdtoguchi @AGindinson
 
@@ -63,6 +63,9 @@ sycl/include/CL/sycl/intel/fpga_reg.hpp @MrSidims
 sycl/include/CL/sycl/intel/pipes.hpp @MrSidims
 sycl/include/CL/sycl/pipes.hpp @MrSidims
 
+# Reduction extension
+sycl/include/CL/sycl/intel/reduction.hpp @v-klochkov
+
 # Function pointers
 sycl/include/CL/sycl/intel/function_pointer.hpp @AlexeySachkov
 sycl/source/function_pointer.cpp @AlexeySachkov
@@ -75,9 +78,11 @@ sycl/source/half_type.cpp @AlexeySachkov
 sycl/include/CL/sycl/swizzles.def @turinevgeny
 sycl/include/CL/sycl/types.hpp @turinevgeny
 
+sycl/plugins/cuda/ @intel/llvm-reviewers-cuda
 
 sycl/doc/ @pvchupin @kbobrovs
 
 sycl/doc/extensions/ @mkinsner @jbrodman
 
 xpti/ @tovinkere @andykaylor
+xptifw/ @tovinkere  @andykaylor

.gitignore

@@ -35,6 +35,7 @@
 /GRTAGS
 /GSYMS
 /GTAGS
+/ID
 .gitusers
 autom4te.cache
 cscope.files

CONTRIBUTING.md

@@ -1,69 +1,15 @@
 # Contributing
 
 ## License
-Intel Project for LLVM\* technology is licensed under the terms of the
-Apache-2.0 with LLVM-exception license ([LICENSE.txt](llvm/LICENSE.TXT))
-to ensure our ability to contribute this project to the LLVM project
-under the same license.
 
-By contributing to this project, you agree to the Apache-2.0 with
-LLVM-exception license and copyright terms there in and release your
-contribution under these terms.
+Intel Project for LLVM\* technology is licensed under the terms of the Apache
+License v2.0 with LLVM Exceptions license ([LICENSE.txt](llvm/LICENSE.TXT)) to
+ensure our ability to contribute this project to the LLVM project under the
+same license.
 
-## Sign your work
-Please use the sign-off line at the end of your contribution. Your
-signature certifies that you wrote the contribution or otherwise have
-the right to pass it on as an open-source contribution, and that you
-agree to provide your contribution under the terms of the licenses
-noted above. The rules are pretty simple: if you can certify the
-below (from [developercertificate.org](http://developercertificate.org)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <[email protected]>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
+By contributing to this project, you agree to the Apache License v2.0 with LLVM
+Exceptions and copyright terms there in and release your contribution under
+these terms.
 
 ## Contribution process
 
@@ -77,12 +23,25 @@ for more information.
 - Create a personal fork of the project on GitHub
   - For the DPC++ Compiler project, use **sycl** branch as baseline for your
     changes. See [Get Started Guide](sycl/doc/GetStartedGuide.md).
-- Prepare your patch (follow
-  [LLVM coding standards](https://llvm.org/docs/CodingStandards.html)).
-  [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [clang-tidy](
-  https://clang.llvm.org/extra/clang-tidy/) tools can be integrated into your
-  workflow to ensure formatting and stylistic compliance of your changes.
+- Prepare your patch
+    - follow [LLVM coding standards](https://llvm.org/docs/CodingStandards.html)
+    - [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and
+      [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) tools can be
+      integrated into your workflow to ensure formatting and stylistic
+      compliance of your changes.
+    - use
+      ```
+      ./clang/tools/clang-format/git-clang-format `git merge-base origin/sycl HEAD`
+      ```
+      to check the format of your current changes against the `origin/sycl`
+      branch.
+        - `-f` to also correct unstaged changes
+        - `--diff` to only print the diff without applying
 - Build the project and run all tests.
+    - complete test suite: `python buildbot/check.py`
+    - sycl test suite `python buildbot/check.py -t test-sycl`
+    - run only "mytest" test `python buildbot/check.py -t test-sycl-mytest`
+    - if necessary, use `-o $LLVM_BUILD_DIR` to specify the llvm build directory
 
 ### Commit message
 
@@ -114,5 +73,4 @@ Project maintainers merge pull requests using one of the following options:
 - [Create a merge commit] Used for LLVM pull-down PRs to preserve hashes of the
 commits pulled from the LLVM community repository
 
-
 *Other names and brands may be claimed as the property of others.

README.md

@@ -4,22 +4,25 @@
 
 Intel staging area for llvm.org contribution.
 Home for Intel LLVM-based projects:
- - oneAPI Data Parallel C++ compiler - see **sycl** branch. More information on
-   oneAPI and DPC++ is available at
-([https://www.oneapi.com/](https://www.oneapi.com/))
-   - [![Linux Post Commit Checks](https://github.com/intel/llvm/workflows/Linux%20Post%20Commit%20Checks/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Linux+Post+Commit+Checks%22) [![Generate Doxygen documentation](https://github.com/intel/llvm/workflows/Generate%20Doxygen%20documentation/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Generate+Doxygen+documentation%22)
-
 
+* oneAPI Data Parallel C++ compiler - see **sycl** branch. More information on
+   oneAPI and DPC++ is available at
+[https://www.oneapi.com/](https://www.oneapi.com/)
+  * [![Linux Post Commit Checks](https://github.com/intel/llvm/workflows/Linux%20Post%20Commit%20Checks/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Linux+Post+Commit+Checks%22)
+    [![Generate Doxygen documentation](https://github.com/intel/llvm/workflows/Generate%20Doxygen%20documentation/badge.svg)](https://github.com/intel/llvm/actions?query=workflow%3A%22Generate+Doxygen+documentation%22)
 
 ## License
+
 See [LICENSE.txt](sycl/LICENSE.TXT) for details.
 
 ## Contributing
+
 See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
 ## Sub-projects Documentation
- - oneAPI Data Parallel C++ compiler - See
-   [GetStartedGuide.md](sycl/doc/GetStartedGuide.md)
+
+* oneAPI Data Parallel C++ compiler - See
+  [DPC++ Documentation](https://intel.github.io/llvm-docs/)
 
 ## DPC++ extensions
 
@@ -28,4 +31,3 @@ SYCL\* standards. DPC++ extends these standards with a number of extensions,
 which can be found in [sycl/doc/extensions](sycl/doc/extensions) directory.
 
 \*Other names and brands may be claimed as the property of others.
-

buildbot/check.py

@@ -30,7 +30,7 @@ def do_check(args):
         args.test_suite,
         "-j", str(cpu_count)]
 
-    print(cmake_cmd)
+    print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
     env_tmp=os.environ
     env_tmp["LIT_ARGS"]="\"{}\"".format("-v")

buildbot/compile.py

@@ -32,7 +32,7 @@ def do_compile(args):
         "deploy-opencl-aot",
         "-j", str(cpu_count)]
 
-    print(cmake_cmd)
+    print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
     subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
 

buildbot/configure.py

@@ -1,22 +1,15 @@
 import argparse
 import os
+import platform
 import subprocess
 import sys
-import platform
 
 def do_configure(args):
-    ret = False
-
     # Get absolute path to source directory
-    if args.src_dir:
-      abs_src_dir = os.path.abspath(args.src_dir)
-    else:
-      abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
+    abs_src_dir = os.path.abspath(args.src_dir if args.src_dir else os.path.join(__file__, "../.."))
     # Get absolute path to build directory
-    if args.obj_dir:
-      abs_obj_dir = os.path.abspath(args.obj_dir)
-    else:
-      abs_obj_dir = os.path.join(abs_src_dir, "build")
+    abs_obj_dir = os.path.abspath(args.obj_dir) if args.obj_dir else os.path.join(abs_src_dir, "build")
+    # Create build directory if it doesn't exist
     if not os.path.isdir(abs_obj_dir):
       os.makedirs(abs_obj_dir)
 
@@ -37,10 +30,7 @@ def do_configure(args):
     llvm_enable_sphinx = 'OFF'
     llvm_build_shared_libs = 'OFF'
 
-    if platform.system() == 'Linux':
-        icd_loader_lib = os.path.join(icd_loader_lib, "libOpenCL.so")
-    else:
-        icd_loader_lib = os.path.join(icd_loader_lib, "OpenCL.lib")
+    icd_loader_lib = os.path.join(icd_loader_lib, "libOpenCL.so" if platform.system() == 'Linux' else "OpenCL.lib")
 
     if args.cuda:
         llvm_targets_to_build += ';NVPTX'
@@ -92,14 +82,22 @@ def do_configure(args):
             "-DOpenCL_INCLUDE_DIR={}".format(ocl_header_dir),
             "-DOpenCL_LIBRARY={}".format(icd_loader_lib)])
 
+    if args.l0_headers and args.l0_loader:
+      cmake_cmd.extend([
+            "-DL0_INCLUDE_DIR={}".format(args.l0_headers),
+            "-DL0_LIBRARY={}".format(args.l0_loader)])
+    elif args.l0_headers or args.l0_loader:
+      sys.exit("Please specify both Level Zero headers and loader or don't specify "
+               "none of them to let download from github.com")
+
     # Add additional CMake options if provided
     if args.cmake_opt:
       cmake_cmd += args.cmake_opt
 
     # Add path to root CMakeLists.txt
     cmake_cmd.append(llvm_dir)
 
-    print(cmake_cmd)
+    print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
     try:
         subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
@@ -109,21 +107,24 @@ def do_configure(args):
             os.remove(cmake_cache)
         subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
 
-    ret = True
-    return ret
+    return True
 
 def main():
     parser = argparse.ArgumentParser(prog="configure.py",
                                      description="Generate build files from CMake configuration files",
                                      formatter_class=argparse.RawTextHelpFormatter)
+    # CI system options
     parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
     parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
     parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
     parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
     parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
                         help="builder directory, which is the directory contains source and build directories")
+    # User options
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory (autodetected by default)")
     parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory. (<src>/build by default)")
+    parser.add_argument("--l0-headers", metavar="L0_HEADER_DIR", help="directory with Level Zero headers")
+    parser.add_argument("--l0-loader", metavar="L0_LOADER", help="path to the Level Zero loader")
     parser.add_argument("-t", "--build-type",
                         metavar="BUILD_TYPE", default="Release", help="build type: Debug, Release")
     parser.add_argument("--cuda", action='store_true', help="switch from OpenCL to CUDA")

buildbot/dependency.conf

@@ -0,0 +1,28 @@
+[VERSIONS]
+# https://github.com/intel/llvm/releases/download/2020-WW20/oclcpuexp-2020.10.6.0.4_rel.tar.gz
+ocl_cpu_rt_ver=2020.10.6.0.04
+# https://github.com/intel/llvm/releases/download/2020-WW20/win-oclcpuexp-2020.10.6.0.4_rel.zip
+ocl_cpu_rt_ver_win=2020.10.6.0.04
+# Same GPU driver supports Level Zero and OpenCL:
+# https://github.com/intel/compute-runtime/releases/tag/20.21.16886
+ocl_gpu_rt_ver=20.21.16886
+# Same GPU driver supports Level Zero and OpenCL:
+# https://downloadmirror.intel.com/29616/a08/igfx_win10_100.8280.zip
+ocl_gpu_rt_ver_win=27.20.100.8280
+intel_sycl_ver=build
+# https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-lin.tgz
+tbb_ver=20200121_111047
+# https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip
+tbb_ver_win=20200124_000000
+# TODO: provide URL for Linux OpenCL emulator of FPGA device
+fpga_ver=20200216_000000
+# TODO: provide URL for Windows OpenCL emulator of FPGA device
+fpga_ver_win=20200216_000000
+
+[DRIVER VERSIONS]
+cpu_driver_lin=2020.10.6.0.04
+cpu_driver_win=2020.10.6.0.04
+gpu_driver_lin=20.21.16886
+gpu_driver_win=27.20.100.8280
+fpga_driver_lin=2020.9.2.0
+fpga_driver_win=2020.9.2.0

buildbot/dependency.py

@@ -73,6 +73,9 @@ def do_dependency(args):
                  "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
                  "-DOPENCL_ICD_LOADER_HEADERS_DIR={}".format(ocl_header_dir),
                  ".." ]
+
+    print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
+    
     subprocess.check_call(cmake_cmd, cwd=icd_build_dir)
 
     env_tmp=os.environ

clang-tools-extra/clang-apply-replacements/CMakeLists.txt

@@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS
 
 add_clang_library(clangApplyReplacements
   lib/Tooling/ApplyReplacements.cpp
+)
 
-  LINK_LIBS
+clang_target_link_libraries(clangApplyReplacements
+  PRIVATE
   clangAST
   clangBasic
   clangRewrite

clang-tools-extra/clang-change-namespace/CMakeLists.txt

@@ -1,11 +1,14 @@
 set(LLVM_LINK_COMPONENTS
-  support
+  FrontendOpenMP
+  Support
   )
 
 add_clang_library(clangChangeNamespace
   ChangeNamespace.cpp
+)
 
-  LINK_LIBS
+clang_target_link_libraries(clangChangeNamespace
+  PRIVATE
   clangAST
   clangASTMatchers
   clangBasic