Merge branch 'vladimirlaz-sycl' into sycl

Author: vladimirlaz

buildbot/configure.sh

@@ -26,7 +26,10 @@ done && shift $(($OPTIND - 1))
 # we're in llvm.obj dir
 BUILD_DIR=${PWD}
 
-cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang -DLLVM_EXTERNAL_PROJECTS="sycl;llvm-spirv" \
-    -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/lib/libOpenCL.so" ../llvm.src/llvm
+cmake -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/lib/libOpenCL.so" \
+    ../llvm.src/llvm

buildbot/dependency.sh

@@ -1,8 +1,10 @@
-#!/bin/bash
+#!/bin/bash -x
 
 BRANCH=
 BUILD_NUMBER=
 PR_NUMBER=
+SRC_DIR="../llvm.src"
+DST_DIR="."
 
 # $1 exit code
 # $2 error message
@@ -15,17 +17,38 @@ exit_if_err()
 }
 
 unset OPTIND
-while getopts ":b:r:n:" option; do
+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
+cd ${SRC_DIR}
+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 get tags"
+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 -
+
+## 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

clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp

@@ -1,4 +1,4 @@
-//===-- ClangIncludeFixer.cpp - Standalone change namespace ---------------===//
+//===-- ClangChangeNamespace.cpp - Standalone change namespace ------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/clang-doc/Generators.cpp

@@ -1,4 +1,4 @@
-//===---- Generator.cpp - Generator Registry ---------------------*- C++-*-===//
+//===-- Generators.cpp - Generator Registry ----------------------*- C++-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/clang-doc/Serialize.cpp

@@ -1,4 +1,4 @@
-//===-- Serializer.cpp - ClangDoc Serializer --------------------*- C++ -*-===//
+//===-- Serialize.cpp - ClangDoc Serializer ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/clang-doc/YAMLGenerator.cpp

@@ -1,4 +1,4 @@
-//===--  ClangDocYAML.cpp - ClangDoc YAML -----------------------*- C++ -*-===//
+//===-- YAMLGenerator.cpp - ClangDoc YAML -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/clang-move/HelperDeclRefGraph.cpp

@@ -1,4 +1,4 @@
-//===-- UsedHelperDeclFinder.cpp - AST-based call graph for helper decls --===//
+//===-- HelperDeclRefGraph.cpp - AST-based call graph for helper decls ----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/clang-tidy/abseil/AbseilTidyModule.cpp

@@ -16,12 +16,14 @@
 #include "DurationFactoryFloatCheck.h"
 #include "DurationFactoryScaleCheck.h"
 #include "DurationSubtractionCheck.h"
+#include "DurationUnnecessaryConversionCheck.h"
 #include "FasterStrsplitDelimiterCheck.h"
 #include "NoInternalDependenciesCheck.h"
 #include "NoNamespaceCheck.h"
 #include "RedundantStrcatCallsCheck.h"
 #include "StringFindStartswithCheck.h"
 #include "StrCatAppendCheck.h"
