[test-suite] Support Fortran tests in CMake infrastructure.

[naromero77]

Summary

In preparation for Flang compiler, add support for Fortran in CMake. Include a simple Fortran90 hello world test. Tested with GFortran.

[jdoerfert]

CMakeLists.txt

32

Aren't CMAKE variables by convention upper case only?

[Meinersbur]

CMakeLists.txt

9–13

Did you consider using enable_language? It supports an OPTIONAL flag for autodetect the presence of a Fortran compiler. (Not suggesting to use it, it might break buildbots that happen to have gfortran installed, and you will probably not want to run tests for a well-tested distribution provided compiler).

30

[Style] In other places in this file there is no space between if and (

31

There is probably a reason why the _COMPILER vars are marked as advanced, they cannot be changed after the initial configuration. I don't see a reason to make it non-advanced.

42

[not a change requirest] While good here for consistency with C/CXX, newer Cmake should use add_compile_definitions since _FLAGS is supposed to be controlled by the user, and TEST_SUITE_EXTRA_Fortran_FLAGS not be necessary.

197

[nit] unrelated whitespace change

SingleSource/UnitTests/Fortran/CMakeLists.txt

2

Isn't this redundant with what llvm_singlesource does anyway?

[Meinersbur]

CMakeLists.txt

32

Weirdly, cmake defines these as CMAKE_<Lang>_COMPILER, where <Lang> is Fortran, in Pascal case. Also see https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER.html and explcitly shown at https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_FLAGS.html.

[naromero77]

CMakeLists.txt

9–13

Yes, I looked into that, but the OPTIONAL flag does not work at the moment according to the CMake docs.

https://cmake.org/cmake/help/latest/command/enable_language.html

30

I will fix this.

31

Was this just a comment or where there any action you wanted me to to take?

Here I am just following a parallel constructions similar to the prior mark_as_advance(...).

32

As @Meinersbur notes, for some reason CMake uses Fortran instead of FORTRAN.

42

Thanks for the comments. I noted some other older CMake-isms but did not want to change to much in the first pass.

197

I will fix this.

SingleSource/UnitTests/Fortran/CMakeLists.txt

2

Good question and I didn't know the answer until after I did a little bit of experimentation.

Source is an input variable into llvm_singlesource(), without it the target is built in the wrong directory and CMake complains.

The structure of CMakeLists.txt is similar to what is done elsewhere in the testsuite:
https://github.com/llvm/llvm-test-suite/blob/master/SingleSource/UnitTests/C%2B%2B11/CMakeLists.txt#L4-L9

[naromero77]

CMakeLists.txt

9–13

I will make this change as well.

[Meinersbur]

CMakeLists.txt

31

OK, didn't notice this is also done for CMAKE_C_COMPILER, CMAKE_CXX_COMPILER. I don't this is good, but keeps the Fortran support consistent with C/CXX, like modifying _FLAGS.

SingleSource/UnitTests/Fortran/CMakeLists.txt

2

There's something wrong if this is not working without defining Source. See cmake/modules/SingleMultiSource.cmake:

if(DEFINED Source)
  set(sources ${Source})
else()
  file(GLOB sources *.c *.cpp *.cc *.f *.F *.f90 *.F90)
endif()

i.e. if Source is undefined, it does the file search by itself. Defining Source should only be necessary if there are additional source files that should not be compiled. I don't know why SingleSource/UnitTests/C++11 does it this way. The majority of other programs rely on that it does work.

[naromero77]

• Use CMake enable_language instead.
• Fix style on conditionals.
• Cleaner implementation of Fortran unit test example.

[naromero77]

SingleSource/UnitTests/Fortran/CMakeLists.txt

2

Thanks for pushing on this.

The problem was that Fortran tests came at the end of the CMakeLists.txt file, so unbeknownst to me this line in the parent CMakeLIsts.txt file was interfering:
https://github.com/llvm/llvm-test-suite/blob/master/SingleSource/UnitTests/CMakeLists.txt#L15

I just moved up the Fortran test to be enabled before this line.

[Meinersbur]

LGTM.

I expected more changes to be necessary, to make it work with litsupport modules, perf/timeit, statistics, compile time (Interestingly, CMAKE_Fortran_COMPILE_OBJECT is already defined), LNT, ... . But if we find they don't work yet, we can fix that later.

[naromero77]

Committed as https://github.com/llvm/llvm-test-suite/commit/f6ee2f66b936e94f03abd687567d2f9c8feb2e71

CMakeLists.txt

 cmake_minimum_required(VERSION 3.4.3)
 
 include(CheckSymbolExists)
 
+option(TEST_SUITE_FORTRAN "Enable Fortran test suite" OFF)
+
 project(test-suite C CXX)
 
+if(TEST_SUITE_FORTRAN)
+  enable_language(Fortran)
+endif()
+
 function(append value)
   foreach(variable ${ARGN})
     set(${variable} "${${variable}} ${value}" PARENT_SCOPE)
   endforeach(variable)
 endfunction()
 
 # The test-suite is designed to be built in release mode anyway and
 # falls over unless -DNDEBUG is set.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "No build type selected, defaulting to Release")
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 endif()
 # Selecting installation directories or build types is untypical.
 mark_as_advanced(CMAKE_INSTALL_PREFIX CMAKE_BUILD_TYPE)
 # On the other hand we often want to switch compiler or cflags
 mark_as_advanced(CLEAR CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_LINKER
   CMAKE_C_FLAGS CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS)
+if(TEST_SUITE_FORTRAN)
+    mark_as_advanced(CLEAR CMAKE_Fortran_COMPILER)
+endif()
 
 # The files in cmake/caches often want to pass along additional flags to select
 # the target architecture. Note that you should still use
 # CMAKE_OSX_ARCHITECTURES and CMAKE_C_COMPILER_TARGET where possible.
 set(TEST_SUITE_ARCH_FLAGS CACHE STRING
    "Extra flags to select target architecture.")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_SUITE_ARCH_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_ARCH_FLAGS}")
