Merge branch 'sycl' into private/dongkyun/esimd_cpu_emulation_new_header_files

Author: dongkyunahn-intel

.github/CODEOWNERS

@@ -9,8 +9,11 @@ clang/**/Driver @mdtoguchi @AGindinson
 # LLVM-SPIRV translator
 llvm-spirv/ @AlexeySotkin @AlexeySachkov
 
+# OpenCL deps
+opencl/ @pvchupin @vladimirlaz
+
 # OpenCL "offline" compiler
-opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
+opencl/opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
 
 # Device library
 libdevice/ @vzakhari @jinge90
@@ -20,19 +23,9 @@ sycl/ @intel/llvm-reviewers-runtime
 
 # Documentation
 sycl/ReleaseNotes.md @pvchupin
-sycl/doc/ @pvchupin @kbobrovs
+sycl/doc/ @pvchupin @bader
 sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
-# USM
-sycl/include/CL/sycl/detail/clusm.hpp @jbrodman
-sycl/include/CL/sycl/detail/usm_impl.hpp @jbrodman
-sycl/include/CL/sycl/usm/ @jbrodman
-sycl/include/CL/sycl/ordered_queue.hpp @jbrodman
-sycl/include/CL/sycl/usm.hpp @jbrodman
-sycl/include/CL/cl_usm_ext.h @jbrodman
-sycl/source/detail/usm/ @jbrodman
-sycl/source/ordered_queue.cpp @jbrodman
-
 # Sub-groups
 sycl/include/CL/sycl/detail/spirv.hpp @Pennycook @AlexeySachkov
 sycl/include/CL/sycl/intel/group_algorithm.hpp @Pennycook @AlexeySachkov
@@ -59,15 +52,6 @@ sycl/include/CL/sycl/stream.hpp @againull
 sycl/source/detail/stream_impl.cpp @againull
 sycl/source/stream.cpp @againull
 
-# Specialization constant
-sycl/include/CL/sycl/detail/sycl_fe_intrins.hpp @kbobrovs
-sycl/include/CL/sycl/experimental/spec_constant.hpp @kbobrovs
-sycl/source/detail/spec_constant_impl.hpp @kbobrovs
-
-# Program manager
-sycl/source/detail/program_manager @kbobrovs
-sycl/source/detail/spec_constant_impl.cpp @kbobrovs
-
 # FPGA extensions
 sycl/include/CL/sycl/intel/fpga_device_selector.hpp @MrSidims
 sycl/include/CL/sycl/intel/fpga_extensions.hpp @MrSidims
@@ -95,27 +79,32 @@ xpti/ @tovinkere @andykaylor
 xptifw/ @tovinkere  @andykaylor
 
 # DPC++ tools
-llvm/**/file-table-tform/ @kbobrovs @AlexeySachkov
+llvm/**/append-file/ @mdtoguchi @AGindinson
+llvm/**/file-table-tform/ @mlychkov @AlexeySachkov @kbobrovs
 llvm/**/llvm-foreach/ @AlexeySachkov  @Fznamznon
 llvm/**/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
-llvm/**/sycl-post-link/ @kbobrovs @AlexeySachkov
-llvm/include/llvm/Support/PropertySetIO.h @kbobrovs @AlexeySachkov
-llvm/lib/Support/PropertySetIO.cpp @kbobrovs @AlexeySachkov
-llvm/unittests/Support/PropertySetIOTest.cpp @kbobrovs @AlexeySachkov
-llvm/lib/Support/Base64.cpp @kbobrovs @AlexeySachkov
+llvm/**/sycl-post-link/ @mlychkov @AlexeySachkov @kbobrovs
+llvm/include/llvm/Support/PropertySetIO.h @mlychkov @AlexeySachkov @kbobrovs
+llvm/lib/Support/PropertySetIO.cpp @mlychkov @AlexeySachkov @kbobrovs
+llvm/unittests/Support/PropertySetIOTest.cpp @mlychkov @AlexeySachkov @kbobrovs
+llvm/include/llvm/Support/SimpleTable.h @mlychkov @AlexeySachkov @kbobrovs
+llvm/lib/Support/SimpleTable.cpp @mlychkov @AlexeySachkov @kbobrovs
+llvm/unittests/Support/SimpleTableTest.cpp @mlychkov @AlexeySachkov @kbobrovs
+llvm/lib/Support/Base64.cpp @mlychkov @AlexeySachkov @kbobrovs
 
 # Clang offload tools
-clang/tools/clang-offload-bundler/ @kbobrovs @sndmitriev
-clang/tools/clang-offload-wrapper/ @sndmitriev @kbobrovs
-clang/tools/clang-offload-deps/ @sndmitriev
+clang/tools/clang-offload-bundler/ @mlychkov @sndmitriev @AlexeySachkov
+clang/tools/clang-offload-wrapper/ @mlychkov @sndmitriev @AlexeySachkov @kbobrovs
+clang/tools/clang-offload-deps/ @sndmitriev @mlychkov @AlexeySachkov
+clang/tools/clang-offload-extract/ @sndmitriev @mlychkov @AlexeySachkov
 
 # Explicit SIMD
 SYCLLowerIR/ @kbobrovs @DenisBakhvalov
 esimd/ @kbobrovs @DenisBakhvalov
