Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/workflows/linux_post_commit.yml

@@ -0,0 +1,70 @@
+name: Linux Post Commit Checks
+
+on:
+  push:
+    branches:
+      - sycl
+jobs:
+   check:
+     runs-on: ubuntu-latest
+     strategy:
+       fail-fast: false
+       matrix:
+         config: ["Default", "SharedLibs", "Assertions"]
+
+     steps:
+     - uses: actions/checkout@v2
+       with:
+         path: src
+     - name: Install Ubuntu deps
+       run: sudo apt install -y ninja-build
+     - name: Configure
+       run: |
+         CONFIG=${{ matrix.config }}
+         case $CONFIG in
+             Default)
+                 export ARGS=""
+                 ;;
+             SharedLibs)
+                 export ARGS="--shared-libs"
+                 ;;
+             Assertiosn)
+                 export ARGS="--assertions"
+                 ;;
+         esac
+         mkdir -p $GITHUB_WORKSPACE/build
+         cd $GITHUB_WORKSPACE/build
+         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
+         -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release --no-ocl $ARGS
+     - name: Compile
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build
+     - name: check-llvm
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm
+     - name: check-clang
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-clang
+     - name: check-sycl
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-sycl
+     - name: check-llvm-spirv
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
+     - name: Pack
+       run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
+     - name: Upload artifacts
+       uses: actions/upload-artifact@v1
+       with:
+         name: sycl_linux_${{ matrix.config }}
+         path: llvm_sycl.tar.gz
+

buildbot/configure.py

@@ -19,6 +19,7 @@ def do_configure(args):
     sycl_build_pi_cuda = 'OFF'
     llvm_enable_assertions = 'ON'
     llvm_enable_doxygen = 'OFF'
+    llvm_build_shared_libs = 'OFF'
 
     if platform.system() == 'Linux':
         icd_loader_lib = os.path.join(icd_loader_lib, "libOpenCL.so")
@@ -37,6 +38,9 @@ def do_configure(args):
     if args.docs:
         llvm_enable_doxygen = 'ON'
 
+    if args.shared_libs:
+        llvm_build_shared_libs = 'ON'
+
     install_dir = os.path.join(args.obj_dir, "install")
 
     cmake_cmd = [
@@ -59,10 +63,16 @@ def do_configure(args):
         "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
         "-DSYCL_INCLUDE_TESTS=ON", # Explicitly include all kinds of SYCL tests.
         "-DLLVM_ENABLE_DOXYGEN={}".format(llvm_enable_doxygen),
+        "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING=ON", # Explicitly turn on XPTI tracing
         llvm_dir
     ]
 
+    if not args.no_ocl:
+      cmake_cmd.extend([
+            "-DOpenCL_INCLUDE_DIR={}".format(ocl_header_dir),
+            "-DOpenCL_LIBRARY={}".format(icd_loader_lib)])
+
     print(cmake_cmd)
 
     try:
@@ -93,6 +103,8 @@ def main():
     parser.add_argument("--cuda", action='store_true', help="switch from OpenCL to CUDA")
     parser.add_argument("--assertions", action='store_true', help="build with assertions")
     parser.add_argument("--docs", action='store_true', help="build Doxygen documentation")
+    parser.add_argument("--no-ocl", action='store_true', help="download OpenCL deps via CMake")
+    parser.add_argument("--shared-libs", action='store_true', help="Build shared libraries")
 
     args = parser.parse_args()
 

clang/lib/CodeGen/BackendUtil.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/CodeGen/BackendUtil.h"
-#include "SYCLLowerIR/LowerWGScope.h"
 #include "clang/Basic/CodeGenOptions.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/LangOptions.h"

clang/lib/CodeGen/CGLoopInfo.cpp

