[Polly] Fix CMake build for Visual Studio

[Meinersbur]

Summary

Adapt the CMake build for Visual Studio 2015 RC. Set the Visual Studio specific build flags to compile without RTTI and without exceptions.

Put all Polly targets into a single "Polly" category (i.e. solution folder). Previously there was no recognizable scheme and most categories contained just one or two targets or didn't belong to any category.

Remove the polly_headers_do_not_build project. Visual Studio is capable of finding the headers itself, although they are not listed explicitly. For explicit listing, the headers should be added to the relevant target.

Query the isl_config.h macros recently added to ISL. One of it looks for the ffs (find first set), whose functionality is available in Visual Studio with _BitScanForward. Also add isl_ffs.c to the source files which contains the implementation of ffs using _BitScanForward. Also add a test for stdint.h as ISL's configure does.

Remove the /Za flag. According to Stephan T. Lavavej it is broken. See Clang devel mailing list.

Remove gitconfig.h.cmake. It is just one line which can be better generate in the CMakeLists.txt itself, just as ISL's configure does.

To successfully compile with Visual Studio 2015 RC, a one-line patch must be integrated into ISL. This will be done as soon it is available in its public repository.

[grosser]

Nice.

If it is not too much work, I would probably commit the unrelated commits independently. This will make bisecting easier in case one of these changes
causes a bug that is found only later on. Also, it makes the changes easier to
understand.

[Meinersbur]

Committed as r242771, r242772, r242773, r242775, r242776, r242777 and r242779