-sycl/include/CL/sycl/INTEL/esimd.hpp @kbobrovs @DenisBakhvalov
+sycl/include/sycl/ext/intel/experimental/esimd.hpp @kbobrovs @DenisBakhvalov
 sycl/doc/extensions/ExplicitSIMD/ @kbobrovs
 
 # ITT annotations
-llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims
-llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h @MrSidims
-
+llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims @vzakhari
+llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h @MrSidims @vzakhari
+llvm/test/Transforms/SPIRITTAnnotations/* @MrSidims @vzakhari

.github/workflows/clang-format.yml

@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Get clang-format first
-      run: sudo apt-get install -yqq clang-format-9
+      run: sudo apt-get install -yqq clang-format
 
     - uses: actions/checkout@v2
       with:
         fetch-depth: 2
 
     - name: Run clang-format for the patch
       run: |
-        git diff --no-color ${GITHUB_SHA}^1 ${GITHUB_SHA} --name-only -- | grep -v "/test/" | xargs git diff -U0 --no-color ${GITHUB_SHA}^1 ${GITHUB_SHA} -- | ./clang/tools/clang-format/clang-format-diff.py -p1 -binary clang-format-9 > ./clang-format.patch
+        git diff --no-color ${GITHUB_SHA}^1 ${GITHUB_SHA} --name-only -- | grep -v "/test/" | xargs git diff -U0 --no-color ${GITHUB_SHA}^1 ${GITHUB_SHA} -- | ./clang/tools/clang-format/clang-format-diff.py -p1 -binary clang-format > ./clang-format.patch
 
     # Add patch with formatting fixes to CI job artifacts
     - uses: actions/upload-artifact@v1

.github/workflows/linux_post_commit.yml

@@ -7,6 +7,7 @@ on:
 jobs:
    check:
      runs-on: ubuntu-18.04
+     if: github.repository == 'intel/llvm'
      strategy:
        fail-fast: false
        matrix:

.github/workflows/sync-main.yml

@@ -2,10 +2,11 @@ name: automatic sync main branch from llvm-project to llvm
 
 on:
   schedule:
-  - cron: '*/10 * * * *'
+  - cron: '0 */1 * * *'
 jobs:
   sync:
     runs-on: ubuntu-latest
+    if: github.repository == 'intel/llvm'
     steps:
       - uses: actions/checkout@v2
         with:

SECURITY.md

@@ -0,0 +1,5 @@
+# Reporting LLVM Security Issues
+
+To report security issues in LLVM, please follow the steps outlined on the
+[LLVM Security Group](https://llvm.org/docs/Security.html#how-to-report-a-security-issue)
+page.

buildbot/compile.py

@@ -32,9 +32,11 @@ def do_compile(args):
         "--build", abs_obj_dir,
         "--",
         "deploy-sycl-toolchain",
-        "deploy-opencl-aot",
         "-j", str(cpu_count)]
 
+    if args.verbose:
+      cmake_cmd.append("--verbose")
+
     print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
 
     subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
@@ -55,6 +57,7 @@ def main():
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
     parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
     parser.add_argument("-j", "--build-parallelism", metavar="BUILD_PARALLELISM", help="build parallelism")
+    parser.add_argument("-v", "--verbose", action='store_true', help="verbose build output")
 
     args = parser.parse_args()
 

buildbot/configure.py

@@ -13,16 +13,14 @@ def do_configure(args):
     if not os.path.isdir(abs_obj_dir):
       os.makedirs(abs_obj_dir)
 
-    llvm_external_projects = 'sycl;llvm-spirv;opencl-aot;libdevice;xpti;xptifw'
+    llvm_external_projects = 'sycl;llvm-spirv;opencl;libdevice;xpti;xptifw'
 
     llvm_dir = os.path.join(abs_src_dir, "llvm")
     sycl_dir = os.path.join(abs_src_dir, "sycl")
     spirv_dir = os.path.join(abs_src_dir, "llvm-spirv")
     xpti_dir = os.path.join(abs_src_dir, "xpti")
     xptifw_dir = os.path.join(abs_src_dir, "xptifw")
     libdevice_dir = os.path.join(abs_src_dir, "libdevice")
-    ocl_header_dir = os.path.join(abs_obj_dir, "OpenCL-Headers")
-    icd_loader_lib = os.path.join(abs_obj_dir, "OpenCL-ICD-Loader", "build")
     llvm_targets_to_build = 'X86'
     llvm_enable_projects = 'clang;' + llvm_external_projects
     libclc_targets_to_build = ''
@@ -33,9 +31,9 @@ def do_configure(args):
     llvm_enable_doxygen = 'OFF'
     llvm_enable_sphinx = 'OFF'
     llvm_build_shared_libs = 'OFF'
+    llvm_enable_lld = 'OFF'
 
     sycl_enable_xpti_tracing = 'ON'
-    icd_loader_lib = os.path.join(icd_loader_lib, "libOpenCL.so" if platform.system() == 'Linux' else "OpenCL.lib")
 
     # replace not append, so ARM ^ X86
     if args.arm:
