Defer diag

CONTRIBUTING.md

@@ -0,0 +1,66 @@
+# Contributing
+
+## License
+Intel Project for LLVM* technology is licensed under the terms of the
+Apache-2.0 with LLVM-exception license (
+[LICENSE.txt](https://github.com/intel/llvm/blob/intel/llvm/LICENSE.TXT))
+to ensure our ability to contribute this project to the LLVM project
+under the same license.
+
+By contributing to this project, you agree to the Apache-2.0 with
+LLVM-exception license and copyright terms there in and release your
+contribution under these terms.
+
+## Sign your work
+Please use the sign-off line at the end of your contribution. Your
+signature certifies that you wrote the contribution or otherwise have
+the right to pass it on as an open-source contribution, and that you
+agree to provide your contribution under the terms of the licenses
+noted above. The rules are pretty simple: if you can certify the
+below (from [developercertificate.org](http://developercertificate.org)):
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+Then you just add a line to every git commit message:
+
+    Signed-off-by: Joe Smith <[email protected]>
+
+Use your real name (sorry, no pseudonyms or anonymous contributions.)
+
+If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `git commit -s`.

README.md

@@ -1,5 +1,19 @@
-# The LLVM Compiler Infrastructure
+# Intel Project for LLVM* technology
 
-This directory and its subdirectories contain source code for LLVM,
-a toolkit for the construction of highly optimized compilers,
-optimizers, and runtime environments.
+## 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.
+
+## License
+See [LICENSE.txt](https://github.com/intel/llvm/blob/intel/llvm/LICENSE.TXT) for details.
+
+
+## Contributing
+See [CONTRIBUTING.md](https://github.com/intel/llvm/blob/intel/CONTRIBUTING.md) for details.
+
+## Sub-projects Documentation
+ - SYCL Compiler and Runtimes - See [GetStartedWithSYCLCompiler.md](https://github.com/intel/llvm/blob/sycl/sycl/doc/GetStartedWithSYCLCompiler.md)
+
+*Other names and brands may be claimed as the property of others.

buildbot/README.md

@@ -0,0 +1,37 @@
+# Scripts for build steps on Buildbot
+
+## Purpose
+
+The purpose of the script is for developer to customize build command for the builder on Buildbot.
+
+## How it works
+
+The scripts will be run by Buildbot at corresponding build step, for example, the "compile" step will run "compile.sh". Developer can change the build command, then the builder (e.g. pull request builder) will use the changed command to do the build.
+
+## Arguments for the scripts
+
+Common
+
+* -b BRANCH: the branch name to build
+* -n BUILD\_NUMBER: the Buildbot build number (the build count of one builder, which will be in the url of one specific build)
+* -r PR\_NUMBER: if it's a pull request build, this will be the pull request number
+
+LIT Test (check.sh)
+
+* -t TESTCASE: the LIT testing target, e.g. check-sycl
+
+## Assumptions
+
+The Buildbot worker directory structure is:
+
+    /path/to/WORKER_ROOT/BUILDER/
+        llvm.src  --> source code
+        llvm.obj  --> build directory
+
+Initial working directory of the scripts:
+
+* dependency.sh         :  llvm.obj
+* configure.sh          :  llvm.obj
+* compile.sh            :  llvm.obj
+* clang-tidy.sh         :  llvm.src
+* check.sh              :  llvm.obj

buildbot/check.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+BRANCH=
+BUILD_NUMBER=
+PR_NUMBER=
+TESTCASE=
+
+# $1 exit code
+# $2 error message
+exit_if_err()
+{
+    if [ $1 -ne 0  ]; then
+        echo "Error: $2"
+        exit $1
+    fi
+}
+
+unset OPTIND
+while getopts ":b:r:n:t:" option; do
+    case $option in
+        b) BRANCH=$OPTARG ;;
+        n) BUILD_NUMBER=$OPTARG ;;
+        r) PR_NUMBER=$OPTARG ;;
+        t) TESTCASE=$OPTARG ;;
+    esac
+done && shift $(($OPTIND - 1))
+
+# we're in llvm.obj dir
+BUILD_DIR=${PWD}
+
+if [ -z "${TESTCASE}" ]; then
+    echo "No target provided"
+    exit 1
+fi
+
+make ${TESTCASE} VERBOSE=1 -j`nproc` LIT_ARGS="-v"

buildbot/clang-tidy.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+BRANCH=
+BUILD_NUMBER=
+PR_NUMBER=
+
+# $1 exit code
+# $2 error message
+exit_if_err()
+{
+    if [ $1 -ne 0  ]; then
+        echo "Error: $2"
+        exit $1
+    fi
+}
+
+unset OPTIND
+while getopts ":b:r:n:" option; do
+    case $option in
+        b) BRANCH=$OPTARG ;;
+        n) BUILD_NUMBER=$OPTARG ;;
+        r) PR_NUMBER=$OPTARG ;;
+    esac
+done && shift $(($OPTIND - 1))
+
+if [ -z "${PR_NUMBER}" ]; then
+    echo "No PR number provided"
+    exit 1
+fi
+
+# we're in llvm.src dir
+SRC_DIR=${PWD}
+BUILDER_DIR=$(cd ..; pwd)
+
+# Get changed files
+base_commit=`git merge-base origin/sycl refs/pull/${PR_NUMBER}/merge`
+exit_if_err $? "fail to get base commit"
+
+path_list_file=${BUILDER_DIR}/changed_files.txt
+git --no-pager diff ${base_commit} refs/pull/${PR_NUMBER}/merge --name-only > ${path_list_file}
+cat ${path_list_file}
+
+# Run clang-tidy
+while IFS='' read -r line ; do
+    file_name=$(basename ${line})
+    file_ext=${file_name##*.}
+    if [[ "${file_ext}" == "h" || "${file_ext}" == "hpp" || "${file_ext}" == "c" || "${file_ext}" == "cc" || "${file_ext}" == "cpp" ]]; then
+        ${BUILDER_DIR}/llvm.obj/bin/clang-tidy ${line}
+    fi
+done < "${path_list_file}"

buildbot/compile.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+BRANCH=
+BUILD_NUMBER=
+PR_NUMBER=
+
+# $1 exit code
+# $2 error message
+exit_if_err()
+{
+    if [ $1 -ne 0  ]; then
+        echo "Error: $2"
+        exit $1
+    fi
+}
+
+unset OPTIND
+while getopts ":b:r:n:" option; do
+    case $option in
+        b) BRANCH=$OPTARG ;;
+        n) BUILD_NUMBER=$OPTARG ;;
+        r) PR_NUMBER=$OPTARG ;;
+    esac
+done && shift $(($OPTIND - 1))
+
+# we're in llvm.obj dir
+BUILD_DIR=${PWD}
+
+make -j`nproc` sycl-toolchain

