Xilinx 2021.1 release

Author: epxilinx

clang-tools-extra/.arcconfig

@@ -1,4 +1,4 @@
 {
-  "repository.callsign" : "CTE",
-  "conduit_uri" : "https://reviews.llvm.org/"
+  "repository.callsign" : "E",
+  "conduit_uri" : "http://hlsweb.xilinx.com/"
 }

clang-tools-extra/CMakeLists.txt

@@ -14,6 +14,9 @@ add_subdirectory(include-fixer)
 add_subdirectory(pp-trace)
 add_subdirectory(tool-template)
 
+add_subdirectory(xilinx-legacy-rewriter)
+add_subdirectory(xilinx-dataflow-lawyer)
+
 # Add the common testsuite after all the tools.
 if(CLANG_INCLUDE_TESTS)
 add_subdirectory(test)

clang-tools-extra/LICENSE.TXT

@@ -61,3 +61,6 @@ Program             Directory
 -------             ---------
 clang-tidy          clang-tidy/cert
 clang-tidy          clang-tidy/hicpp
+clang-tidy          clang-tidy/xilinx
+xilinx-dataflow-lawyer xilinx-dataflow-lawyer
+xilinx-legacy-rewriter xilinx-legacy-rewriter

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

@@ -43,4 +43,5 @@ add_subdirectory(performance)
 add_subdirectory(plugin)
 add_subdirectory(readability)
 add_subdirectory(tool)
+add_subdirectory(xilinx)
 add_subdirectory(utils)

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -582,6 +582,11 @@ void exportReplacements(const llvm::StringRef MainFilePath,
   TUD.MainSourceFile = MainFilePath;
   for (const auto &Error : Errors) {
     tooling::Diagnostic Diag = Error;
+    if (Error.RealLoc.isValid()) {
+      Diag.Message.FilePath = Error.RealFilePath.c_str();
+      // FIXME: Can not display column info
+      Diag.Message.FileOffset = Error.RealLoc.getLine();
+    }
     TUD.Diagnostics.insert(TUD.Diagnostics.end(), Diag);
   }
 

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp

@@ -5,6 +5,11 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
+// And has the following additional copyright:
+//
+// (C) Copyright 2016-2020 Xilinx, Inc.
+// All Rights Reserved.
+//
 //===----------------------------------------------------------------------===//
 ///
 ///  \file This file implements ClangTidyDiagnosticConsumer, ClangTidyContext
@@ -23,6 +28,7 @@
 #include "clang/Frontend/DiagnosticRenderer.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
+#include "llvm/Support/Path.h"
 #include <tuple>
 #include <vector>
 using namespace clang;
@@ -79,12 +85,12 @@ class ClangTidyDiagnosticRenderer : public DiagnosticRenderer {
       tooling::Replacement Replacement(Loc.getManager(), Range,
                                        FixIt.CodeToInsert);
       llvm::Error Err = Error.Fix[Replacement.getFilePath()].add(Replacement);
-      // FIXME: better error handling (at least, don't let other replacements be
-      // applied).
       if (Err) {
+        // FIXME: better error handling. Now if there are conflicted fixes,
+        //        neither one will be applied.
         llvm::errs() << "Fix conflicts with existing fix! "
                      << llvm::toString(std::move(Err)) << "\n";
-        assert(false && "Fix conflicts with existing fix!");
+        Error.HasConflictedFixes = true;
       }
     }
   }
@@ -109,9 +115,15 @@ class ClangTidyDiagnosticRenderer : public DiagnosticRenderer {
 
 ClangTidyError::ClangTidyError(StringRef CheckName,
                                ClangTidyError::Level DiagLevel,
-                               StringRef BuildDirectory, bool IsWarningAsError)
+                               StringRef BuildDirectory, bool IsWarningAsError,
+                               bool HasConflictedFixes = false,
+                               PresumedLoc Loc = PresumedLoc(),
+                               std::string FilePath = std::string())
     : tooling::Diagnostic(CheckName, DiagLevel, BuildDirectory),
-      IsWarningAsError(IsWarningAsError) {}
+      IsWarningAsError(IsWarningAsError),
+      HasConflictedFixes(HasConflictedFixes), RealLoc(Loc),
+      RealFilePath(FilePath) {
+}
 
 // Returns true if GlobList starts with the negative indicator ('-'), removes it
 // from the GlobList.
@@ -267,6 +279,7 @@ ClangTidyDiagnosticConsumer::ClangTidyDiagnosticConsumer(
   Diags = llvm::make_unique<DiagnosticsEngine>(
       IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs), &*DiagOpts, this,
       /*ShouldOwnClient=*/false);
+  DiagOpts->ShowPresumedLoc = 1;
   Context.setDiagnosticsEngine(Diags.get());
 }
 
@@ -379,6 +392,24 @@ static bool LineIsMarkedWithNOLINTinMacro(SourceManager &SM, SourceLocation Loc,
   return false;
 }
 