@@ -63,6 +61,9 @@ def do_configure(args):
     if args.shared_libs:
         llvm_build_shared_libs = 'ON'
 
+    if args.use_lld:
+      llvm_enable_lld = 'ON'
+
     install_dir = os.path.join(abs_obj_dir, "install")
 
     cmake_cmd = [
@@ -88,15 +89,11 @@ def do_configure(args):
         "-DLLVM_ENABLE_DOXYGEN={}".format(llvm_enable_doxygen),
         "-DLLVM_ENABLE_SPHINX={}".format(llvm_enable_sphinx),
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
-        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu),
-        "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing)
+        "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
+        "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
+        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu)
     ]
 
-    if args.system_ocl:
-      cmake_cmd.extend([
-            "-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),
@@ -128,8 +125,10 @@ def do_configure(args):
     except subprocess.CalledProcessError:
         cmake_cache = os.path.join(abs_obj_dir, "CMakeCache.txt")
         if os.path.isfile(cmake_cache):
-            os.remove(cmake_cache)
-        subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
+           print("There is CMakeCache.txt at " + cmake_cache +
+             " ... you can try to remove it and rerun.")
+           print("Configure failed!")
+        return False
 
     return True
 
@@ -156,14 +155,14 @@ def main():
     parser.add_argument("--disable-esimd-cpu", action='store_true', help="build without ESIMD_CPU support")
     parser.add_argument("--no-assertions", action='store_true', help="build without assertions")
     parser.add_argument("--docs", action='store_true', help="build Doxygen documentation")
-    parser.add_argument("--system-ocl", action='store_true', help="use OpenCL deps from system (no download)")
     parser.add_argument("--no-werror", action='store_true', help="Don't treat warnings as errors")
     parser.add_argument("--shared-libs", action='store_true', help="Build shared libraries")
     parser.add_argument("--cmake-opt", action='append', help="Additional CMake option not configured via script parameters")
     parser.add_argument("--cmake-gen", default="Ninja", help="CMake generator")
     parser.add_argument("--use-libcxx", action="store_true", help="build sycl runtime with libcxx")
     parser.add_argument("--libcxx-include", metavar="LIBCXX_INCLUDE_PATH", help="libcxx include path")
     parser.add_argument("--libcxx-library", metavar="LIBCXX_LIBRARY_PATH", help="libcxx library path")
+    parser.add_argument("--use-lld", action="store_true", help="Use LLD linker for build")
     args = parser.parse_args()
 
     print("args:{}".format(args))

buildbot/dependency.conf

@@ -4,11 +4,11 @@ ocl_cpu_rt_ver=2021.11.3.0.09
 # https://github.com/intel/llvm/releases/download/2021-WW11/win-oclcpuexp-2021.11.3.0.09_rel.zip
 ocl_cpu_rt_ver_win=2021.11.3.0.09
 # Same GPU driver supports Level Zero and OpenCL
-# https://github.com/intel/compute-runtime/releases/tag/21.09.19150
-ocl_gpu_rt_ver=21.09.19150
+# https://github.com/intel/compute-runtime/releases/tag/21.19.19792
+ocl_gpu_rt_ver=21.19.19792
 # Same GPU driver supports Level Zero and OpenCL
-# https://downloadmirror.intel.com/30266/a08/igfx_win10_100.9316.zip
-ocl_gpu_rt_ver_win=27.20.100.9316
+# https://downloadmirror.intel.com/30381/a08/igfx_win10_100.9466.zip
+ocl_gpu_rt_ver_win=27.20.100.9466
 intel_sycl_ver=build
 
 # TBB binaries can be built from sources following instructions under
@@ -30,8 +30,8 @@ ocloc_ver_win=27.20.100.9168
 [DRIVER VERSIONS]
 cpu_driver_lin=2021.11.3.0.09
 cpu_driver_win=2021.11.3.0.09
-gpu_driver_lin=21.09.19150
-gpu_driver_win=27.20.100.9316
+gpu_driver_lin=21.19.19792
+gpu_driver_win=27.20.100.9466
 fpga_driver_lin=2021.11.3.0.09
 fpga_driver_win=2021.11.3.0.09
 # NVidia CUDA driver

clang-tools-extra/clang-move/tool/ClangMove.cpp

@@ -30,7 +30,8 @@ namespace {
 std::error_code CreateNewFile(const llvm::Twine &path) {
   int fd = 0;
   if (std::error_code ec = llvm::sys::fs::openFileForWrite(
-          path, fd, llvm::sys::fs::CD_CreateAlways, llvm::sys::fs::OF_Text))
+          path, fd, llvm::sys::fs::CD_CreateAlways,
+          llvm::sys::fs::OF_TextWithCRLF))
     return ec;
 
   return llvm::sys::Process::SafelyCloseFileDescriptor(fd);

clang-tools-extra/clang-query/CMakeLists.txt

@@ -19,6 +19,7 @@ clang_target_link_libraries(clangQuery
   clangBasic
   clangDynamicASTMatchers
   clangFrontend
+  clangTooling
   clangSerialization
   )