Merge branch 'sycl' of https://github.com/intel/llvm into enable_esimd_emu_build

Author: dongkyunahn-intel

.github/ISSUE_TEMPLATE/config.yml

@@ -3,6 +3,13 @@ name: Generate Doxygen documentation
 on:
   schedule:
   - cron: 0 1 * * *
+  pull_request:
+    branches:
+    - sycl
+    paths:
+    - '.github/workflows/gh_pages.yml'
+    - 'clang/docs/**'
+    - 'sycl/docs/**'
 
 jobs:
   build:
@@ -16,7 +23,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get install -y doxygen graphviz ssh ninja-build
-        sudo pip3 install 'sphinx==4.1.2' 'myst-parser==0.15.1'
+        sudo pip3 install 'sphinx==4.1.2' 'myst-parser==0.15.1' 'recommonmark==0.7.1'
     - name: Build Docs
       run: |
         mkdir -p $GITHUB_WORKSPACE/build
@@ -28,6 +35,7 @@ jobs:
         cmake --build . --target docs-sycl-html
         cmake --build . --target docs-clang-html
     - name: Deploy
+      if: ${{ github.event_name == 'schedule' }}
       env:
         SSH_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
       run: |

.github/workflows/gh_pages.yml

@@ -0,0 +1,14 @@
+name: Labeling new issues
+on:
+  issues:
+    types: ['opened']
+
+jobs:
+  automate-issues-labels:
+    runs-on: ubuntu-latest
+    if: github.repository == 'llvm/llvm-project'
+    steps:
+      - uses: andymckay/[email protected]
+        with:
+          add-labels: "new issue"
+          ignore-if-labeled: true

.github/workflows/new-issues.yml

@@ -4,6 +4,14 @@ on:
   schedule:
     # Every 1st and 15th day of month
     - cron: '0 0 1,15 * *'
+  push:
+    branches:
+      - sycl
+    paths:
+      - 'devops/containers/**'
+  pull_request:
+    paths:
+      - 'devops/containers/**'
 
 jobs:
   base_image_ubuntu2004:
@@ -14,19 +22,56 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: 1
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
         with:
-          registry: ghcr.io
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2004_base
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and Push Container
-        uses: docker/build-push-action@v2
-        with:
-          push: true
           tags: |
             ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }}
             ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
-          context: ${{ github.workspace }}/devops
-          file: ${{ github.workspace }}/devops/containers/ubuntu2004_base.Dockerfile
+  build_image_ubuntu2004:
+    if: github.repository == 'intel/llvm'
+    name: Build Ubuntu Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2004_build
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2004_build:latest
+  # This job produces a Docker container with the latest versions of Intel
+  # drivers, that can be found on GitHub.
+  drivers_image_ubuntu2004:
+    if: github.repository == 'intel/llvm'
+    name: Intel Drivers Ubuntu 20.04 Docker image
+    runs-on: ubuntu-latest
+    needs: base_image_ubuntu2004
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2004_intel_drivers
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
+

.github/workflows/sycl_containers.yaml

@@ -17,7 +17,7 @@ on:
       build_image:
         type: string
         required: false
-        default: "ghcr.io/intel/llvm/ubuntu2004_base:latest"
+        default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
       build_runs_on:
         type: string
         required: false
@@ -56,12 +56,12 @@ jobs:
         env:
           INPUTS: ${{ toJSON(inputs) }}
         run: |
-          if [[ "$GITHUB_EVENT_NAME" != "workflow_call" ]]; then
+          if [[ "$GITHUB_WORKFLOW" == "Reusable SYCL Linux build and test workflow" ]]; then
             INPUTS="{
               \"cc\":\"gcc\",
               \"cxx\":\"g++\",
               \"build_runs_on\":\"sycl-precommit-linux\",
-              \"build_image\":\"ghcr.io/intel/llvm/ubuntu2004_base:latest\",
+              \"build_image\":\"ghcr.io/intel/llvm/ubuntu2004_build:latest\",
               \"build_github_cache\":\"false\",
               \"build_cache_root\":\"/__w/\",
               \"build_cache_suffix\":\"default\",