buildbot/configure.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+BRANCH=
+BUILD_NUMBER=
+PR_NUMBER=
+
+# $1 exit code
+# $2 error message
+exit_if_err()
+{
+    if [ $1 -ne 0  ]; then
+        echo "Error: $2"
+        exit $1
+    fi
+}
+
+unset OPTIND
+while getopts ":b:r:n:" option; do
+    case $option in
+        b) BRANCH=$OPTARG ;;
+        n) BUILD_NUMBER=$OPTARG ;;
+        r) PR_NUMBER=$OPTARG ;;
+    esac
+done && shift $(($OPTIND - 1))
+
+# we're in llvm.obj dir
+BUILD_DIR=${PWD}
+
+CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang \
+    -DLLVM_EXTERNAL_SYCL_SOURCE_DIR=../llvm.src/sycl \
+    -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR=../llvm.src/llvm-spirv \
+    -DLLVM_TOOL_SYCL_BUILD=ON -DLLVM_TOOL_LLVM_SPIRV_BUILD=ON \
+    -DOpenCL_INCLUDE_DIR=OpenCL-Headers \
+    -DOpenCL_LIBRARY=OpenCL-ICD-Loader/build/libOpenCL.so \
+    -DLLVM_BUILD_TOOLS=OFF \
+    ../llvm.src/llvm"
+
+cmake ${CMAKE_ARGS}
+# Do clean build if configure failed due to any reason
+if [ $? -ne 0 ]; then
+   rm -f ${BUILD_DIR}/CMakeCache.txt
+   cmake ${CMAKE_ARGS}
+fi

