moved clang-hipify tests to common folder "tests", updated cmake files to use downloadable clang+llvm binary package

CMakeLists.txt

@@ -5,7 +5,6 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-set(HIPIFY_STANDLONE 1)
 add_subdirectory(clang-hipify)
 
 if(NOT DEFINED HCC_HOME)

clang-hipify/CMakeLists.txt

@@ -1,32 +1,22 @@
-if(${HIPIFY_STANDLONE})
-  cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.8)
   
-  project(hipify)
+project(hipify-clang)
 
-  find_package(LLVM REQUIRED PATHS ${LLVM_DIR} NO_DEFAULT_PATH)
+find_package(LLVM 3.8 REQUIRED PATHS ${LLVM_DIR} NO_DEFAULT_PATH)
 
-  list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR})
-  include(AddLLVM)
+list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR})
+include(AddLLVM)
 
-  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-
-  include_directories(${LLVM_INCLUDE_DIRS})
-  link_directories(${LLVM_LIBRARY_DIRS})
-  add_definitions(${LLVM_DEFINITIONS})
-  add_llvm_executable(hipify src/Cuda2Hip.cpp )
-  find_program(LIT_COMMAND lit)
-else()
-  set(LLVM_LINK_COMPONENTS
-    Option
-    Support
-  )
-  add_clang_executable(hipify src/Cuda2Hip.cpp)
-endif()
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 
+include_directories(${LLVM_INCLUDE_DIRS})
+link_directories(${LLVM_LIBRARY_DIRS})
+add_definitions(${LLVM_DEFINITIONS})
+add_llvm_executable(hipify-clang src/Cuda2Hip.cpp )
+find_program(LIT_COMMAND lit)
 
 # Link against LLVM and CLANG tools libraries
-target_link_libraries(hipify
+target_link_libraries(hipify-clang
   clangASTMatchers
   clangFrontend
   clangTooling
@@ -49,14 +39,36 @@ target_link_libraries(hipify
   LLVMOption
   LLVMCore)
 
-if(${HIPIFY_STANDLONE})
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pthread -fno-rtti -fvisibility-inlines-hidden")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}\\\"")
-  add_subdirectory(test)
-else()
-  install(TARGETS hipify
-          RUNTIME DESTINATION bin
-          COMPONENT clang-extras)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread -fno-rtti -fvisibility-inlines-hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}\\\"")
+
+install(TARGETS hipify-clang
+        DESTINATION bin)
+
+# tests
+set(Python_ADDITIONAL_VERSIONS 2.7)
+include(FindPythonInterp)
+if( NOT PYTHONINTERP_FOUND )
+  message(FATAL_ERROR
+          "Unable to find Python interpreter, required for builds and testing\n\n"
+          "Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
 endif()
+
+set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}  )
+
+configure_file(
+  ${CMAKE_SOURCE_DIR}/tests/clang-hipify/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/tests/clang-hipify/lit.site.cfg
+  @ONLY)
+
+add_lit_testsuite(test-hipify "Running HIPify regression tests"
+  ${CMAKE_SOURCE_DIR}/tests/clang-hipify
+  PARAMS site_config=${CMAKE_CURRENT_BINARY_DIR}/tests/clang-hipify/lit.site.cfg
+  DEPENDS hipify-clang lit
+  )
+
+add_custom_target(test-clang-hipify)
+add_dependencies(test-clang-hipify test-hipify)
+set_target_properties(test-clang-hipify PROPERTIES FOLDER "Tests")

clang-hipify/test/CMakeLists.txt

@@ -1,27 +0,0 @@
-set(Python_ADDITIONAL_VERSIONS 2.7)
-include(FindPythonInterp)
-if( NOT PYTHONINTERP_FOUND )
-  message(FATAL_ERROR
-          "Unable to find Python interpreter, required for builds and testing\n\n"
-          "Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
-endif()
-
-set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/..  )
-
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-  @ONLY)
-
-add_lit_testsuite(check-hipify "Running HIPify regression tests"
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PARAMS site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-  DEPENDS hipify lit
-  )
-
-add_custom_target(check)
-add_dependencies(check check-hipify)
-add_custom_target(test)
-add_dependencies(test check-hipify)
-set_target_properties(check PROPERTIES FOLDER "Tests")
-

tests/clang-hipify/lit.cfg

@@ -44,5 +44,5 @@ if obj_root is not None:
     path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
     config.environment['PATH'] = path
 
-config.substitutions.append(("hipify", obj_root+"/hipify"))
+config.substitutions.append(("hipify", obj_root+"/hipify-clang"))