+#include "TimeSubtractionCheck.h"
 #include "UpgradeDurationConversionsCheck.h"
 
 namespace clang {
@@ -45,6 +47,8 @@ class AbseilModule : public ClangTidyModule {
         "abseil-duration-factory-scale");
     CheckFactories.registerCheck<DurationSubtractionCheck>(
         "abseil-duration-subtraction");
+    CheckFactories.registerCheck<DurationUnnecessaryConversionCheck>(
+        "abseil-duration-unnecessary-conversion");
     CheckFactories.registerCheck<FasterStrsplitDelimiterCheck>(
         "abseil-faster-strsplit-delimiter");
     CheckFactories.registerCheck<NoInternalDependenciesCheck>(
@@ -56,6 +60,8 @@ class AbseilModule : public ClangTidyModule {
         "abseil-str-cat-append");
     CheckFactories.registerCheck<StringFindStartswithCheck>(
         "abseil-string-find-startswith");
+    CheckFactories.registerCheck<TimeSubtractionCheck>(
+        "abseil-time-subtraction");
     CheckFactories.registerCheck<UpgradeDurationConversionsCheck>(
         "abseil-upgrade-duration-conversions");
   }

clang-tools-extra/clang-tidy/abseil/CMakeLists.txt

@@ -10,12 +10,14 @@ add_clang_library(clangTidyAbseilModule
   DurationFactoryScaleCheck.cpp
   DurationRewriter.cpp
   DurationSubtractionCheck.cpp
+  DurationUnnecessaryConversionCheck.cpp
   FasterStrsplitDelimiterCheck.cpp
   NoInternalDependenciesCheck.cpp
   NoNamespaceCheck.cpp
   RedundantStrcatCallsCheck.cpp
   StrCatAppendCheck.cpp
   StringFindStartswithCheck.cpp
+  TimeSubtractionCheck.cpp
   UpgradeDurationConversionsCheck.cpp
 
   LINK_LIBS

clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp

@@ -84,6 +84,22 @@ rewriteInverseDurationCall(const MatchFinder::MatchResult &Result,
   return llvm::None;
 }
 
+/// If `Node` is a call to the inverse of `Scale`, return that inverse's
+/// argument, otherwise None.
+static llvm::Optional<std::string>
+rewriteInverseTimeCall(const MatchFinder::MatchResult &Result,
+                       DurationScale Scale, const Expr &Node) {
+  llvm::StringRef InverseFunction = getTimeInverseForScale(Scale);
+  if (const auto *MaybeCallArg = selectFirst<const Expr>(
+          "e", match(callExpr(callee(functionDecl(hasName(InverseFunction))),
+                              hasArgument(0, expr().bind("e"))),
+                     Node, *Result.Context))) {
+    return tooling::fixit::getText(*MaybeCallArg, *Result.Context).str();
+  }
+
+  return llvm::None;
+}
+
 /// Returns the factory function name for a given `Scale`.
 llvm::StringRef getDurationFactoryForScale(DurationScale Scale) {
   switch (Scale) {
@@ -103,6 +119,24 @@ llvm::StringRef getDurationFactoryForScale(DurationScale Scale) {
   llvm_unreachable("unknown scaling factor");
 }
 
+llvm::StringRef getTimeFactoryForScale(DurationScale Scale) {
+  switch (Scale) {
+  case DurationScale::Hours:
+    return "absl::FromUnixHours";
+  case DurationScale::Minutes:
+    return "absl::FromUnixMinutes";
+  case DurationScale::Seconds:
+    return "absl::FromUnixSeconds";
+  case DurationScale::Milliseconds:
+    return "absl::FromUnixMillis";
+  case DurationScale::Microseconds:
+    return "absl::FromUnixMicros";
+  case DurationScale::Nanoseconds:
+    return "absl::FromUnixNanos";
+  }
+  llvm_unreachable("unknown scaling factor");
+}
+
 /// Returns the Time factory function name for a given `Scale`.
 llvm::StringRef getTimeInverseForScale(DurationScale scale) {
   switch (scale) {
@@ -250,6 +284,24 @@ std::string rewriteExprFromNumberToDuration(
       .str();
 }
 
+std::string rewriteExprFromNumberToTime(
+    const ast_matchers::MatchFinder::MatchResult &Result, DurationScale Scale,
+    const Expr *Node) {
+  const Expr &RootNode = *Node->IgnoreParenImpCasts();
+
+  // First check to see if we can undo a complimentary function call.
+  if (llvm::Optional<std::string> MaybeRewrite =
+          rewriteInverseTimeCall(Result, Scale, RootNode))
+    return *MaybeRewrite;
+
+  if (IsLiteralZero(Result, RootNode))
+    return std::string("absl::UnixEpoch()");
+
+  return (llvm::Twine(getTimeFactoryForScale(Scale)) + "(" +
+          tooling::fixit::getText(RootNode, *Result.Context) + ")")
+      .str();
+}
+
 bool isNotInMacro(const MatchFinder::MatchResult &Result, const Expr *E) {
   if (!E->getBeginLoc().isMacroID())
     return true;