Merge remote-tracking branch 'manorom/sotoc_offload_select_compiler' into feature/sotoc_offload

Author: Simon Moll

clang/tools/nec-aurora-build/CMakeLists.txt

@@ -4,7 +4,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 # Find NEC target compiler.
-find_program(NECAURORA_TARGET_COMPILER
+find_program(NECAURORA_TARGET_COMPILER_NCC
   NAMES
     ncc
     ncc-2.3.1
@@ -13,16 +13,26 @@ find_program(NECAURORA_TARGET_COMPILER
   PATHS
     "/opt/nec/ve/bin/"
     ENV PATH)
-
-# if ncc was not found and gcc is not set stop
-if(NOT NECAURORA_TARGET_COMPILER AND NOT NECAURORA_TARGET_COMPILER_GCC)
-  message(FATAL_ERROR "NEC target compiler not found and GCC not set, exiting.")
-# if ncc was not found vut gcc is set, use gcc
-elseif(NOT NECAURORA_TARGET_COMPILER)
-  message(STATUS "NEC target compiler not found but GCC is set, using GCC.")
-  set(NECAURORA_TARGET_COMPILER "${NECAURORA_TARGET_COMPILER_GCC}")
+# It is okay if we do not find ncc, we can fallback to Clang or RVCLang and
+# will handlle the missing ncc in code.
+if (NECAURORA_TARGET_COMPILER_NCC)
+    set(TARGET_COMPILER_NCC "${NECAURORA_TARGET_COMPILER_NCC}")
+else()
+    message(WARNING "Could not find ncc compiler. ncc will not be avaible as VE target compiler")
 endif()
 
+# Set Clang and RVClang target compiler variables
+set(NECAURORA_TARGET_COMPILER_CLANG
+    "${CMAKE_INSTALL_PREFIX}/bin/clang"
+    CACHE
+    FILEPATH
+    "Path to clang used as VE target compiler")
+set(NECAURORA_TARGET_COMPILER_RVCLANG
+    "${CMAKE_INSTALL_PREFIX}/bin/rvclang"
+    CACHE FILEPATH
+    "Path to rvclang used as VE target compiler")
+
+
 find_library(
    NECAURORA_LIBVEORUN_STATIC
   NAMES

clang/tools/nec-aurora-build/config.h.in

@@ -1,2 +1,5 @@
-#define DEFAULT_TARGET_COMPILER "@NECAURORA_TARGET_COMPILER@"
+#define      TARGET_COMPILER_CLANG   "@NECAURORA_TARGET_COMPILER_CLANG@"
+#define      TARGET_COMPILER_RVCLANG "@NECAURORA_TARGET_COMPILER_RVCLANG@"
+#cmakedefine TARGET_COMPILER_NCC     "@TARGET_COMPILER_NCC@"
+
 #cmakedefine LIBVEORUN_STATIC_PATH "@LIBVEORUN_STATIC_PATH@"

clang/tools/nec-aurora-build/utils.cpp

@@ -8,19 +8,37 @@
 
 #include "necaurora-ofld-wrapper.h"
 
-const std::string ClangCompilerCmd = "clang --target=ve-linux";
-const std::string RVClangCompilerCmd = "rvclang --target=ve-linux";
-const std::string NCCCompilerCmd = "/opt/nec/ve/bin/ncc";
+const std::string ClangCompilerCmd = TARGET_COMPILER_CLANG " --target=ve-linux";
+const std::string RVClangCompilerCmd = TARGET_COMPILER_RVCLANG " --target=ve-linux";
+const std::string NCCCompilerCmd = TARGET_COMPILER_NCC;
 
-std::string CompilerCmd;
+std::string CompilerCmd = ClangCompilerCmd;
 
 int configureTargetCompiler(const std::string& CompilerName) {
+  if (CompilerName.find("path:") == 0) {
+    CompilerCmd = CompilerName.substr(5);
+    //Small sanity check whether there is actually a path
+    if (CompilerCmd.length() > 0) {
+      return 0;
+    }
+    std::cerr << "nec-aurora-build: -fopenmp-nec-compiler=path: empty"
+              << std::endl;
+
+  }
   if (CompilerName == "clang")   { CompilerCmd = ClangCompilerCmd; return 0; }
   if (CompilerName == "rvclang") { CompilerCmd = RVClangCompilerCmd; return 0; }
   if (CompilerName == "ncc")     { CompilerCmd = NCCCompilerCmd; return 0; }
+  std::cerr << "nec-aurora-build: -fopenmp-nec-compiler=" << CompilerCmd
+            << " not recognized"
+            << std::endl;
   return 1;
 }
 
+
+const char *getTargetCompiler() {
+  return CompilerCmd.c_str();
+}
+
 const char *getTmpDir() {
   const char *TmpDir = std::getenv("TMPDIR");
 
@@ -39,18 +57,6 @@ const char *getTmpDir() {
   return TmpDir;
 }
 
-const char *getTargetCompiler() {
-  if (CompilerCmd.empty()) {
-    const char *TargetCompiler = std::getenv("NECAURORA_OFLD_TARGET_COMPILER");
-    if (!TargetCompiler) {
-      TargetCompiler = DEFAULT_TARGET_COMPILER;
-    }
-    return TargetCompiler;
-  }
-
-  return CompilerCmd.c_str();
-}
-
 std::string writeTmpFile(const std::string &Content, const std::string &Prefix,
                          const std::string &Extension, bool RealTmpfile) {
   std::string TmpPath;

clang/tools/sotoc/test/lit.cfg

@@ -78,7 +78,7 @@ config.substitutions.append(('%sotoc-compile', \
     '%compiler %cflags %t.transformed.c -c -o %t.o'))
 config.substitutions.append(('%compile-for-target', \
     '%compiler -Xopenmp-target "--sotoc-path=%sotoc" \
-    -fopenmp -fopenmp-targets=aurora-nec-veort-unknown %s -o %t.o'))
+    -fopenmp -fopenmp-nec-compiler=ncc -fopenmp-targets=aurora-nec-veort-unknown %s -o %t.o'))
 config.substitutions.append(('%sotoc-library-compile',
     '%compiler -Xopenmp-target "--sotoc-path=%sotoc" -fopenmp \
      -fopenmp-targets=aurora-nec-veort-unknown -DIS_LIBRARY -shared \