Merge remote-tracking branch 'intel/sycl' into optimize-build

Author: bader

.clang-tidy

@@ -18,3 +18,5 @@ CheckOptions:
     value:           1
   - key:             readability-redundant-member-init.IgnoreBaseInCopyConstructors
     value:           1
+  - key:             modernize-use-default-member-init.UseAssignment
+    value:           1

.github/workflows/issue-subscriber.yml

@@ -10,26 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'llvm/llvm-project'
     steps:
+    - name: Setup Automation Script
+      run:  |
+        curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/github-automation.py
+        chmod a+x github-automation.py
+        pip install PyGithub
+
     - name: Update watchers
-      uses: actions/github-script@v5
-      with:
-        github-token: ${{ secrets.ISSUE_MENTION_SECRET }}
-        script: |
-            const teamname = "issue-subscribers-" + context.payload.label.name.replace(/ /g, "-").replace(":","-").replace("/","-");
-            const comment = "@llvm/" + teamname;
-            try {
-              // This will throw an exception if the team does not exist and no
-              // comment will be created.
-              team = await github.rest.teams.getByName({
-                org: context.repo.owner,
-                team_slug: teamname
-              });
-              github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: comment
-              });
-            } catch (e){
-              console.log(e);
-            }
+      run: |
+        ./github-automation.py \
+          --token ${{ secrets.ISSUE_SUBSCRIBER_TOKEN }} \
+          issue-subscriber \
+          --issue-number ${{ github.event.issue.number }} \
+          --label-name ${{ github.event.label.name }}

.github/workflows/sycl_containers.yaml

@@ -9,9 +9,13 @@ on:
       - sycl
     paths:
       - 'devops/containers/**'
+      - 'devops/dependencies.json'
+      - '.github/workflows/sycl_containers.yaml'
   pull_request:
     paths:
       - 'devops/containers/**'
+      - 'devops/dependencies.json'
+      - '.github/workflows/sycl_containers.yaml'
 
 jobs:
   base_image_ubuntu2004:
@@ -52,6 +56,7 @@ jobs:
           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:
@@ -64,6 +69,15 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 2
+      - name: Get dependencies configuration
+        id: deps
+        run: |
+          DEPS=`cat devops/dependencies.json`
+          DEPS="${DEPS//'%'/'%25'}"
+          DEPS="${DEPS//$'\n'/'%0A'}"
+          DEPS="${DEPS//$'\r'/'%0D'}"
+          echo $DEPS
+          echo "::set-output name=deps::$DEPS"
       - name: Build and Push Container
         uses: ./devops/actions/build_container
         with:
@@ -74,4 +88,33 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
             ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
+          build-args: |
+            compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
+            igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
+            tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
+            fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
+            cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
+
+  # This job produces a Docker container with the latest versions of Intel
+  # drivers, that can be found on GitHub.
+  drivers_image_ubuntu2004_unstable:
+    if: github.repository == 'intel/llvm'
+    name: Intel Drivers (unstable) 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:unstable-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
 

.github/workflows/sycl_linux_build_and_test.yml

@@ -150,33 +150,34 @@ jobs:
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
           --cmake-opt="-DSYCL_PI_TESTS=OFF"
     - name: Compile
+      id: build
       run: cmake --build $GITHUB_WORKSPACE/build
     # TODO allow to optionally disable in-tree checks
     - name: check-llvm
-      if: always()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm
     - name: check-clang
-      if: always()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       run: |
         export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
         cmake --build $GITHUB_WORKSPACE/build --target check-clang
     - name: check-sycl
-      if: always()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       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()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
     - name: check-xptifw
-      if: always()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
     - name: check-libclc
-      if: always()
+      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' }}
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libclc
     - name: Install
@@ -191,6 +192,9 @@ jobs:
         cmake --build $GITHUB_WORKSPACE/build --target install-clang-format
         cmake --build $GITHUB_WORKSPACE/build --target install-clang-tidy
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-size
+        cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
+        cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
+        cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
         # TODO this should be resolved in CMakeLists.txt
         cmake --build $GITHUB_WORKSPACE/build --target install-lld || echo "skipped"
 

.github/workflows/sycl_nightly.yml

@@ -18,6 +18,7 @@ jobs:
       build_github_cache: true
       build_cache_root: "/__w/"
       build_artifact_suffix: default
+      lts_config: "ocl_gen9;ocl_x64;hip_amdgpu"
   ubuntu2004_docker_build_push:
     if: github.repository == 'intel/llvm'
     runs-on: ubuntu-latest

.github/workflows/sycl_precommit.yml

@@ -5,6 +5,10 @@ on:
     branches:
     - sycl
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: ubuntu-latest

bolt/CMakeLists.txt

