Merge/hpce/develop

README.md

@@ -50,8 +50,6 @@ This is an example work-flow and configuration to get and build the LLVM source:
 
      * ``cd llvm-project``
 
-     * ``cmake -S llvm -B build -G <generator> [options]``
-
         Some common build system generators are:
 
         * ``Ninja`` --- for generating [Ninja](https://ninja-build.org)

clang/.gitignore

@@ -22,6 +22,8 @@
 cscope.files
 cscope.out
 /tags
+/TAGS
+.ftpconfig
 
 #==============================================================================#
 # Directories to ignore (do not add trailing '/'s, they skip symlinks).

clang/cmake/modules/FindNECAURORA_LIBELF.cmake

@@ -0,0 +1,47 @@
+#
+#//===----------------------------------------------------------------------===//
+#//
+#//                     The LLVM Compiler Infrastructure
+#//
+#// This file is dual licensed under the MIT and the University of Illinois Open
+#// Source Licenses. See LICENSE.txt for details.
+#//
+#//===----------------------------------------------------------------------===//
+#
+
+find_path (
+  NECAURORA_LIBELF_INCLUDE_DIR
+  NAMES
+    libelf.h
+  PATHS
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+    /sw/include
+    ENV CPATH
+  PATH_SUFFIXES
+    libelf)
+
+find_library (
+  NECAURORA_LIBELF_LIBRARIES
+  NAMES
+    elf
+  PATHS
+    /usr/lib
+    /usr/local/lib
+    /opt/local/lib
+    /sw/lib
+    ENV LIBRARY_PATH
+    ENV LD_LIBRARY_PATH)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  NECAURORA_LIBELF
+  DEFAULT_MSG
+  NECAURORA_LIBELF_LIBRARIES
+  NECAURORA_LIBELF_INCLUDE_DIR)
+
+mark_as_advanced(
+  NECAURORA_LIBELF_INCLUDE_DIR
+  NECAURORA_LIBELF_LIBRARIES)
+

clang/include/clang/AST/DeclBase.h

@@ -54,6 +54,7 @@ class Module;
 class NamedDecl;
 class ObjCContainerDecl;
 class ObjCMethodDecl;
+class PrinterHelper;
 struct PrintingPolicy;
 class RecordDecl;
 class SourceManager;
@@ -1171,7 +1172,8 @@ class alignas(8) Decl {
   void print(raw_ostream &Out, unsigned Indentation = 0,
              bool PrintInstantiation = false) const;
   void print(raw_ostream &Out, const PrintingPolicy &Policy,
-             unsigned Indentation = 0, bool PrintInstantiation = false) const;
+             unsigned Indentation = 0, bool PrintInstantiation = false,
+             PrinterHelper *StmtHelper=nullptr) const;
   static void printGroup(Decl** Begin, unsigned NumDecls,
                          raw_ostream &Out, const PrintingPolicy &Policy,
                          unsigned Indentation = 0);

clang/include/clang/Driver/Options.td

@@ -2457,6 +2457,8 @@ def fopenmp_cuda_force_full_runtime : Flag<["-"], "fopenmp-cuda-force-full-runti
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
 def fno_openmp_cuda_force_full_runtime : Flag<["-"], "fno-openmp-cuda-force-full-runtime">, Group<f_Group>,
   Flags<[NoArgumentUnused, HelpHidden]>;
+def fopenmp_nec_compiler_EQ : Joined<["-"], "fopenmp-nec-compiler=">, Group<f_Group>,
+  Flags<[CC1Option, NoArgumentUnused]>, HelpText<"Offloading compiler for NEC SX-Aurora ('clang' [default],'rvclang' or 'ncc')">;
 def fopenmp_cuda_number_of_sm_EQ : Joined<["-"], "fopenmp-cuda-number-of-sm=">, Group<f_Group>,
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
 def fopenmp_cuda_blocks_per_sm_EQ : Joined<["-"], "fopenmp-cuda-blocks-per-sm=">, Group<f_Group>,

clang/lib/AST/Decl.cpp

@@ -913,6 +913,16 @@ LinkageComputer::getLVForNamespaceScopeDecl(const NamedDecl *D,
   if (!isExternallyVisible(LV.getLinkage()))
     return LinkageInfo(LV.getLinkage(), DefaultVisibility, false);
 
+  // FIXME: This is a workaround to have visible globals in `#pragma omp declare target` on VE.
+  bool VisibleTargetGlobals =
+      Context.getAuxTargetInfo() &&
+      (Context.getTargetInfo().getTriple().getArch() !=
+       Context.getAuxTargetInfo()->getTriple().getArch());
+
+  // Mark the symbols as hidden when compiling for the device.
+  if (!VisibleTargetGlobals && Context.getLangOpts().OpenMP && Context.getLangOpts().OpenMPIsDevice)
+    LV.mergeVisibility(HiddenVisibility, /*newExplicit=*/false);
+
   return LV;
 }