CMakeLists.txt

 
 include("polly_macros")
 
 # Add appropriate flags for GCC
 if (CMAKE_COMPILER_IS_GNUCXX)
   # FIXME: Turn off exceptions, RTTI:
   # -fno-exceptions -fno-rtti
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
-endif ()
-
+elseif (MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+  add_definitions("-D_HAS_EXCEPTIONS=0")
+else ()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
+endif ()
 
 # Define the FLAGS for the compilation of isl and imath
 #
 # Those are the only C files we have in the repository. Hence, we can just use
 # the CFLAGS to identify them.
 #
 # We first set the visibility of all isl functions to hidden to ensure we do
 # not clash with other isl versions that got linked into a program that uses
install(DIRECTORY ${POLLY_BINARY_DIR}/include/
   FILES_MATCHING
   PATTERN "*.h"
   PATTERN "CMakeFiles" EXCLUDE
   PATTERN ".svn" EXCLUDE
   )
 
 add_definitions( -D_GNU_SOURCE )
 
-add_subdirectory(include)
 add_subdirectory(lib)
 add_subdirectory(test)
 add_subdirectory(tools)
 # TODO: docs.
 
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/polly/Config/config.h.cmake
                 ${POLLY_BINARY_DIR}/include/polly/Config/config.h )
 
 # Add target to check formatting of polly files
 file( GLOB_RECURSE files *.h *.cpp)
 file( GLOB_RECURSE jsonfiles lib/JSON/*.h lib/JSON/*.cpp)
 file( GLOB_RECURSE islfiles lib/External/isl/*.h lib/External/isl/*.c
                    lib/External/isl/include/isl/*.h lib/External/isl/imath/*.h
                    lib/External/isl/imath/*.c)
 list( REMOVE_ITEM files ${jsonfiles} ${islfiles})
 add_custom_command( OUTPUT formatting COMMAND
   CLANG_FORMAT=${LLVM_BINARY_DIR}/bin/clang-format
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/check_format.sh ${files})
 add_custom_target(polly-check-format DEPENDS formatting)
+set_target_properties(polly-check-format PROPERTIES FOLDER "Polly")
 add_custom_command( OUTPUT formatting-update COMMAND
   CLANG_FORMAT=${LLVM_BINARY_DIR}/bin/clang-format
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_format.sh ${files})
 add_custom_target(polly-update-format DEPENDS formatting-update)
+set_target_properties(polly-update-format PROPERTIES FOLDER "Polly")
 
 # Set the variable POLLY_LINK_LIBS in the llvm/tools/ dir.
 set(POLLY_LINK_LIBS ${POLLY_LINK_LIBS} PARENT_SCOPE)

cmake/polly_macros.cmake

macro(add_polly_library name)
   if (MODULE)
     set(libkind MODULE)
   elseif (SHARED_LIBRARY)
     set(libkind SHARED)
   else()
     set(libkind)
   endif()
   add_library( ${name} ${libkind} ${srcs} )
+  set_target_properties(${name} PROPERTIES FOLDER "Polly")
   if( LLVM_COMMON_DEPENDS )
     add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
   endif( LLVM_COMMON_DEPENDS )
   if( LLVM_USED_LIBS )
     foreach(lib ${LLVM_USED_LIBS})
       target_link_libraries( ${name} ${lib} )
     endforeach(lib)
   endif( LLVM_USED_LIBS )
 
   if(POLLY_LINK_LIBS)
     foreach(lib ${POLLY_LINK_LIBS})
       target_link_libraries(${name} ${lib})
     endforeach(lib)
   endif(POLLY_LINK_LIBS)
 
   if( LLVM_LINK_COMPONENTS )
     llvm_config(${name} ${LLVM_LINK_COMPONENTS})
   endif( LLVM_LINK_COMPONENTS )
   if(MSVC)
     get_target_property(cflag ${name} COMPILE_FLAGS)
-    if(NOT cflag)
-      set(cflag "")
-    endif(NOT cflag)
-    set(cflag "${cflag} /Za")
+    if(cflag)
       set_target_properties(${name} PROPERTIES COMPILE_FLAGS ${cflag})
+    endif()
   endif(MSVC)
   install(TARGETS ${name}
     EXPORT LLVMExports
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
 endmacro(add_polly_library)
 
 macro(add_polly_loadable_module name)
   set(srcs ${ARGN})
   # klduge: pass different values for MODULE with multiple targets in same dir
   # this allows building shared-lib and module in same dir
   # there must be a cleaner way to achieve this....
   if (MODULE)
   else()
     set(GLOBAL_NOT_MODULE TRUE)
   endif()
   set(MODULE TRUE)
   add_polly_library(${name} ${srcs})
+  set_target_properties(${name} PROPERTIES FOLDER "Polly")
   if (GLOBAL_NOT_MODULE)
     unset (MODULE)
   endif()
   if (APPLE)
     # Darwin-specific linker flags for loadable modules.
     set_target_properties(${name} PROPERTIES
       LINK_FLAGS "-Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
   endif()

include/CMakeLists.txt

-add_subdirectory(polly)

include/polly/CMakeLists.txt

-if( MSVC_IDE OR XCODE )
-  # Creates a dummy target containing all headers for the benefit of
-  # Visual Studio users.
-  file(GLOB_RECURSE headers *.h)
-  add_library(polly_headers_do_not_build EXCLUDE_FROM_ALL
-    # We need at least one source file:
-    ${POLLY_SOURCE_DIR}/lib/Support/GICHelper.cpp
-    ${headers})
-endif()

lib/CMakeLists.txt

if (EXISTS "${ISL_SOURCE_DIR}/GIT_HEAD_ID")
   file(READ "${ISL_SOURCE_DIR}/GIT_HEAD_ID" GIT_HEAD_ID)
   string(STRIP "${GIT_HEAD_ID}" GIT_HEAD_ID)
 elseif (EXISTS "${ISL_SOURCE_DIR}/gitversion.h")
   # The source directory is preconfigured
   file(READ "${ISL_SOURCE_DIR}/gitversion.h" GITVERSION_H)
   string(REGEX REPLACE ".*\\\"([^\\\"]*)\\\".*" "\\1" GIT_HEAD_ID "${GITVERSION_H}")
 elseif ()
   # Unknown revision
+  # TODO: We could look for a .git and get the revision from HEAD
   set(GIT_HEAD_ID "UNKNOWN")
 endif ()
 
 message(STATUS "ISL version: ${GIT_HEAD_ID}")
 
 # Enable small integer optimization and imath
 set(USE_GMP_FOR_MP OFF)
 set(USE_IMATH_FOR_MP ON)
 set(USE_SMALL_INT_OPT ON)
 
 # Determine compiler characteristics
 include(CheckCSourceCompiles)
 
+# Like check_c_source_compiles, but sets the result to either
+# 0 (error while compiling) or 1 (compiled successfully)
+# Required for compatibility with autotool's AC_CHECK_DECLS
+function (check_c_source_compiles_numeric _prog _var)
+  check_c_source_compiles("${_prog}" "${_var}")
+  if ("${${_var}}")
+    set("${_var}" 1 PARENT_SCOPE)
+  else ()
+    set("${_var}" 0 PARENT_SCOPE)
+  endif ()
+endfunction ()
+
+# Check for the existance of a type
+function (check_c_type_exists _type _files _variable)
+  set(_includes "")
+  foreach (file_name ${_files})
+     set(_includes "${_includes}#include<${file_name}>\n")
+  endforeach()
+  check_c_source_compiles("
+    ${_includes}
+    ${_type} typeVar;
+    int main() {
+        return 0;
+    }
+    " ${_variable})
+endfunction ()
+
+
 check_c_source_compiles("
   int func(void) __attribute__((__warn_unused_result__));
   int main() { return 0; }
   " HAS_ATTRIBUTE_WARN_UNUSED_RESULT)
 set(GCC_WARN_UNUSED_RESULT)
 if (HAS_ATTRIBUTE_WARN_UNUSED_RESULT)
   set(GCC_WARN_UNUSED_RESULT "__attribute__((__warn_unused_result__))")
 endif ()
 
 check_c_source_compiles("
+  static void foo(void) __attribute__ ((unused));
+  int main() { return 0; }
+  " HAVE___ATTRIBUTE__)
+
+
+check_c_source_compiles_numeric("
   #include <strings.h>
   int main() { ffs(0); return 0; }
   " HAVE_DECL_FFS)
-if (NOT HAVE_DECL_FFS)
-  set(HAVE_DECL_FFS 0)
-endif ()
 
-check_c_source_compiles("
+check_c_source_compiles_numeric("
   int main() { __builtin_ffs(0); return 0; }
   " HAVE_DECL___BUILTIN_FFS)
-if (NOT HAVE_DECL___BUILTIN_FFS)
-  set(HAVE_DECL___BUILTIN_FFS 0)
+
+check_c_source_compiles_numeric("
+  #include <intrin.h>
+  int main() { _BitScanForward(NULL, 0); return 0; }
+  " HAVE_DECL__BITSCANFORWARD)
+
+if (NOT HAVE_DECL_FFS AND
+    NOT HAVE_DECL___BUILTIN_FFS AND
+    NOT HAVE_DECL__BITSCANFORWARD)
+  message(FATAL_ERROR "No ffs implementation found")
 endif ()
 
-check_c_source_compiles("
-  static void foo(void) __attribute__ ((unused));
-  int main() { return 0; }
-  " HAVE___ATTRIBUTE__)
+
+check_c_source_compiles_numeric("
+  #include <strings.h>
+  int main() { strcasecmp(\"\", \"\"); return 0; }
+  " HAVE_DECL_STRCASECMP)
+
+check_c_source_compiles_numeric("
+  #include <string.h>
+  int main() { _stricmp(\"\", \"\"); return 0; }
+  " HAVE_DECL__STRICMP)
+
+if (NOT HAVE_DECL_STRCASECMP AND NOT HAVE_DECL__STRICMP)
+  message(FATAL_ERROR "No strcasecmp implementation found")
+endif ()
+
+
+check_c_source_compiles_numeric("
+  #include <strings.h>
+  int main() { strncasecmp(\"\", \"\", 0); return 0; }
+  " HAVE_DECL_STRNCASECMP)
+
+check_c_source_compiles_numeric("
+  #include <string.h>
+  int main() { _strnicmp(\"\", \"\", 0); return 0; }
+  " HAVE_DECL__STRNICMP)
+
+if (NOT HAVE_DECL_STRNCASECMP AND NOT HAVE_DECL__STRNICMP)
+  message(FATAL_ERROR "No strncasecmp implementation found")
+endif ()
+
+
+check_c_source_compiles_numeric("
+  #include <stdio.h>
+  int main() { snprintf((void*)0, 0, \"\"); return 0; }
+  " HAVE_DECL_SNPRINTF)
+
+check_c_source_compiles_numeric("
+  #include <stdio.h>
+  int main() { _snprintf((void*)0, 0, \"\"); return 0; }
+  " HAVE_DECL__SNPRINTF)
+
+if (NOT HAVE_DECL_SNPRINTF AND NOT HAVE_DECL__SNPRINTF)
+  message(FATAL_ERROR "No snprintf implementation found")
+endif ()
+
+
+check_c_type_exists(uint8_t "" HAVE_UINT8T)
+check_c_type_exists(uint8_t "stdint.h" HAVE_STDINT_H)
+check_c_type_exists(uint8_t "inttypes.h" HAVE_INTTYPES_H)
+check_c_type_exists(uint8_t "sys/types.h" HAVE_SYS_INTTYPES_H)
+if (HAVE_UINT8T)
+  set(INCLUDE_STDINT_H "")
+elseif (HAVE_STDINT_H)
+  set(INCLUDE_STDINT_H "#include <stdint.h>")
+elseif (HAVE_INTTYPES_H)
+  set(INCLUDE_STDINT_H "#include <inttypes.h>")
+elseif (HAVE_SYS_INTTYPES_H)
+  set(INCLUDE_STDINT_H "#include <sys/inttypes.h>")
+else ()
+  message(FATAL_ERROR "No stdint.h or compatible found")
+endif ()
 
 # Write configure result
-configure_file("External/gitversion.h.cmake" "${ISL_BINARY_DIR}/gitversion.h")
+# configure_file(... COPYONLY) avoids that the time stamp changes if the file is identical
+file(WRITE "${ISL_BINARY_DIR}/gitversion.h.tmp"
+     "#define GIT_HEAD_ID \"${GIT_HEAD_ID}\"")
+configure_file("${ISL_BINARY_DIR}/gitversion.h.tmp"
+               "${ISL_BINARY_DIR}/gitversion.h" COPYONLY)
+
+file(WRITE "${ISL_BINARY_DIR}/include/isl/stdint.h.tmp"
+     "${INCLUDE_STDINT_H}")
+configure_file("${ISL_BINARY_DIR}/include/isl/stdint.h.tmp"
+               "${ISL_BINARY_DIR}/include/isl/stdint.h" COPYONLY)
+
 configure_file("External/isl_config.h.cmake" "${ISL_BINARY_DIR}/isl_config.h")
-file(WRITE "${ISL_BINARY_DIR}/include/isl/stdint.h" "#include <stdint.h>")
+
 
 # ISL files to compile
 set (ISL_FILES
     External/isl/basis_reduction_tab.c
     External/isl/isl_aff.c
     External/isl/isl_affine_hull.c
     External/isl/isl_arg.c
     External/isl/isl_ast_build.c
set (ISL_FILES
     External/isl/isl_constraint.c
     External/isl/isl_convex_hull.c
     External/isl/isl_ctx.c
     External/isl/isl_deprecated.c
     External/isl/isl_dim_map.c
     External/isl/isl_equalities.c
     External/isl/isl_factorization.c
     External/isl/isl_farkas.c
+    External/isl/isl_ffs.c
     External/isl/isl_flow.c
     External/isl/isl_fold.c
     External/isl/isl_hash.c
     External/isl/isl_id.c
     External/isl/isl_id_to_ast_expr.c
     External/isl/isl_id_to_pw_aff.c
     External/isl/isl_ilp.c
     External/isl/isl_imath.c
if (BUILD_SHARED_LIBS)
   )
   link_directories(
     ${LLVM_LIBRARY_DIR}
   )
 endif()
 
 # Build a monolithic Polly.a and a thin module LLVMPolly.moduleext that links to
 # that static library.
+if (MSVC)
+  # Add dummy target, because loadable modules are not supported on Windows
+  add_custom_target(LLVMPolly)
+  set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly")
+else ()
   add_polly_loadable_module(LLVMPolly
     Polly.cpp
   )
 
-if (TARGET intrinsics_gen)
-  # Check if we are building as part of an LLVM build
-  add_dependencies(Polly intrinsics_gen)
-endif()
-
   target_link_libraries(LLVMPolly Polly)
 
   set_target_properties(LLVMPolly
     PROPERTIES
     LINKER_LANGUAGE CXX
     PREFIX "")
+endif ()
+
+if (TARGET intrinsics_gen)
+  # Check if we are building as part of an LLVM build
+  add_dependencies(Polly intrinsics_gen)
+endif()
+

lib/External/gitversion.h.cmake

-#define GIT_HEAD_ID "@GIT_HEAD_ID@"

lib/External/isl_config.h.cmake

+/* define if your compiler has __attribute__ */
+#cmakedefine HAVE___ATTRIBUTE__ /**/
 
-/* most gcc compilers know a function __attribute__((__warn_unused_result__))
-   */
+/* most gcc compilers know a function __attribute__((__warn_unused_result__)) */
 #define GCC_WARN_UNUSED_RESULT @GCC_WARN_UNUSED_RESULT@
 
+
 /* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
 #define HAVE_DECL_FFS @HAVE_DECL_FFS@
 
 /* Define to 1 if you have the declaration of `__builtin_ffs', and to 0 if you
    don't. */
 #define HAVE_DECL___BUILTIN_FFS @HAVE_DECL___BUILTIN_FFS@
 
-/* define if your compiler has __attribute__ */
-#cmakedefine HAVE___ATTRIBUTE__ /**/
+/* Define to 1 if you have the declaration of `_BitScanForward', and to 0 if
+   you don't. */
+#define HAVE_DECL__BITSCANFORWARD @HAVE_DECL__BITSCANFORWARD@
+
+
+/* Define to 1 if you have the declaration of `strcasecmp', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRCASECMP @HAVE_DECL_STRCASECMP@
+
+/* Define to 1 if you have the declaration of `_stricmp', and to 0 if you
+   don't. */
+#define HAVE_DECL__STRICMP @HAVE_DECL__STRICMP@
+
+
+/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNCASECMP @HAVE_DECL_STRNCASECMP@
+
+/* Define to 1 if you have the declaration of `_strnicmp', and to 0 if you
+   don't. */
+#define HAVE_DECL__STRNICMP @HAVE_DECL__STRNICMP@
+
+
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_SNPRINTF @HAVE_DECL_SNPRINTF@
+
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL__SNPRINTF @HAVE_DECL__SNPRINTF@
+
 
 /* use gmp to implement isl_int */
 #cmakedefine USE_GMP_FOR_MP
 
 /* use imath to implement isl_int */
 #cmakedefine USE_IMATH_FOR_MP
 
 /* Use small integer optimization */
 #cmakedefine USE_SMALL_INT_OPT
 
 #include <isl_config_post.h>

test/CMakeLists.txt

foreach(testdir ${POLLY_TEST_DIRECTORIES})
       add_custom_target(polly-test-${testdir}
         COMMAND ${LLVM_LIT}
                     --param polly_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
                     --param build_config=${CMAKE_CFG_INTDIR}
                     -sv ${POLLY_TEST_EXTRA_ARGS}
                     ${CMAKE_CURRENT_BINARY_DIR}/${testdir}
                     DEPENDS ${POLLY_TEST_DEPS}
                     COMMENT "Running Polly regression tests in ${testdir}")
+      set_target_properties(polly-test-${testdir} PROPERTIES FOLDER "Polly")
     endforeach()
 
     add_custom_target(check-polly
       COMMAND ${LLVM_LIT}
                   --param polly_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
                   --param build_config=${CMAKE_CFG_INTDIR}
                   -sv ${POLLY_TEST_EXTRA_ARGS}
                   ${CMAKE_CURRENT_BINARY_DIR}
                   DEPENDS ${POLLY_TEST_DEPS}
                   COMMENT "Running Polly regression tests")
+    set_target_properties(check-polly PROPERTIES FOLDER "Polly")
   endif()
 
 else (NOT DEFINED LLVM_MAIN_SRC_DIR)
 
   set(LLVM_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit)
   set(POLLY_TEST_DEPS llvm-config opt LLVMPolly FileCheck not)
 
   set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}")
   set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
   set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
   set(POLLY_LIB_DIR "${LLVM_LIBS_DIR}")
 
   add_lit_testsuite(check-polly "Running polly regression tests"
     ${CMAKE_CURRENT_BINARY_DIR}
     PARAMS polly_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
     DEPENDS ${POLLY_TEST_DEPS}
     )
 
-  set_target_properties(check-polly PROPERTIES FOLDER "polly tests")
+  set_target_properties(check-polly PROPERTIES FOLDER "Polly")
 
 endif (NOT DEFINED LLVM_MAIN_SRC_DIR)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 
 # Add a legacy target spelling: polly-test
 add_custom_target(polly-test)
+set_target_properties(polly-test PROPERTIES FOLDER "Polly")
 add_dependencies(polly-test check-polly)