buildbot/dependency.sh

@@ -0,0 +1,83 @@
+#!/bin/bash -x
+
+BRANCH=
+BUILD_NUMBER=
+PR_NUMBER=
+SRC_DIR="../llvm.src"
+DST_DIR="."
+
+# $1 exit code
+# $2 error message
+exit_if_err()
+{
+    if [ $1 -ne 0  ]; then
+        echo "Error: $2"
+        exit $1
+    fi
+}
+
+unset OPTIND
+while getopts ":b:r:n:s:d" option; do
+    case $option in
+        b) BRANCH=$OPTARG ;;
+        n) BUILD_NUMBER=$OPTARG ;;
+        s) SRC_DIR=$OPTARG ;;
+        d) DST_DIR=$OPTARG ;;
+        r) PR_NUMBER=$OPTARG ;;
+    esac
+done && shift $(($OPTIND - 1))
+
+# we're in llvm.obj dir
+BUILD_DIR=${PWD}
+
+# Get changed build script files if it is PR
+if [ -n "${PR_NUMBER}" ];then
+    cd ${SRC_DIR}
+    git fetch origin sycl
+    exit_if_err $? "fail to get the latest changes in sycl branch"
+    git fetch -t origin refs/pull/${PR_NUMBER}/merge
+    exit_if_err $? "fail to get tags"
+    git checkout -B refs/pull/${PR_NUMBER}/merge
+    exit_if_err $? "fail to create branch for specific tag"
+    base_commit=`git merge-base origin/sycl refs/pull/${PR_NUMBER}/merge`
+    exit_if_err $? "fail to get base commit"
+
+    BUILD_SCRIPT=`git --no-pager diff ${base_commit} refs/pull/${PR_NUMBER}/merge --name-only buildbot`
+    cd -
+fi
+
+## Clean up build directory if build scripts has changed
+cd ${DST_DIR}
+if [  -n "$BUILD_SCRIPT" ]; then
+   rm -rf *
+fi
+cd -
+
+## GET dependencies
+if [ ! -d "OpenCL-Headers" ]; then
+    git clone https://github.com/KhronosGroup/OpenCL-Headers OpenCL-Headers
+    exit_if_err $? "failed to clone OpenCL-Headers"
+else
+    cd OpenCL-Headers
+    git pull --ff --ff-only origin
+    exit_if_err $? "failed to update OpenCL-Headers"
+fi
+
+OPENCL_HEADERS=${BUILD_DIR}/OpenCL-Headers
+
+cd ${BUILD_DIR}
+if [ ! -d "OpenCL-ICD-Loader" ]; then
+    git clone https://github.com/KhronosGroup/OpenCL-ICD-Loader OpenCL-ICD-Loader
+    exit_if_err $? "failed to clone OpenCL-ICD-Loader"
+else
+    cd OpenCL-ICD-Loader
+    git pull --ff --ff-only origin
+    exit_if_err $? "failed to update OpenCL-ICD-Loader"
+fi
+
+cd ${BUILD_DIR}/OpenCL-ICD-Loader
+mkdir build
+cd build
+cmake ..
+make C_INCLUDE_PATH=${OPENCL_HEADERS}
+exit_if_err $? "failed to build OpenCL-ICD-Loader"

clang-tools-extra/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(CMakeDependentOption)
+
 add_subdirectory(clang-apply-replacements)
 add_subdirectory(clang-reorder-fields)
 add_subdirectory(modularize)
@@ -9,7 +11,6 @@ add_subdirectory(clang-doc)
 add_subdirectory(clang-include-fixer)
 add_subdirectory(clang-move)
 add_subdirectory(clang-query)
-add_subdirectory(clangd)
 add_subdirectory(pp-trace)
 add_subdirectory(tool-template)
 
@@ -25,3 +26,9 @@ if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS )
   add_subdirectory(docs)
 endif()
 
+# clangd has its own CMake tree. It requires threads.
+CMAKE_DEPENDENT_OPTION(CLANG_ENABLE_CLANGD "Build clangd language server" ON
+                       "LLVM_ENABLE_THREADS" OFF)
+if (CLANG_ENABLE_CLANGD)
+  add_subdirectory(clangd)
+endif()