+if(TEST_SUITE_FORTRAN)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${TEST_SUITE_ARCH_FLAGS}")
+endif()
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_ARCH_FLAGS}")
 
 set(LLVM_CODESIGNING_IDENTITY "" CACHE STRING
   "Sign executables and dylibs with the given identity or skip if empty (Darwin Only)")
 
 add_definitions(-DNDEBUG)
 option(TEST_SUITE_SUPPRESS_WARNINGS "Suppress all warnings" ON)
 if(${TEST_SUITE_SUPPRESS_WARNINGS})

 option(TEST_SUITE_PROFILE_USE
       "Add apropriate -fprofile-instr-use to CFLAGS/CXXFLAGS for each benchmark"
       OFF)
 
 # When running the test-suite in diagnosis mode, use these flags passed by
 # LNT to gather data, for examples -ftime-report, or -mllvm -stats. This way
 # the user specified CMAKE_C_FLAGS etc. need not be changed.
 set(TEST_SUITE_DIAGNOSE_FLAGS CACHE STRING
-   "Extra flags appended to CMAKE_C_FLAGS + CMAKE_CXX_FLAGS")
+   "Extra flags appended to CMAKE_C_FLAGS + CMAKE_CXX_FLAGS + CMAKE_Fortran_FLAGS")
 set(TEST_SUITE_DIAGNOSE_LINKER_FLAGS CACHE STRING
     "Extra flags appended to CMAKE_EXE_LINKER_FLAGS")
 mark_as_advanced(TEST_SUITE_DIAGNOSE_FLAGS TEST_SUITE_DIAGNOSE_LINKER_FLAGS)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_SUITE_DIAGNOSE_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_DIAGNOSE_FLAGS}")
+if(TEST_SUITE_FORTRAN)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${TEST_SUITE_DIAGNOSE_FLAGS}")
+endif()
+
 set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_DIAGNOSE_LINKER_FLAGS}")
 
 if (TESTSUITE_USE_LINKER)
     append("-fuse-ld=${TESTSUITE_USE_LINKER}"
     CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAG)
 endif()
 
 # Append extra flags. These extra flags are mainly meant for cache files that
 # want to apply flags that get not override even when the user manually
 # specifies CMAKE_C_FLAGS and similar.
 set(TEST_SUITE_EXTRA_C_FLAGS CACHE STRING "Extra flags for CMAKE_C_FLAGS")
 set(TEST_SUITE_EXTRA_CXX_FLAGS CACHE STRING "Extra flags for CMAKE_CXX_FLAGS")
