Merge branch 'sycl' into programmutex

Signed-off-by: Sergey Semenov <sergey.semenov@intel.com>

Author: sergey-semenov

.git-blame-ignore-revs

@@ -16,3 +16,9 @@
 
 # r280751: [Coding style change][lldb] Moved LLDB code base to use LLVM style
 b9c1b51e45b845debb76d8658edabca70ca56079
+
+# r302421: That change incorrectly changed line endings in some libc++ files
+9669df28d4fd3c52d09f451186bd217cdc3322c0
+
+# r302496: That is the revert of r302421
+ff63090b0e1072bd398b8efef8ae2291613a6ec9

.github/CODEOWNERS

@@ -0,0 +1,19 @@
+* @bader
+
+clang/ @erichkeane @Fznamznon
+
+clang/**/Driver @mdtoguchi @AGindinson
+
+llvm-spirv/ @AlexeySotkin @AlexeySachkov
+
+opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
+
+libdevice/ @asavonic @vzakhari
+
+sycl/ @romanovvlad @bader
+
+sycl/doc/ @pvchupin @kbobrovs
+
+sycl/doc/extensions/ @mkinsner @jbrodman
+
+xpti/ @tovinkere @andykaylor

.github/workflows/gh_pages.yml

@@ -0,0 +1,47 @@
+name: Generate Doxygen documentation
+
+on:
+  schedule:
+  - cron: 0 1 * * *
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: sycl
+        path: repo
+    - name: Install deps
+      run: |
+        sudo apt-get install -y doxygen graphviz ssh ninja-build
+        sudo pip3 install 'sphinx==3.0.0' 'recommonmark==0.6.0' 'sphinx_markdown_tables==0.0.12'
+    - name: Build Docs
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/build
+        cd $GITHUB_WORKSPACE/build
+        python $GITHUB_WORKSPACE/repo/buildbot/configure.py -w $GITHUB_WORKSPACE \
+        -s $GITHUB_WORKSPACE/repo -o $GITHUB_WORKSPACE/build -t Release --docs
+        cmake --build . --target doxygen-sycl
+        cmake --build . --target docs-sycl-html
+    - name: Deploy
+      env:
+        SSH_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
+      run: |
+        mkdir -p ~/.ssh
+        echo "$SSH_KEY" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        eval "$(ssh-agent -s)"
+        ssh-add -k ~/.ssh/id_rsa
+        git clone git@github.com:intel/llvm-docs.git docs
+        cd $GITHUB_WORKSPACE/docs
+        git rm -rf .
+        touch .nojekyll
+        yes | \cp -rf $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
+        mkdir doxygen
+        yes | \cp -rf $GITHUB_WORKSPACE/build/tools/sycl/doc/doxygen/html/* doxygen/
+        git config --global user.name "iclsrc"
+        git config --global user.email "ia.compiler.tools.git@intel.com"
+        git add .
+        git diff-index --quiet HEAD || git commit -m "Update docs" -s
+        git push

.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", "NoAssertions"]
+
+     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"
+                 ;;
+             NoAssertions)
+                 export ARGS="--no-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 $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
+

.gitignore

@@ -23,6 +23,7 @@
 
 # Nested build directory
 /build*
+!buildbot
 
 #==============================================================================#
 # Explicit files to ignore (only matches one).

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing
 
 ## License
-Intel Project for LLVM* technology is licensed under the terms of the
+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.
@@ -69,23 +69,41 @@ commit automatically with `git commit -s`.
 
 ### Development
 
+**NB**: For any changes not related to DPC++, but rather to LLVM in general, it
+is strongly encouraged that you submit the patch to https://llvm.org/ directly.
+See [LLVM contribution guidelines](https://llvm.org/docs/Contributing.html)
+for more information.
+
 - Create a personal fork of the project on GitHub
-- Use **sycl** branch as baseline for your changes
+  - 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))
-- Build the project and run all tests (see
-[GetStartedWithSYCLCompiler.md](sycl/doc/GetStartedWithSYCLCompiler.md))
+  [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.
+- Build the project and run all tests.
+
+### Commit message
+
+- When writing your commit message, please make sure to follow
+  [LLVM developer policies](
+  https://llvm.org/docs/DeveloperPolicy.html#commit-messages) on the subject.
+- For any DPC++-related commit, the `[SYCL]` tag should be present in the
+  commit message title. To a reasonable extent, additional tags can be used
+  to signify the component changed, e.g.: `[PI]`, `[CUDA]`, `[Doc]`.
 
 ### Review and acceptance testing
 
 - Create a pull request for your changes following [Creating a pull request
-instructions](https://help.github.com/articles/creating-a-pull-request/)
-- CI will run signed-off check as soon as PR is created, see **check_pr** CI
-check for results
-- CI will run build and functional testing check as soon as PR is approved by
-Intel representative
-  - New approval is needed if PR was updated (e.g. during code review)
-- Once PR is approved and all checks pass, the pull request is ready for merge
+instructions](https://help.github.com/articles/creating-a-pull-request/).
+- CI will run a signed-off check as soon as your PR is created - see the
+**check_pr** CI action results.
+- CI will run several build and functional testing checks as soon as the PR is
+approved by an Intel representative.
+  - A new approval is needed if the PR was updated (e.g. during code review).
+- Once the PR is approved and all checks have passed, the pull request is
+ready for merge.
 
 ### Merge
 
@@ -94,4 +112,7 @@ Project maintainers merge pull requests using one of the following options:
 - [Squash and merge] Used when there are multiple commits in the PR
   - Squashing is done to make sure that the project is buildable on any commit
 - [Create a merge commit] Used for LLVM pull-down PRs to preserve hashes of the
-commits pulled from the LLVM community repository
+commits pulled from the LLVM community repository
+
+
+*Other names and brands may be claimed as the property of others.

README.md

@@ -1,24 +1,31 @@
-# Intel Project for LLVM* technology
+# Intel Project for LLVM\* technology
 
 ## Introduction
 
 Intel staging area for llvm.org contribution.
 Home for Intel LLVM-based projects:
- - SYCL* Compiler and Runtimes - compiler and runtime libraries for SYCL ([https://www.khronos.org/sycl/](https://www.khronos.org/sycl/)). See **sycl** branch.
+ - 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
- - SYCL Compiler and Runtimes - See [GetStartedWithSYCLCompiler.md](sycl/doc/GetStartedWithSYCLCompiler.md)
+ - oneAPI Data Parallel C++ compiler - See
+   [GetStartedGuide.md](sycl/doc/GetStartedGuide.md)
 
-*Other names and brands may be claimed as the property of others.
+## DPC++ extensions
 
-## SYCL Extension Proposal Documents
+DPC++ is an open, cross-architecture language built upon the ISO C++ and Khronos
+SYCL\* standards. DPC++ extends these standards with a number of extensions,
+which can be found in [sycl/doc/extensions](sycl/doc/extensions) directory.
 
-See [sycl/doc/extensions](sycl/doc/extensions)
+\*Other names and brands may be claimed as the property of others.
 

buildbot/check.py

@@ -1,24 +1,41 @@
 import argparse
 import os
+import multiprocessing
 import subprocess
 import sys
 
 DEFAULT_CPU_COUNT = 4
 
 def do_check(args):
-    ret = False
-
-    cpu_count = os.cpu_count()
-    if cpu_count is None:
+    try:
+        cpu_count = multiprocessing.cpu_count()
+    except NotImplementedError:
         cpu_count = DEFAULT_CPU_COUNT
 
+    # 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__, "../.."))
+    # 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")
+
+    cmake_cmd = [
+        "cmake",
+        "--build", abs_obj_dir,
+        "--",
+        args.test_suite,
+        "-j", str(cpu_count)]
+
+    print(cmake_cmd)
+
     env_tmp=os.environ
     env_tmp["LIT_ARGS"]="\"{}\"".format("-v")
 
-    make_cmd = ["ninja", args.test_suite, "-j", str(cpu_count)]
-    print(make_cmd)
-
-    subprocess.check_call(make_cmd, cwd=args.obj_dir, env=env_tmp)
+    subprocess.check_call(cmake_cmd, cwd=abs_obj_dir, env=env_tmp)
 
     ret = True
     return ret
@@ -34,8 +51,8 @@ def main():
     parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
                         help="builder directory, which is the directory contains source and build directories")
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
-    parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
-    parser.add_argument("-t", "--test-suite", metavar="TEST_SUITE", required=True, help="check-xxx target")
+    parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
+    parser.add_argument("-t", "--test-suite", metavar="TEST_SUITE", default="check-all", help="check-xxx target")
 
     args = parser.parse_args()
 
@@ -47,4 +64,3 @@ def main():
     ret = main()
     exit_code = 0 if ret else 1
     sys.exit(exit_code)
-

buildbot/compile.py

@@ -1,20 +1,40 @@
 import argparse
-import os
+import multiprocessing
 import subprocess
 import sys
+import os
 
 DEFAULT_CPU_COUNT = 4
 
 
 def do_compile(args):
-    cpu_count = os.cpu_count()
-    if cpu_count is None:
+    try:
+        cpu_count = multiprocessing.cpu_count()
+    except NotImplementedError:
         cpu_count = DEFAULT_CPU_COUNT
 
-    make_cmd = ["ninja", "-j", str(cpu_count), "deploy-sycl-toolchain", "deploy-opencl-aot"]
-    print(make_cmd)
+    # 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__, "../.."))
+    # 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")
+
+    cmake_cmd = [
+        "cmake",
+        "--build", abs_obj_dir,
+        "--",
+        "deploy-sycl-toolchain",
+        "deploy-opencl-aot",
+        "-j", str(cpu_count)]
 
-    subprocess.check_call(make_cmd, cwd=args.obj_dir)
+    print(cmake_cmd)
+
+    subprocess.check_call(cmake_cmd, cwd=abs_obj_dir)
 
     return True
 
@@ -30,7 +50,7 @@ def main():
     parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
                         help="builder directory, which is the directory contains source and build directories")
     parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
-    parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
+    parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
 
     args = parser.parse_args()
 
@@ -43,4 +63,3 @@ def main():
     ret = main()
     exit_code = 0 if ret else 1
     sys.exit(exit_code)
-