Unverified Commit 29c278e7 authored by Pat McCormick's avatar Pat McCormick Committed by GitHub
Browse files

Merge pull request #29 from lanl/realm_10.x

Realm 10.x -- pulling the trigger so we can wrap up the milestone. 
parents 9159ef7f d0f6926b
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
@@ -86,4 +86,31 @@
/* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */
#cmakedefine01 CLANG_SPAWN_CC1

/* ===== kitsune-centric settings  */
#cmakedefine01 KITSUNE_ENABLE_KOKKOS 
#define KITSUNE_KOKKOS_INCLUDE_DIR       "${KOKKOS_INCLUDE_DIR}"
#define KITSUNE_KOKKOS_LIBRARY_DIR       "${KOKKOS_LIBRARY_DIR}"
#define KITSUNE_KOKKOS_LINK_LIBS         "${KOKKOS_LINK_LIBS}"

#cmakedefine01 KITSUNE_ENABLE_CILKRTS 
#define KITSUNE_CILKRTS_LIBRARY_DIR      "${CILKRTS_LIBRARY_DIR}"
#define KITSUNE_CILKRTS_LINK_LIBS        "${CILKRTS_LINK_LIBS}"

#cmakedefine01 KITSUNE_ENABLE_QTHREADS   
#define KITSUNE_QTHREADS_LIBRARY_DIR     "${QTHREADS_LIBRARY_DIR}"
#define KITSUNE_QTHREADS_LINK_LIBS       "${QTHREADS_LINK_LIBS}"

#cmakedefine01 KITSUNE_ENABLE_REALM
#define KITSUNE_REALM_LIBRARY_DIR          "${REALM_LIBRARY_DIR}"
#define KITSUNE_REALM_WRAPPER_LIBRARY_DIR  "${REALM_WRAPPER_LIBRARY_DIR}"
#define KITSUNE_REALM_LINK_LIBS            "${REALM_LINK_LIBS}"

#cmakedefine01 KITSUNE_ENABLE_OPENMP
#define KITSUNE_OPENMP_LIBRARY_DIR        "${OPENMP_LIBRARY_DIR}"
#define KITSUNE_OPENMP_LINK_LIBS          "${OPENMP_LINK_LIBS}"

#cmakedefine01 KITSUNE_ENABLE_CUDA
#define KITSUNE_CUDA_LIBRARY_DIR         "${CUDA_LIBRARY_DIR}"
#define KITSUNE_CUDA_LINK_LIBS           "${CUDA_LINK_LIBS}"

#endif
+1 −0
Original line number Diff line number Diff line
@@ -1466,6 +1466,7 @@ def fretain_comments_from_system_headers : Flag<["-"], "fretain-comments-from-sy
def ftapir_EQ : Joined<["-"], "ftapir=">, Group<f_Group>, Flags<[CC1Option]>,
  HelpText<"Choose the backend parallel runtime for Tapir instructions">,
  Values<"none,serial,cilk,cilkr,cheetah,cuda,kitcuda,opencilk,openmp,qthreads,realm,opencl">;

def fcilkplus : Flag<["-"], "fcilkplus">, Group<f_Group>, Flags<[CC1Option]>,
  HelpText<"Enable Cilk Plus extensions">;
def fopencilk : Flag<["-"], "fopencilk">, Group<f_Group>, Flags<[CC1Option]>,
+5 −2
Original line number Diff line number Diff line
@@ -1189,9 +1189,11 @@ void ToolChain::AddTapirRuntimeLibArgs(const ArgList &Args,
      } else {
        CmdArgs.push_back("-rpath=" OPENCILKRTS_LIBRARY_DIR);
      }
      if (getDriver().CCCIsCXX())
        CmdArgs.push_back("-lopencilk-personality-cpp");
      else
        CmdArgs.push_back("-lopencilk-personality-c");
      ExtractArgsFromString(OPENCILKRTS_EXTRA_LINK_LIBS, CmdArgs, Args);
      // This was done above...
      //CmdArgs.push_back("-lopencilk");
    } else {
      // FIXME: we should hard error here if cilkrts support was not built-in.
      getDriver().Diag(diag::warn_cilkrts_missing_build_params);
@@ -1260,6 +1262,7 @@ void ToolChain::AddTapirRuntimeLibArgs(const ArgList &Args,
      } else {
        CmdArgs.push_back("-rpath=" REALM_LIBRARY_DIR);
      }
      CmdArgs.push_back("-lkitsunerealm");
      CmdArgs.push_back("-lrealm");
      ExtractArgsFromString(REALM_EXTRA_LINK_LIBS, CmdArgs, Args);
    } else {
+4 −0
Original line number Diff line number Diff line
@@ -2808,6 +2808,10 @@ void DarwinClang::AddLinkTapirRuntime(const ArgList &Args,
  case TapirTargetID::Qthreads:
    CmdArgs.push_back("-lqthread");
    break;
  case TapirTargetID::Realm:
    CmdArgs.push_back("-lrealm");
    CmdArgs.push_back("-lkitsunerealm");
    break;
  default:
    break;
  }
+4 −0
Original line number Diff line number Diff line
@@ -543,6 +543,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
        CmdArgs.push_back("-lnuma");
        CmdArgs.push_back("-lpthread");
      }
      else if (Name == "realm"){
	CmdArgs.push_back("-lrealm");
	CmdArgs.push_back("-lkitsunerealm");
      }
    }
  }

Loading