+if(TEST_SUITE_FORTRAN)
+  set(TEST_SUITE_EXTRA_Fortran_FLAGS CACHE STRING "Extra flags for CMAKE_Fortran_FLAGS")
+endif()
+
 set(TEST_SUITE_EXTRA_EXE_LINKER_FLAGS CACHE STRING
     "Extra flags for CMAKE_EXE_LINKER_FLAGS")
 mark_as_advanced(TEST_SUITE_EXTRA_C_FLAGS, TEST_SUITE_EXTRA_CXX_FLAGS,
                  TEST_SUITE_EXTRA_EXE_LINKER_FLAGS)
+
+if(TEST_SUITE_FORTRAN)
+  mark_as_advanced(TEST_SUITE_EXTRA_Fortran_FLAGS TEST_SUITE_EXTRA_EXE_LINKER_FLAGS)
+endif()
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_SUITE_EXTRA_C_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_EXTRA_CXX_FLAGS}")
+if(TEST_SUITE_FORTRAN)
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${TEST_SUITE_EXTRA_Fortran_FLAGS}")
+endif()
+
 set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_EXTRA_EXE_LINKER_FLAGS}")
 
 # Use X/OPEN compatibility flag on AIX for C tests to avoid problems
 # with some versions of the system headers.
 if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700")
 endif()

SingleSource/UnitTests/CMakeLists.txt

 include(CheckCCompilerFlag)
 
 add_subdirectory(C++11)
 add_subdirectory(SignlessTypes)
 add_subdirectory(Threads)
 add_subdirectory(Vector)
 add_subdirectory(Vectorizer)
 # FIXME: Disable SJLJ tests for now, until EH edges are represented.
 # add_subdirectory(SetjmpLongjmp)
 if(TARGET_OS STREQUAL "Darwin")
   add_subdirectory(ObjC)
   add_subdirectory(ObjC++)
 endif()
 
+# Fortran
+if(TEST_SUITE_FORTRAN)
+  add_subdirectory(Fortran)
+endif()
+
 file(GLOB Source RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c *.cpp)
 if(TARGET_OS STREQUAL "AIX" AND ARCH STREQUAL "PowerPC" AND NOT PPC_IS_PPC64_ENABLED) 
   list(REMOVE_ITEM Source AtomicOps.c)
 endif()
 if(TARGET_OS STREQUAL "Darwin")
   list(REMOVE_ITEM Source 2007-04-25-weak.c)
   if(ARCH STREQUAL "PowerPC")
     list(REMOVE_ITEM Source AtomicOps.c)

SingleSource/UnitTests/Fortran/CMakeLists.txt

+llvm_singlesource()

SingleSource/UnitTests/Fortran/hello.f90

+program hello
+  print *, 'Hello world'
+end program hello

SingleSource/UnitTests/Fortran/hello.reference_output

+ Hello world
+exit 0

cmake/modules/SingleMultiSource.cmake

 
 # Configure the current directory as a SingleSource subdirectory - i.e. every
 # file in *.{c,cpp,cc} is treated as its own test.
 function(llvm_singlesource)
   cmake_parse_arguments(_LSARG "" "PREFIX" "" ${ARGN})
   if(DEFINED Source)
     set(sources ${Source})
   else()
-    file(GLOB sources *.c *.cpp *.cc)
+    file(GLOB sources *.c *.cpp *.cc *.f *.F *.f90 *.F90)
   endif()
   foreach(source ${sources})
     basename(name ${source})
     set(_target ${_LSARG_PREFIX}${name})
     llvm_test_executable_no_test(${_target} ${source})
     set_property(TARGET ${_target} PROPERTY TEST_NAME ${name})
     llvm_test_traditional(${_target})
     llvm_add_test_for_target(${_target})
   endforeach()
 endfunction()
 
 # Configure the current directory as a MultiSource subdirectory - i.e. there is
 # one test and it consists of all sources in the directory (or a curated list,
 # if Source is defined).
 function(llvm_multisource target)
   set(sources ${ARGN})
   if(NOT sources)
-    file(GLOB sources *.c *.cpp *.cc)
+    file(GLOB sources *.c *.cpp *.cc *.f *.F *.f90 *.F90)
   endif()
 
   llvm_test_executable_no_test(${target} ${sources})
   llvm_test_traditional(${target})
   llvm_add_test_for_target(${target})
 endfunction()
 
 macro(llvm_test_verify_hash_program_output _file)