@@ -104,15 +104,18 @@ jobs:
         CACHE_SUFFIX: ${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}
         CACHE_SIZE: ${{ fromJSON(needs.configure.outputs.params).build_cache_size }}
         ARGS: ${{ fromJSON(needs.configure.outputs.params).build_configure_extra_args }}
+        CUDA_LIB_PATH: "/usr/local/cuda/lib64/stubs"
       run: |
         mkdir -p $CACHE_ROOT/build_cache_$CACHE_SUFFIX
         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 \
-          --ci-defaults $ARGS --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
+          --ci-defaults $ARGS --cuda --hip --hip-amd-arch="gfx906" \
+          --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
           --cmake-opt="-DLLVM_CCACHE_DIR=$CACHE_ROOT/build_cache_$CACHE_SUFFIX" \
-          --cmake-opt="-DLLVM_CCACHE_MAXSIZE=$CACHE_SIZE"
+          --cmake-opt="-DLLVM_CCACHE_MAXSIZE=$CACHE_SIZE" \
+          --cmake-opt="-DSYCL_PI_TESTS=OFF"
     - name: Compile
       run: cmake --build $GITHUB_WORKSPACE/build
     # TODO allow to optionally disable in-tree checks
@@ -128,6 +131,8 @@ jobs:
     - name: check-sycl
       if: always()
       run: |
+        # TODO consider moving this to Dockerfile
+        export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl
     - name: check-llvm-spirv
       if: always()
@@ -137,6 +142,10 @@ jobs:
       if: always()
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
+    - name: check-libclc
+      if: always()
+      run: |
+        cmake --build $GITHUB_WORKSPACE/build --target check-libclc
     - name: Install
       # TODO replace utility installation with a single CMake target
       run: |

.github/workflows/sycl_linux_build_and_test.yml

@@ -0,0 +1,57 @@
+name: SYCL Nightly Builds
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 3 * * *'
+  pull_request:
+    paths:
+      - 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
+      - '.github/workflows/sycl_nightly.yml'
+
+jobs:
+  ubuntu2004_build_test:
+    if: github.repository == 'intel/llvm'
+    uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
+    with:
+      build_runs_on: build
+      build_github_cache: true
+      build_cache_root: "/__w/"
+      build_artifact_suffix: default
+  ubuntu2004_docker_build_push:
+    if: github.repository == 'intel/llvm'
+    runs-on: ubuntu-latest
+    needs: ubuntu2004_build_test
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/download-artifact@v2
+      with:
+        name: sycl_linux_default
+        path: devops/
+    - name: Build and Push Container (with drivers)
+      uses: ./devops/actions/build_container
+      with:
+        push: ${{ github.event_name != 'pull_request' }}
+        file: ubuntu2004_preinstalled
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        build-args: |
+          base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers
+          base_tag=latest
+        tags: |
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }}
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest
+    - name: Build and Push Container (no drivers)
+      uses: ./devops/actions/build_container
+      with:
+        push: ${{ github.event_name != 'pull_request' }}
+        file: ubuntu2004_preinstalled
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        build-args: |
+          base_image=ghcr.io/intel/llvm/ubuntu2004_base
+          base_tag=latest
+        tags: |
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
+

.github/workflows/sycl_nightly.yml

@@ -9,14 +9,16 @@ jobs:
     name: Linux Default
     uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
     with:
-      build_cache_root: "__w/llvm"
+      build_runs_on: build
+      build_cache_root: "/__w/llvm"
       build_github_cache: true
       build_artifact_suffix: default
   linux_no_assert:
-    name: Linux Default
+    name: Linux (no assert)
     uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
     with:
-      build_cache_root: "__w/llvm"
+      build_runs_on: build
+      build_cache_root: "/__w/llvm"
       build_github_cache: true
       build_cache_suffix: gcc_no_assertions
       build_artifact_suffix: gcc_no_assertions

.github/workflows/sycl_post_commit.yml

@@ -7,16 +7,13 @@ on:
 
 jobs:
   lint:
-    # TODO use nightly builds of SYCL to get clang-format
     runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers
     steps:
