Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/workflows/linux_post_commit.yml

@@ -26,7 +26,13 @@ jobs:
                  export ARGS=""
                  ;;
              SharedLibs)
+                 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+                 sudo add-apt-repository "deb http://apt.llvm.org/bionic/   llvm-toolchain-bionic main"
+                 sudo apt-get update
+                 sudo apt-get install -y clang-12
                  export ARGS="--shared-libs"
+                 export CC="clang-12"
+                 export CXX="clang++-12"
                  ;;
              NoAssertions)
                  export ARGS="--no-assertions"

buildbot/dependency.conf

@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2020.11.11.0.04
 # https://github.com/intel/llvm/releases/download/2020-WW45/win-oclcpuexp-2020.11.11.0.04_rel.zip
 ocl_cpu_rt_ver_win=2020.11.11.0.04
 # Same GPU driver supports Level Zero and OpenCL
-# https://github.com/intel/compute-runtime/releases/tag/21.01.18793
-ocl_gpu_rt_ver=21.01.18793
+# https://github.com/intel/compute-runtime/releases/tag/21.02.18820
+ocl_gpu_rt_ver=21.02.18820
 # Same GPU driver supports Level Zero and OpenCL
 # https://downloadmirror.intel.com/30066/a08/igfx_win10_100.9030.zip
 ocl_gpu_rt_ver_win=27.20.100.9030
@@ -26,7 +26,7 @@ ocloc_ver_win=27.20.100.8935
 [DRIVER VERSIONS]
 cpu_driver_lin=2020.11.11.0.04
 cpu_driver_win=2020.11.11.0.04
-gpu_driver_lin=21.01.18793
+gpu_driver_lin=21.02.18820
 gpu_driver_win=27.20.100.9030
 fpga_driver_lin=2020.11.11.0.04
 fpga_driver_win=2020.11.11.0.04

clang/include/clang/Basic/Attr.td

@@ -1180,13 +1180,17 @@ def SYCLRegisterNum : InheritableAttr {
   let Documentation = [SYCLRegisterNumDocs];
 }
 
-// Used to mark ESIMD kernel pointer parameters originating from accessors.
+// Used by FE to mark ESIMD kernel pointer parameters which correspond to the
+// original lambda's captured accessors. FE turns the attribute to some metadata
+// required by the ESIMD Back-End.
+// Not supposed to be used directly in the source - SYCL device compiler FE
+// automatically adds it for ESIMD kernels, hence undocumented.
 def SYCLSimdAccessorPtr : InheritableAttr {
   // No spelling, as this attribute can't be created in the source code.
   let Spellings = [];
   let Subjects = SubjectList<[ParmVar]>;
   let LangOpts = [SYCLExplicitSIMD];
-  let Documentation = [SYCLSimdAccessorPtrDocs];
+  let Documentation = [Undocumented];
 }
 
 def SYCLScope : Attr {

clang/include/clang/Basic/AttrDocs.td

@@ -380,18 +380,6 @@ def SYCLRegisterNumDocs : Documentation {
   }];
 }
 