@@ -0,0 +1,105 @@
+include(ExternalProject)
+
+set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(BOLT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_CXX_STANDARD 14)
+
+set(BOLT_ENABLE_RUNTIME OFF)
+if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
+  set(BOLT_ENABLE_RUNTIME ON)
+endif()
+
+set(BOLT_CLANG_EXE "" CACHE FILEPATH "Path to clang executable for the target \
+architecture for use in BOLT tests")
+set(BOLT_LLD_EXE "" CACHE FILEPATH "Path to lld executable for the target \
+architecture for use in BOLT tests")
+
+set(BOLT_INCLUDE_TESTS OFF)
+if (LLVM_INCLUDE_TESTS)
+  if ("clang" IN_LIST LLVM_ENABLE_PROJECTS OR BOLT_CLANG_EXE)
+    if ("clang" IN_LIST LLVM_ENABLE_PROJECTS AND BOLT_CLANG_EXE)
+      message(WARNING "BOLT_CLANG_EXE is set and clang project is enabled. \
+            BOLT_CLANG_EXE will be used for BOLT tests.")
+    endif()
+    if ("lld" IN_LIST LLVM_ENABLE_PROJECTS OR BOLT_LLD_EXE)
+      if ("lld" IN_LIST LLVM_ENABLE_PROJECTS AND BOLT_LLD_EXE)
+        message(WARNING "BOLT_LLD_EXE is set and lld project is enabled. \
+              BOLT_LLD_EXE will be used for BOLT tests.")
+      endif()
+      set(BOLT_INCLUDE_TESTS ON)
+    else()
+      message(WARNING "Not including BOLT tests since lld is disabled. \
+            Enable lld in LLVM_ENABLE_PROJECTS or provide a path to lld binary \
+            in BOLT_LLD_EXE.")
+    endif()
+  else()
+    message(WARNING "Not including BOLT tests since clang is disabled. \
+          Enable clang in LLVM_ENABLE_PROJECTS or provide a path to clang \
+          binary in BOLT_CLANG_EXE.")
+  endif()
+endif()
+
+if (BOLT_ENABLE_RUNTIME)
+  message(STATUS "Building BOLT runtime libraries for X86")
+  ExternalProject_Add(bolt_rt
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/runtime"
+    STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-stamps
+    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-bins
+    CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+               -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+               -DCMAKE_BUILD_TYPE=Release
+               -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+               -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR}
+    BUILD_ALWAYS True
+    )
+  install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-bins/cmake_install.cmake \)"
+    COMPONENT bolt)
+  add_llvm_install_targets(install-bolt_rt
+    DEPENDS bolt_rt bolt
+    COMPONENT bolt)
+endif()
+
+# Get the current git revision for BOLT.
+find_program(git_executable NAMES git git.exe git.cmd)
+if (git_executable)
+  execute_process(COMMAND ${git_executable} rev-parse HEAD
+    WORKING_DIRECTORY ${LLVM_MAIN_SRC_DIR}
+    TIMEOUT 5
+    RESULT_VARIABLE git_result
+    OUTPUT_VARIABLE git_output)
+  if( git_result EQUAL 0 )
+    string(STRIP "${git_output}" git_ref_id)
+    set(BOLT_REVISION "${git_ref_id}")
+  endif()
+endif()
+
+# If we can't find a revision, set it to "<unknown>".
+if (NOT BOLT_REVISION)
+  set(BOLT_REVISION "<unknown>")
+endif()
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/bolt/Utils/BoltRevision.inc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/include/bolt/Utils/BoltRevision.inc)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}/include
+  )
+
+add_subdirectory(lib)
+add_subdirectory(tools)
+
+if (BOLT_INCLUDE_TESTS)
+  if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
+    add_subdirectory(unittests)
+    list(APPEND BOLT_TEST_DEPS BoltUnitTests)
+  endif()
+  add_subdirectory(test)
+endif()
+
+option(BOLT_INCLUDE_DOCS "Generate build targets for the BOLT docs."
+       ${LLVM_INCLUDE_DOCS})
+if (BOLT_INCLUDE_DOCS)
+  add_subdirectory(docs)
+endif()

bolt/CODE_OWNERS.TXT

@@ -0,0 +1,22 @@
+This file is a list of the people responsible for ensuring that patches for a
+particular part of BOLT are reviewed, either by themself or by someone else.
+They are also the gatekeepers for their part of BOLT, with the final word on
+what goes in or not.
+
+The list is sorted by surname and formatted to allow easy grepping and
+beautification by scripts. The fields are: name (N), email (E), web-address
+(W), PGP key ID and fingerprint (P), description (D), snail-mail address
+(S) and (I) IRC handle. Each entry should contain at least the (N), (E) and
+(D) fields.
+
+N: Maksim Panchenko, Rafael Auler
+E: [email protected], [email protected]
+D: All parts not covered by someone else
+
+N: Alexander Yermolovich
+E: [email protected]
+D: DWARF support
+
+N: Vladislav Khmelevsky
+E: [email protected]
+D: AArch64 backend