-    - name: Get clang-format first
-      run: sudo apt-get install -yqq clang-format
-
     - uses: actions/checkout@v2
       with:
         fetch-depth: 2
-
     - name: Run clang-format
       uses: ./devops/actions/clang-format
 
@@ -28,7 +25,7 @@ jobs:
     if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
     uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
     with:
-      build_runs_on: "sycl-precommit-linux"
+      build_runs_on: "build"
       build_cache_root: "/__w/"
       build_cache_size: "8G"
       build_artifact_suffix: "default"

.github/workflows/sycl_precommit.yml

@@ -15,6 +15,9 @@ def do_configure(args):
 
     llvm_external_projects = 'sycl;llvm-spirv;opencl;libdevice;xpti;xptifw'
 
+    libclc_amd_target_names = ';amdgcn--;amdgcn--amdhsa'
+    libclc_nvidia_target_names = 'nvptx64--;nvptx64--nvidiacl'
+
     if args.llvm_external_projects:
         llvm_external_projects += ";" + args.llvm_external_projects.replace(",", ";")
 
@@ -42,14 +45,6 @@ def do_configure(args):
     sycl_enable_xpti_tracing = 'ON'
     xpti_enable_werror = 'ON'
 
-    if args.ci_defaults:
-        print("#############################################")
-        print("# Default CI configuration will be applied. #")
-        print("#############################################")
-
-        # For clang-format and clang-tidy
-        llvm_enable_projects += ";clang-tools-extra"
-
     # replace not append, so ARM ^ X86
     if args.arm:
         llvm_targets_to_build = 'ARM;AArch64'
@@ -59,22 +54,22 @@ def do_configure(args):
 
     if args.cuda:
         llvm_targets_to_build += ';NVPTX'
-        libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl'
+        libclc_targets_to_build = libclc_nvidia_target_names
         libclc_gen_remangled_variants = 'ON'
         sycl_build_pi_cuda = 'ON'
 
     if args.hip:
         if args.hip_platform == 'AMD':
             llvm_targets_to_build += ';AMDGPU'
-            libclc_targets_to_build += ';amdgcn--;amdgcn--amdhsa'
+            libclc_targets_to_build += libclc_amd_target_names
             if args.hip_amd_arch:
                 sycl_clang_extra_flags += "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch="+args.hip_amd_arch
 
             # The HIP plugin for AMD uses lld for linking
             llvm_enable_projects += ';lld'
         elif args.hip_platform == 'NVIDIA' and not args.cuda:
             llvm_targets_to_build += ';NVPTX'
-            libclc_targets_to_build += ';nvptx64--;nvptx64--nvidiacl'
+            libclc_targets_to_build += libclc_nvidia_target_names
         libclc_gen_remangled_variants = 'ON'
 
         sycl_build_pi_hip_platform = args.hip_platform
@@ -95,7 +90,28 @@ def do_configure(args):
         llvm_build_shared_libs = 'ON'
 
     if args.use_lld:
-      llvm_enable_lld = 'ON'
+        llvm_enable_lld = 'ON'
+
+    # CI Default conditionally appends to options, keep it at the bottom of
+    # args handling
+    if args.ci_defaults:
+        print("#############################################")
+        print("# Default CI configuration will be applied. #")
+        print("#############################################")
+
+        # For clang-format and clang-tidy
+        llvm_enable_projects += ";clang-tools-extra"
+        # libclc is required for CI validation
+        if 'libclc' not in llvm_enable_projects:
+            llvm_enable_projects += ';libclc'
+        # libclc passes `--nvvm-reflect-enable=false`, build NVPTX to enable it
+        if 'NVPTX' not in llvm_targets_to_build:
+            llvm_targets_to_build += ';NVPTX'
+        # Add both NVIDIA and AMD libclc targets
+        if libclc_amd_target_names not in libclc_targets_to_build:
+            libclc_targets_to_build += libclc_amd_target_names
+        if libclc_nvidia_target_names not in libclc_targets_to_build:
+            libclc_targets_to_build += libclc_nvidia_target_names
 
     install_dir = os.path.join(abs_obj_dir, "install")