-def SYCLSimdAccessorPtrDocs : Documentation {
-  let Category = DocCatVariable;
-  let Content = [{
-    The ``__attribute__((esimd_acc_ptr))`` attribute is used by FE to mark ESIMD
-    kernel pointer parameters which correspond to the original
-    lambda's captured accessors. FE turns the attribute to some metadata
-    required by the ESIMD Back-End.
-    Not supposed to be used directly in the source - SYCL device compiler FE
-    automatically adds it for ESIMD kernels.
-  }];
-}
-
 def C11NoReturnDocs : Documentation {
   let Category = DocCatFunction;
   let Content = [{

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -95,6 +95,21 @@ void SYCL::constructLLVMForeachCommand(Compilation &C, const JobAction &JA,
                                          Foreach, ForeachArgs, None));
 }
 
+// The list should match pre-built SYCL device library files located in
+// compiler package. Once we add or remove any SYCL device library files,
+// the list should be updated accordingly.
+static llvm::SmallVector<StringRef, 10> SYCLDeviceLibList{
+    "crt",
+    "cmath",
+    "cmath-fp64",
+    "complex",
+    "complex-fp64",
+    "fallback-cassert",
+    "fallback-cmath",
+    "fallback-cmath-fp64",
+    "fallback-complex",
+    "fallback-complex-fp64"};
+
 const char *SYCL::Linker::constructLLVMLinkCommand(
     Compilation &C, const JobAction &JA, const InputInfo &Output,
     const ArgList &Args, StringRef SubArchName, StringRef OutputFilePrefix,
@@ -116,16 +131,32 @@ const char *SYCL::Linker::constructLLVMLinkCommand(
   // an actual object/archive.  Take that list and pass those to the linker
   // instead of the original object.
   if (JA.isDeviceOffloading(Action::OFK_SYCL)) {
-    auto SYCLDeviceLibIter =
-        std::find_if(InputFiles.begin(), InputFiles.end(), [](const auto &II) {
-          StringRef InputFilename =
-              llvm::sys::path::filename(StringRef(II.getFilename()));
-          if (InputFilename.startswith("libsycl-") &&
-              InputFilename.endswith(".o"))
-            return true;
-          return false;
-        });
-    bool LinkSYCLDeviceLibs = (SYCLDeviceLibIter != InputFiles.end());
+    auto isSYCLDeviceLib = [&C](const InputInfo &II) {
+      const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
+      StringRef LibPostfix = ".o";
+      if (HostTC->getTriple().isWindowsMSVCEnvironment() &&
+          C.getDriver().IsCLMode())
+        LibPostfix = ".obj";
+      StringRef InputFilename =
+          llvm::sys::path::filename(StringRef(II.getFilename()));
+      if (!InputFilename.startswith("libsycl-") ||
+          !InputFilename.endswith(LibPostfix) || (InputFilename.count('-') < 2))
+        return false;
+      size_t PureLibNameLen = InputFilename.find_last_of('-');
+      // Skip the prefix "libsycl-"
+      StringRef PureLibName = InputFilename.substr(8, PureLibNameLen - 8);
+      for (const auto &L : SYCLDeviceLibList) {
+        if (PureLibName.compare(L) == 0)
+          return true;
+      }
+      return false;
+    };
+    size_t InputFileNum = InputFiles.size();
+    bool LinkSYCLDeviceLibs = (InputFileNum >= 2);
+    LinkSYCLDeviceLibs = LinkSYCLDeviceLibs && !isSYCLDeviceLib(InputFiles[0]);
+    for (size_t Idx = 1; Idx < InputFileNum; ++Idx)
+      LinkSYCLDeviceLibs =
+          LinkSYCLDeviceLibs && isSYCLDeviceLib(InputFiles[Idx]);
     // Go through the Inputs to the link.  When a listfile is encountered, we
     // know it is an unbundled generated list.
     if (LinkSYCLDeviceLibs)

clang/test/Driver/sycl-device-lib.cpp

@@ -122,3 +122,11 @@
 // SYCL_LLVM_LINK_NO_DEVICE_LIB: clang{{.*}} "-cc1" {{.*}} "-fsycl-is-device"
 // SYCL_LLVM_LINK_NO_DEVICE_LIB-NOT: llvm-link{{.*}}  "-only-needed"
 // SYCL_LLVM_LINK_NO_DEVICE_LIB: sycl-post-link{{.*}}  "-symbols" "-spec-const=rt" "-o" "{{.*}}.table" "{{.*}}.bc"
+
+/// ###########################################################################
+/// test llvm-link behavior for special user input whose filename resembles SYCL device library
+// RUN: touch libsycl-crt.o
+// RUN: %clangxx -fsycl libsycl-crt.o -### 2>&1 \
+// RUN:   | FileCheck %s -check-prefix=SYCL_LLVM_LINK_USER_ONLY_NEEDED
+// SYCL_LLVM_LINK_USER_ONLY_NEEDED: llvm-link{{.*}}  "{{.*}}.o" "-o" "{{.*}}.bc" "--suppress-warnings"
+// SYCL_LLVM_LINK_USER_ONLY_NEEDED: llvm-link{{.*}}  "-only-needed" "{{.*}}" "-o" "{{.*}}.bc" "--suppress-warnings"

clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp

@@ -1055,8 +1055,6 @@ class ArchiveFileHandler final : public FileHandler {
     }
 
     // Extracted objects data for archive mode.
-    SmallVector<std::string, 8u> ArNames;
-    SmallVector<SmallVector<char, 0u>, 8u> ArData;
     SmallVector<NewArchiveMember, 8u> ArMembers;
 
     // Read all children.
@@ -1119,17 +1117,17 @@ class ArchiveFileHandler final : public FileHandler {
             if (Error Err = OFH.ReadBundle(OS, *Buf))
               return Err;
           } else if (Mode == OutputType::Archive) {
-            auto &Name =
-                ArNames.emplace_back((TT + "." + *ChildNameOrErr).str());
-            auto &Data = ArData.emplace_back();
+            // Extract the bundle to a buffer.
+            SmallVector<char> Data;
             raw_svector_ostream ChildOS{Data};
-
-            // Extract the bundle.
             if (Error Err = OFH.ReadBundle(ChildOS, *Buf))
               return Err;
 
-            ArMembers.emplace_back(
-                MemoryBufferRef{StringRef(Data.data(), Data.size()), Name});
+            // Add new archive member.
+            NewArchiveMember &Member = ArMembers.emplace_back();
+            std::string Name = (TT + "." + *ChildNameOrErr).str();
+            Member.Buf = MemoryBuffer::getMemBufferCopy(ChildOS.str(), Name);
+            Member.MemberName = Member.Buf->getBufferIdentifier();
           }
           if (Error Err = OFH.ReadBundleEnd(*Buf))
             return Err;
@@ -1551,7 +1549,7 @@ int main(int argc, const char **argv) {
     return 0;
   }
 
-  if (OutputFileNames.getNumOccurrences() == 0) {
+  if (OutputFileNames.getNumOccurrences() == 0 && !CheckSection) {
     reportError(createStringError(
         errc::invalid_argument,
         "for the --outputs option: must be specified at least once!"));
@@ -1662,6 +1660,15 @@ int main(int argc, const char **argv) {
     ++Index;
   }
 
+  if (CheckSection) {
+    Expected<bool> Res = CheckBundledSection();
+    if (!Res) {
+      reportError(Res.takeError());
+      return 1;
+    }
+    return !*Res;
+  }
+
   // Host triple is not really needed for unbundling operation, so do not
   // treat missing host triple as error if we do unbundling.
   if ((Unbundle && HostTargetNum > 1) || (!Unbundle && HostTargetNum != 1)) {

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -2,11 +2,9 @@ set(obj_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 if (WIN32)
   set(lib-suffix obj)
   set(spv_binary_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-  set(lib_crt_source msvc_wrapper.cpp)
 else()
   set(lib-suffix o)
   set(spv_binary_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-  set(lib_crt_source glibc_wrapper.cpp)
 endif()
 set(clang $<TARGET_FILE:clang>)
 
@@ -33,9 +31,9 @@ set(devicelib-obj-file ${obj_binary_dir}/libsycl-crt.${lib-suffix})
 add_custom_command(OUTPUT ${devicelib-obj-file}
                    COMMAND ${clang} -fsycl -c
                            ${compile_opts} ${sycl_targets_opt}
-                           ${CMAKE_CURRENT_SOURCE_DIR}/${lib_crt_source}
+                           ${CMAKE_CURRENT_SOURCE_DIR}/crt_wrapper.cpp
                            -o ${devicelib-obj-file}
-                   MAIN_DEPENDENCY ${lib_crt_source}
+                   MAIN_DEPENDENCY crt_wrapper.cpp
                    DEPENDS wrapper.h device.h spirv_vars.h clang clang-offload-bundler
                    VERBATIM)
 

libdevice/msvc_wrapper.cpp renamed to libdevice/crt_wrapper.cpp

@@ -1,4 +1,4 @@
-//==--- msvc_wrapper.cpp - wrappers for Microsoft C library functions ------==//
+//==------ crt_wrapper.cpp - wrappers for libc internal functions ----------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,6 +9,7 @@
 #include "wrapper.h"
 
 #ifdef __SPIR__
+#if defined(_WIN32)
 // Truncates a wide (16 or 32 bit) string (wstr) into an ASCII string (str).
 // Any non-ASCII characters are replaced by question mark '?'.
 static void __truncate_wchar_char_str(const wchar_t *wstr, char *str,
@@ -37,4 +38,15 @@ void _wassert(const wchar_t *wexpr, const wchar_t *wfile, unsigned line) {
       __spirv_LocalInvocationId_x(), __spirv_LocalInvocationId_y(),
       __spirv_LocalInvocationId_z());
 }
+#else
+DEVICE_EXTERN_C
+void __assert_fail(const char *expr, const char *file, unsigned int line,
+                   const char *func) {
+  __devicelib_assert_fail(
+      expr, file, line, func, __spirv_GlobalInvocationId_x(),
+      __spirv_GlobalInvocationId_y(), __spirv_GlobalInvocationId_z(),
+      __spirv_LocalInvocationId_x(), __spirv_LocalInvocationId_y(),
+      __spirv_LocalInvocationId_z());
+}
+#endif
 #endif // __SPIR__

libdevice/glibc_wrapper.cpp

@@ -43,7 +43,7 @@ jobs:
     - name: Gather list of changes
       id: gather-list-of-changes
       run: |
-        git diff -U0 --no-color ${{ github.sha }}^ > diff-to-inspect.txt
+        git diff -U0 --no-color ${{ github.sha }}^ -- include lib > diff-to-inspect.txt
         if [ -s diff-to-inspect.txt ]; then
           # Here we set an output of our step, which is used later to either
           # perform or skip further steps, i.e. there is no sense to install

llvm-spirv/.github/workflows/check-code-style.yml

@@ -2,8 +2,8 @@
 
 [![Build Status](https://travis-ci.org/KhronosGroup/SPIRV-LLVM-Translator.svg?branch=master)](https://travis-ci.org/KhronosGroup/SPIRV-LLVM-Translator)
 
-![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/Out-of-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)
-![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/In-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)
+[![Out-of-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/Out-of-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22Out-of-tree+build+%26+tests%22+event%3Aschedule)
+[![In-tree build & tests](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/workflows/In-tree%20build%20&%20tests/badge.svg?branch=master&event=schedule)](https://github.com/KhronosGroup/SPIRV-LLVM-Translator/actions?query=workflow%3A%22In-tree+build+%26+tests%22+event%3Aschedule)
 
 This repository contains source code for the LLVM/SPIR-V Bi-Directional Translator, a library and tool for translation between LLVM IR and [SPIR-V](https://www.khronos.org/registry/spir-v/).
 

llvm-spirv/README.md

@@ -8,7 +8,7 @@ Overview
 ========
 
 As one of the goals of SPIR-V is to `"map easily to other IRs, including LLVM
-IR" <https://cvs.khronos.org/svn/repos/SPIRV/trunk/specs/SPIRV.html#_goals>`_,
+IR" <https://www.khronos.org/registry/spir-v/specs/unified1/SPIRV.html#_goals>`_,
 most of SPIR-V entities (global variables, constants, types, functions, basic
 blocks, instructions) have straightforward counterparts in LLVM. Therefore the
 focus of this document is those entities in SPIR-V which do not map to LLVM in
@@ -81,7 +81,7 @@ Some SPIR-V instructions which can be included in basic blocks do not have
 corresponding LLVM instructions or intrinsics. These SPIR-V instructions are
 represented by function calls in LLVM. The function corresponding to a SPIR-V
 instruction is termed SPIR-V builtin function and its name is `IA64 mangled
-<https://mentorembedded.github.io/cxx-abi/abi.html#mangling>`_ with extensions
+<https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling>`_ with extensions
 for SPIR-V specific types. The unmangled name of a SPIR-V builtin function
 follows the convention
 
@@ -209,7 +209,7 @@ following format:
 
 .. code-block:: llvm
 
-  !spirv.<OpCodeName> = !{!<InstructionMetadata1>, <InstructionMetadata2>, ..}
+  !spirv.<OpCodeName> = !{!<InstructionMetadata1>, !<InstructionMetadata2>, ..}
   !<InstructionMetadata1> = !{<Operand1>, <Operand2>, ..}
   !<InstructionMetadata2> = !{<Operand1>, <Operand2>, ..}
 

llvm-spirv/docs/SPIRVRepresentationInLLVM.rst

@@ -74,7 +74,7 @@ namespace SPIRV {
 class SPIRVModule;
 
 /// \brief Check if a string contains SPIR-V binary.
-bool isSpirvBinary(std::string &Img);
+bool isSpirvBinary(const std::string &Img);
 
 #ifdef _SPIRV_SUPPORT_TEXT_FMT
 /// \brief Convert SPIR-V between binary and internal textual formats.

llvm-spirv/include/LLVMSPIRVLib.h

@@ -1305,9 +1305,11 @@ Instruction *mutateCallInstOCL(
     Module *M, CallInst *CI,
     std::function<std::string(CallInst *, std::vector<Value *> &, Type *&RetTy)>
         ArgMutate,
-    std::function<Instruction *(CallInst *)> RetMutate, AttributeList *Attrs) {
+    std::function<Instruction *(CallInst *)> RetMutate, AttributeList *Attrs,
+    bool TakeFuncName) {
   OCLBuiltinFuncMangleInfo BtnInfo(CI->getCalledFunction());
-  return mutateCallInst(M, CI, ArgMutate, RetMutate, &BtnInfo, Attrs);
+  return mutateCallInst(M, CI, ArgMutate, RetMutate, &BtnInfo, Attrs,
+                        TakeFuncName);
 }
 
 static std::pair<StringRef, StringRef>

llvm-spirv/lib/SPIRV/OCLUtil.cpp

@@ -468,7 +468,7 @@ Instruction *mutateCallInstOCL(
     std::function<std::string(CallInst *, std::vector<Value *> &, Type *&RetTy)>
         ArgMutate,
     std::function<Instruction *(CallInst *)> RetMutate,
-    AttributeList *Attrs = nullptr);
+    AttributeList *Attrs = nullptr, bool TakeFuncName = false);
 
 /// Check if instruction is bitcast from spirv.ConstantSampler to spirv.Sampler
 bool isSamplerInitializer(Instruction *Inst);