+static std::string GetAbsoluteFilename(const Diagnostic &Info,
+                                       PresumedLoc PLoc) {
+  if (PLoc.isInvalid() || !Info.hasSourceManager())
+    return std::string();
+  const auto &SM = Info.getSourceManager();
+  StringRef Filename = PLoc.getFilename();
+  SmallVector<char, 128> AbsoluteFilename;
+  const DirectoryEntry *Dir =
+      SM.getFileManager().getDirectory(llvm::sys::path::parent_path(Filename));
+  if (Dir) {
+    StringRef DirName = SM.getFileManager().getCanonicalName(Dir);
+    llvm::sys::path::append(AbsoluteFilename, DirName,
+                            llvm::sys::path::filename(Filename));
+    Filename = StringRef(AbsoluteFilename.data(), AbsoluteFilename.size());
+  }
+  return Filename.str();
+}
+
 void ClangTidyDiagnosticConsumer::HandleDiagnostic(
     DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) {
   if (LastErrorWasIgnored && DiagLevel == DiagnosticsEngine::Note)
@@ -398,6 +429,12 @@ void ClangTidyDiagnosticConsumer::HandleDiagnostic(
   LastErrorWasIgnored = false;
   // Count warnings/errors.
   DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info);
+  FullSourceLoc Loc =
+      (Info.getLocation().isInvalid())
+          ? FullSourceLoc()
+          : FullSourceLoc(Info.getLocation(), Info.getSourceManager());
+  PresumedLoc PLoc = Loc.getPresumedLoc();
+  auto FilePath = GetAbsoluteFilename(Info, PLoc);
 
   if (DiagLevel == DiagnosticsEngine::Note) {
     assert(!Errors.empty() &&
@@ -440,18 +477,16 @@ void ClangTidyDiagnosticConsumer::HandleDiagnostic(
     bool IsWarningAsError = DiagLevel == DiagnosticsEngine::Warning &&
                             Context.treatAsError(CheckName);
     Errors.emplace_back(CheckName, Level, Context.getCurrentBuildDirectory(),
-                        IsWarningAsError);
+                        IsWarningAsError, false /* HasConflictedFixes */, PLoc,
+                        FilePath);
   }
 
   ClangTidyDiagnosticRenderer Converter(
       Context.getLangOpts(), &Context.DiagEngine->getDiagnosticOptions(),
       Errors.back());
   SmallString<100> Message;
   Info.FormatDiagnostic(Message);
-  FullSourceLoc Loc =
-      (Info.getLocation().isInvalid())
-          ? FullSourceLoc()
-          : FullSourceLoc(Info.getLocation(), Info.getSourceManager());
+
   Converter.emitDiagnostic(Loc, DiagLevel, Message, Info.getRanges(),
                            Info.getFixItHints());
 
@@ -633,6 +668,13 @@ void ClangTidyDiagnosticConsumer::removeIncompatibleErrors(
   }
 
   for (unsigned I = 0; I < Errors.size(); ++I) {
+    if (Errors[I].HasConflictedFixes) {
+      Errors[I].Fix.clear();
+      Errors[I].Notes.emplace_back(
+          "Found multiple fixes which conflict to each other and can not be "
+          "resolved. Fixes will not be applied.");
+    }
+
     if (!Apply[I]) {
       Errors[I].Fix.clear();
       Errors[I].Notes.emplace_back(

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h

@@ -5,6 +5,11 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
+// And has the following additional copyright:
+//
+// (C) Copyright 2016-2020 Xilinx, Inc.
+// All Rights Reserved.
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYDIAGNOSTICCONSUMER_H
@@ -42,9 +47,13 @@ namespace tidy {
 /// FIXME: Make Diagnostics flexible enough to support this directly.
 struct ClangTidyError : tooling::Diagnostic {
   ClangTidyError(StringRef CheckName, Level DiagLevel, StringRef BuildDirectory,
-                 bool IsWarningAsError);
+                 bool IsWarningAsError, bool HasConflictedFixes,
+                 PresumedLoc Loc, std::string FilePath);
 
   bool IsWarningAsError;
+  bool HasConflictedFixes;
+  PresumedLoc RealLoc;
+  std::string RealFilePath;
 };
 
 /// \brief Read-only set of strings represented as a list of positive and

clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

@@ -152,6 +152,7 @@ ClangTidyOptions::mergeWith(const ClangTidyOptions &Other) const {
   overrideValue(Result.User, Other.User);
   mergeVectors(Result.ExtraArgs, Other.ExtraArgs);
   mergeVectors(Result.ExtraArgsBefore, Other.ExtraArgsBefore);
+  overrideValue(Result.ImportDirective, Other.ImportDirective);
 
   for (const auto &KeyValue : Other.CheckOptions)
     Result.CheckOptions[KeyValue.first] = KeyValue.second;

clang-tools-extra/clang-tidy/ClangTidyOptions.h

@@ -108,6 +108,9 @@ struct ClangTidyOptions {
 
   /// \brief Add extra compilation arguments to the start of the list.
   llvm::Optional<ArgList> ExtraArgsBefore;
+
+  /// \brief file path for json format directive.
+  llvm::Optional<std::string> ImportDirective;
 };
 
 /// \brief Abstract interface for retrieving various ClangTidy options.

clang-tools-extra/clang-tidy/add_new_check.py

@@ -64,6 +64,14 @@ def write_header(module_path, module, check_name, check_name_camel):
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
+""")
+    if module=='xilinx':
+      f.write("""// And has the following additional copyright:
+//
+// (C) Copyright 2016-2020 Xilinx, Inc.
+// All Rights Reserved.
+//""")
+    f.write("""
 //===----------------------------------------------------------------------===//
 
 #ifndef %(header_guard)s
@@ -115,6 +123,14 @@ def write_implementation(module_path, module, check_name_camel):
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
+""")
+    if module=='xilinx':
+      f.write("""// And has the following additional copyright:
+//
+// (C) Copyright 2016-2020 Xilinx, Inc.
+// All Rights Reserved.
+//""")
+    f.write("""
 //===----------------------------------------------------------------------===//
 
 #include "%(check_name)s.h"