Commit 10d91924 authored by Patrick McCormick's avatar Patrick McCormick
Browse files

Added cilktools.

parent 4c4a22d0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


# External projects 

/cheetah 

/cilktools



#==============================================================================#

# Explicit files to ignore (only matches one).

kitsune/cmake/caches/kitsune-dev.cmake

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") 
# you are working on.  By default we provide the full suite of

# clang+tools, openmp, lld, and a debugger via lldb.

set(LLVM_ENABLE_PROJECTS

  clang;openmp;

  clang;openmp

  CACHE STRING "")



message(DEBUG "  --> KITSUNE-DEV - enabled LLVM projects: ${LLVM_ENABLE_PROJECTS}")
@@ -63,7 +63,7 @@ set(CLANG_CONFIG_FILE_USER_DIR "$ENV{HOME}/.kitsune" CACHE STRING "") 
 set(CUDA_HOST_COMPILER "/usr/bin/gcc-8" CACHE STRING "")

#endif()



set(_runtimes_list "cheetah")

set(_runtimes_list "cheetah;cilktools")



# Various helpful LLVM-level settings for development/debugging.

set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "")    # sometimes errors get lost in all the warnings...

kitsune/examples/kokkos/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ set(_example_srcs 


set(_example_view_srcs

  raytrace.cpp

  vecadd-views.cpp

  )



# Build the pure-kokkos serial target version of all the examples first.

llvm/projects/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ foreach(entry ${entries}) 
       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/parallel-libs) AND

       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/openmp) AND

       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests) AND

       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/cheetah))

       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/cheetah)

       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/cliktools))

      get_filename_component(entry_name "${entry}" NAME)

      add_llvm_external_project(${entry_name})

    endif()
@@ -30,6 +31,7 @@ if(${LLVM_BUILD_RUNTIME}) 
  if(NOT MSVC OR LLVM_FORCE_BUILD_RUNTIME)

    # Add the projects in reverse order of their dependencies so that the

    # dependent projects can see the target names of their dependencies.

    add_llvm_external_project(cilktools)

    add_llvm_external_project(cheetah)

    add_llvm_external_project(libunwind)

    add_llvm_external_project(pstl)

llvm/runtimes/CMakeLists.txt

+14 −1
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ FetchContent_Declare(cheetahrt 
  GIT_TAG           opencilk/v1.0

  SOURCE_DIR        ${CMAKE_CURRENT_SOURCE_DIR}/../../cheetah)



FetchContent_Declare(cilktools

  GIT_REPOSITORY   https://github.com/OpenCilk/productivity-tools.git

  GIT_TAG          opencilk/v1.0

  SOURCE_DIR       ${CMAKE_CURRENT_SOURCE_DIR}/../../cilktools)



# Find all subdirectories containing CMake projects

file(GLOB entries *)

foreach(entry ${entries})
@@ -26,7 +31,7 @@ foreach(entry ${entries}) 
endforeach()



# Side-by-side subprojects layout.

set(LLVM_ALL_RUNTIMES "libcxx;libcxxabi;libunwind;compiler-rt;cheetah;kitsune")

set(LLVM_ALL_RUNTIMES "libcxx;libcxxabi;libunwind;compiler-rt;cheetah;cilktools;kitsune")

set(LLVM_ENABLE_RUNTIMES "" CACHE STRING

  "Semicolon-separated list of runtimes to build (${LLVM_ALL_RUNTIMES}), or \"all\".")

if(LLVM_ENABLE_RUNTIMES STREQUAL "all" )
@@ -41,6 +46,14 @@ if ("cheetah" IN_LIST LLVM_ENABLE_RUNTIMES) 
  endif()

endif()



if ("cilktools" IN_LIST LLVM_ENABLE_RUNTIMES)

  FetchContent_GetProperties(cilktools)

  if (NOT cilktools_POPULATED)

    message(STATUS "NOTE: <<<< fetching cilktools source via git... >>>>")

    FetchContent_Populate(cilktools)

  endif()

endif()



foreach(proj ${LLVM_ENABLE_RUNTIMES})

  set(proj_dir "${CMAKE_CURRENT_SOURCE_DIR}/../../${proj}")

  if(IS_DIRECTORY ${proj_dir} AND EXISTS ${proj_dir}/CMakeLists.txt)