@@ -871,8 +871,9 @@ void LoopInfoStack::push(BasicBlock *Header, clang::ASTContext &Ctx,
   // legacy GNU attributes and pragma styles.
   //
   // For attribute ivdep:
-  // 0 - 'llvm.loop.ivdep.enable' metadata will be emitted
-  // n - 'llvm.loop.ivdep.safelen, i32 n' metadata will be emitted
+  // Metadata 'llvm.loop.parallel_access_indices' & index group metadata
+  // will be emitted, depending on the conditions described at the
+  // helpers' site
   // For attribute ii:
   // n - 'llvm.loop.ii.count, i32 n' metadata will be emitted
   // For attribute max_concurrency:

clang/lib/CodeGen/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_subdirectory(SYCLLowerIR)
-
 set(LLVM_LINK_COMPONENTS
   Analysis
   BitReader
@@ -23,6 +21,7 @@ set(LLVM_LINK_COMPONENTS
   Remarks
   ScalarOpts
   Support
+  SYCLLowerIR
   Target
   TransformUtils
   )
@@ -112,5 +111,4 @@ add_clang_library(clangCodeGen
   clangFrontend
   clangLex
   clangSerialization
-  clangSYCLLowerIR
   )

clang/lib/CodeGen/CodeGenAction.cpp

@@ -10,7 +10,6 @@
 #include "CodeGenModule.h"
 #include "CoverageMappingGen.h"
 #include "MacroPPCallbacks.h"
-#include "SYCLLowerIR/LowerWGScope.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclCXX.h"
@@ -39,6 +38,7 @@
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Linker/Linker.h"
 #include "llvm/Pass.h"
+#include "llvm/SYCLLowerIR/LowerWGScope.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/TimeProfiler.h"
@@ -335,7 +335,7 @@ namespace clang {
       if (LangOpts.SYCLIsDevice) {
         PrettyStackTraceString CrashInfo("Pre-linking SYCL passes");
         legacy::PassManager PreLinkingSyclPasses;
-        PreLinkingSyclPasses.add(createSYCLLowerWGScopePass());
+        PreLinkingSyclPasses.add(llvm::createSYCLLowerWGScopePass());
         PreLinkingSyclPasses.run(*getModule());
       }
 

clang/lib/CodeGen/SYCLLowerIR/CMakeLists.txt

@@ -5525,9 +5525,11 @@ InputInfo Driver::BuildJobsForActionNoCache(
   else {
     std::string OffloadingPrefix;
     // When generating binaries with -fsycl-link-target or -fsycl-link, the
-    // output file prefix is the triple arch only.
-    if (Args.getLastArg(options::OPT_fsycl_link_targets_EQ) ||
-        Args.hasArg(options::OPT_fsycl_link_EQ)) {
+    // output file prefix is the triple arch only.  Do not add the arch when
+    // compiling for host.
+    if (!A->getOffloadingHostActiveKinds() &&
+        (Args.getLastArg(options::OPT_fsycl_link_targets_EQ) ||
+         Args.hasArg(options::OPT_fsycl_link_EQ))) {
       OffloadingPrefix = "-";
       OffloadingPrefix += TC->getTriple().getArchName();
     } else {

clang/lib/Driver/Driver.cpp

@@ -86,6 +86,16 @@
 // RUN: | FileCheck %s --check-prefix=CHK-FPGA-LINK-WARN
 // CHK-FPGA-LINK-WARN: warning: appending to an existing archive 'dummy.a'
 
+/// -fintelfpga -fsycl-link name creation without output file specified
+// RUN: mkdir -p %t_dir
+// RUN: touch %t_dir/dummy_file.cpp
+// RUN: %clang++ -### -fsycl -fintelfpga -fsycl-link %t_dir/dummy_file.cpp 2>&1 \
+// RUN: | FileCheck -check-prefixes=CHK-SYCL-LINK-LIN -DINPUTSRC=dummy_file %s
+// RUN: %clang_cl -### -fsycl -fintelfpga -fsycl-link %t_dir/dummy_file.cpp 2>&1 \
+// RUN: | FileCheck -check-prefixes=CHK-SYCL-LINK-WIN -DINPUTSRC=dummy_file %s
+// CHK-SYCL-LINK-LIN: llvm-ar{{.*}} "cr" "[[INPUTSRC]].a"
+// CHK-SYCL-LINK-WIN: lib.exe{{.*}} "-OUT:[[INPUTSRC]].a"
+
 /// -fintelfpga with AOCR library and additional object
 // RUN:  touch %t2.o
 // RUN:  %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t.a %t2.o 2>&1 \

clang/test/CodeGenSYCL/hier_par.cpp

@@ -404,6 +404,7 @@ void initializeStripNonDebugSymbolsPass(PassRegistry&);
 void initializeStripNonLineTableDebugInfoPass(PassRegistry&);
 void initializeStripSymbolsPass(PassRegistry&);
 void initializeStructurizeCFGPass(PassRegistry&);
+void initializeSYCLLowerWGScopeLegacyPassPass(PassRegistry &);
 void initializeTailCallElimPass(PassRegistry&);
 void initializeTailDuplicatePass(PassRegistry&);
 void initializeTargetLibraryInfoWrapperPassPass(PassRegistry&);

clang/test/Driver/sycl-offload-intelfpga.cpp

@@ -37,6 +37,7 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/IRPrintingPasses.h"
+#include "llvm/SYCLLowerIR/LowerWGScope.h"
 #include "llvm/Support/Valgrind.h"
 #include "llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h"
 #include "llvm/Transforms/IPO.h"
@@ -199,6 +200,7 @@ namespace {
       (void) llvm::createMergeFunctionsPass();
       (void) llvm::createMergeICmpsLegacyPass();
       (void) llvm::createExpandMemCmpPass();
+      (void)llvm::createSYCLLowerWGScopePass();
       std::string buf;
       llvm::raw_string_ostream os(buf);
       (void) llvm::createPrintModulePass(os);

llvm/include/llvm/InitializePasses.h

@@ -25,7 +25,6 @@ class SYCLLowerWGScopePass : public PassInfoMixin<SYCLLowerWGScopePass> {
 };
 
 FunctionPass *createSYCLLowerWGScopePass();
-void initializeSYCLLowerWGScopeLegacyPassPass(PassRegistry &);
 
 } // namespace llvm
 

llvm/include/llvm/LinkAllPasses.h

@@ -27,6 +27,7 @@ add_subdirectory(AsmParser)
 add_subdirectory(LineEditor)
 add_subdirectory(ProfileData)
 add_subdirectory(Passes)
+add_subdirectory(SYCLLowerIR)
 add_subdirectory(TextAPI)
 add_subdirectory(ToolDrivers)
 add_subdirectory(XRay)

clang/lib/CodeGen/SYCLLowerIR/LowerWGScope.h renamed to llvm/include/llvm/SYCLLowerIR/LowerWGScope.h

@@ -42,6 +42,7 @@ subdirectories =
  Passes
  ProfileData
  Support
+ SYCLLowerIR
  TableGen
  TextAPI
  Target

llvm/lib/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_llvm_component_library(LLVMSYCLLowerIR
+  LowerWGScope.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/SYCLLowerIR
+
+  DEPENDS
+  intrinsics_gen
+  )

llvm/lib/LLVMBuild.txt

@@ -0,0 +1,20 @@
+;===- ./lib/SYCLLowerIR/LLVMBuild.txt -----------------------------*- Conf -*--===;
+;
+; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+; See https://llvm.org/LICENSE.txt for license information.
+; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Group
+name = SYCLLowerIR
+parent = Libraries

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -73,10 +73,7 @@
 // et. al.
 //===----------------------------------------------------------------------===//
 
-#include "LowerWGScope.h"
-
-#include "clang/Basic/AddressSpaces.h"
-
+#include "llvm/SYCLLowerIR/LowerWGScope.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
@@ -85,6 +82,7 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
+#include "llvm/InitializePasses.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CommandLine.h"