Retire Polly's FindCUDA.cmake in favour of CMake's default FindCUDA.cmake script.

[singam-sanjay]

include/polly/Config/config.h.cmake

16

CUDALIB_FOUND didn't seem to be used anywhere in the source. So I changed just this instance of CUDALIB_FOUND.

For consistency, should I add OpenCL_FOUND ?

[philip.pfaffe]

Generally LGTM.

It troubles me a little that GPUJIT is not actually linked to the found libraries, though this might be beyond the scope of this patch.

I see that GPUJIT instead manually dlopens libcudart.so, however this could be a different library than the one found by cmake, and also just might not be in the LD_LIBRARY_PATH, or even might not exist.

@grosser: Can you maybe shed some light on why GPUJIT is built that way, instead of just normally linking against CUDA/OpenCL?

include/polly/Config/config.h.cmake

16

I think you might just remove this instead.

[grosser]

The idea is that binaries linked with libGPURuntime can run on systems where CUDA is not available by just falling back to CPU only mode. This is not yet fully implemented, but at least this is what we are shooting for.

[philip.pfaffe]

Okay, I see.

[philip.pfaffe]

@singam-sanjay Do you need someone to commit this for you?

[singam-sanjay]

Yes. It would be helpful if you could commit it.

CMakeLists.txt

if (POLLY_ENABLE_GPGPU_CODEGEN)
   FIND_PACKAGE(OpenCL)
   set(GPU_CODEGEN TRUE)
 else(POLLY_ENABLE_GPGPU_CODEGEN)
   set(GPU_CODEGEN FALSE)
 endif(POLLY_ENABLE_GPGPU_CODEGEN)
 
 
 # Support GPGPU code generation if the library is available.
-if (CUDALIB_FOUND)
+if (CUDA_FOUND)
   add_definitions(-DHAS_LIBCUDART)
-  INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} )
-endif(CUDALIB_FOUND)
+  INCLUDE_DIRECTORIES( ${CUDA_INCLUDE_DIRS} )
+endif(CUDA_FOUND)
 if (OpenCL_FOUND)
   add_definitions(-DHAS_LIBOPENCL)
   INCLUDE_DIRECTORIES( ${OpenCL_INCLUDE_DIR} )
 endif(OpenCL_FOUND)
 
 option(POLLY_BUNDLED_ISL "Use the bundled version of libisl included in Polly" ON)
 if (NOT POLLY_BUNDLED_ISL)
   find_package(ISL MODULE REQUIRED)

cmake/FindCUDA.cmake

-IF (NOT CUDA_HEADER_PREFIX)
-  SET(CUDA_HEADER_PREFIX "/usr/local/cuda/include")
-ENDIF (NOT CUDA_HEADER_PREFIX)
-
-FIND_PATH(CUDALIB_INCLUDE_DIR
-  NAMES cuda.h
-  PATHS ${CUDA_HEADER_PREFIX})
-
-FIND_LIBRARY(CUDALIB_LIBRARY NAMES cuda)
-
-IF (CUDALIB_INCLUDE_DIR)
-  SET(CUDALIB_FOUND TRUE)
-ENDIF (CUDALIB_INCLUDE_DIR)
-
-IF (CUDALIB_FOUND)
-  IF (NOT CUDA_FIND_QUIETLY)
-    MESSAGE(STATUS "Found CUDA: ${CUDALIB_INCLUDE_DIR}")
-  ENDIF (NOT CUDA_FIND_QUIETLY)
-ELSE (CUDALIB_FOUND)
-  IF (CUDA_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find CUDA")
-  ENDIF (CUDA_FIND_REQUIRED)
-ENDIF (CUDALIB_FOUND)

include/polly/Config/config.h.cmake

 //===- polly/Config.h ------------ Configuration of Polly -------*- C++ -*-===//
 //
 //                      The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Configuration of Polly.
 //
 //===----------------------------------------------------------------------===//
 #ifndef POLLY_CONFIG_H
 #define POLLY_CONFIG_H
 
-#cmakedefine CUDALIB_FOUND
+#cmakedefine CUDA_FOUND
 #cmakedefine GPU_CODEGEN
 
 #endif

tools/CMakeLists.txt

-if (CUDALIB_FOUND OR OpenCL_FOUND)
+if (CUDA_FOUND OR OpenCL_FOUND)
   add_subdirectory(GPURuntime)
-endif (CUDALIB_FOUND OR OpenCL_FOUND)
+endif (CUDA_FOUND OR OpenCL_FOUND)
 
 set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)