Commit 192d50f2 authored by Patrick McCormick's avatar Patrick McCormick
Browse files

Some clean up to remove the cudakit target (towards unification across 

the toolchain between tapir, kitsune, opencilk, etc.).

New cuba abi runtime target code to simplify code gen -- needs to
merge design ideas with George's current multi-architecture approach.
parent 75c8b9fb

clang/include/clang/Basic/DiagnosticDriverKinds.td

+3 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ def warn_drv_qthreads_target_disabled: Warning< 
  "the qthreads runtime ABI transform target was not enabled when clang was built.">;

def warn_drv_realm_target_disabled: Warning<

  "the realm runtime ABI transform target was not enabled when clang was built.">;

def warn_drv_cudatk_target_disabled: Warning<

def warn_drv_cuda_tapir_target_disabled: Warning<

  "the cuda toolkit runtime ABI transform target was not enabled when clang was built.">;

def warn_drv_hip_target_disabled: Warning<

  "the hip runtime ABI transform target was not enabled when clang was built.">;

clang/include/clang/Config/kitsune.h.cmake

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
/* Note: The OpenCilk target is (now) always enabled */

#cmakedefine01 KITSUNE_ENABLE_OPENMP_TARGET

#cmakedefine01 KITSUNE_ENABLE_QTHREADS_TARGET

#cmakedefine01 KITSUNE_ENABLE_CUDATK_TARGET

#cmakedefine01 KITSUNE_ENABLE_CUDA_TARGET

#cmakedefine01 KITSUNE_ENABLE_REALM_TARGET

#cmakedefine01 KITSUNE_ENABLE_OPENCL_TARGET

#cmakedefine01 KITSUNE_ENABLE_HIP_TARGET

clang/include/clang/Driver/Options.td

+8 −8
Original line number Diff line number Diff line
@@ -1467,7 +1467,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">;

  Values<"none,serial,cilk,cilkr,cheetah,cuda,opencilk,openmp,qthreads,realm,opencl">;



def fcilkplus : Flag<["-"], "fcilkplus">, Group<f_Group>, Flags<[CC1Option]>,

  HelpText<"Enable Cilk Plus extensions">;

clang/kitsune/CMakeLists.txt

+9 −9
Original line number Diff line number Diff line
@@ -135,25 +135,25 @@ if (KITSUNE_ENABLE_REALM_TARGET) 
      ${LLVM_BINARY_DIR}/share/kitsune/${TAPIR_REALM_TARGET_CFG_FILENAME})

endif()



option(KITSUNE_ENABLE_CUDATK_TARGET

option(KITSUNE_ENABLE_CUDA_TARGET

    "Enable the Kitsune+Tapir CUDA Toolkit target and codegen library." OFF)

if (KITSUNE_ENABLE_CUDATK_TARGET)

if (KITSUNE_ENABLE_CUDA_TARGET)

  find_package(CUDAToolkit 10...11 REQUIRED)  # We may need to be a bit more specifc on minor versions here.

  set(TAPIR_CUDATK_TARGET_CFG_FILENAME

      "cudatk.cfg"

  set(TAPIR_CUDA_TARGET_CFG_FILENAME

      "cuda.cfg"

      CACHE

      STRING "Default CUDA Toolkit runtime ABI target Clang .cfg filename.")

  set(KITSUNE_CUDATK_TARGET_EXTRA_LINK_FLAGS

  set(KITSUNE_CUDA_TARGET_EXTRA_LINK_FLAGS

      ""

      CACHE

      STRING "Additional link flags needed for the CUDA Toolkit runtime ABI target.")

  set(KITSUNE_CUDATK_TARGET_LINK_LIBS_FLAGS

  set(KITSUNE_CUDA_TARGET_LINK_LIBS_FLAGS

      "-L${CUDAToolkit_LIBRARY_DIR} -lcudart"

      CACHE

      STRING "Link library flags (-L, -lxxx) needed for the CUDA Toolkit runtime ABI target.")

  #

  configure_file(${CLANG_SOURCE_DIR}/kitsune/cudatk.cfg.in

      ${LLVM_BINARY_DIR}/share/kitsune/${TAPIR_CUDATK_TARGET_CFG_FILENAME})

      ${LLVM_BINARY_DIR}/share/kitsune/${TAPIR_CUDA_TARGET_CFG_FILENAME})

endif()



# TODO: This needs to be connected to reality... --PM

clang/kitsune/cuda.cfg.in

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Flags for the CUDA runtime ABI target.

${KITSUNE_CUDA_TARGET_EXTRA_LINK_FLAGS} ${KITSUNE_CUDA_TARGET_LINK_LIBS_FLAGS}