[test-suite] SPEC2017 CPU ROMS floating point tests.

[naromero77]

Summary

• Helper macro for managing intermediate dependencies on Fortran modules.
• Add SPEC2017 CPU ROMS floating point tests.
• Emit warning message about using recent Ninja version.

[Meinersbur]

As far as I know, cmake detect module dependency itself, which would make speccpu2017_add_mod unnecessary.

I applied the patch locally and change the compilation part to just speccpu2017_add_executable() and it still compiles.

External/SPEC/CFP2017rate/554.roms_r/CMakeLists.txt

49

Leftover fotonik3d

370

Consider using target_link_libraries (https://cmake.org/cmake/help/latest/command/target_link_libraries.html#linking-object-libraries) for linking object libraries.

The tutorial uses generator expressions ($<TARGET_OBJECTS:${PROG}_Fortran_MOD_4>) which are missing here?

External/SPEC/SpecCPU2017.cmake

342 ↗

(On Diff #323880)

[typo] heirarchy

[naromero77]

In D96746#2566172, @Meinersbur wrote:

As far as I know, cmake detect module dependency itself, which would make speccpu2017_add_mod unnecessary.

It is not really clear from the CMake docs that it can figure out complex module dependencies without intermediary targets. Searching online, it looks like many Fortran-centric projects have come up with different solutions.

If the name of the macro is the issue, we can change it to something else besides speccpu2017_add_mod

I applied the patch locally and change the compilation part to just speccpu2017_add_executable() and it still compiles.

Does it work for you if you at make -j 10 or the equivalent with ninja? It is definitely failing to build for me when I increase the number of parallel builds due to missing .mod files.

[naromero77]

In D96746#2566172, @Meinersbur wrote:

As far as I know, cmake detect module dependency itself, which would make speccpu2017_add_mod unnecessary.

I applied the patch locally and change the compilation part to just speccpu2017_add_executable() and it still compiles.

External/SPEC/CFP2017rate/554.roms_r/CMakeLists.txt

370

Consider using target_link_libraries (https://cmake.org/cmake/help/latest/command/target_link_libraries.html#linking-object-libraries) for linking object libraries.

The downside is that we would have to bump the minimum CMake requirement to 3.12 and right now the minimum requirement is 3.4.3. I am concerned that it could break any buildbots out there using older CMake versions.

The tutorial uses generator expressions ($<TARGET_OBJECTS:${PROG}_Fortran_MOD_4>) which are missing here?

I think you are right. I should also change it for the other add_dependencies(..) statements.

[Meinersbur]

LLVM required cmake 3.13.4, I think we can bump the version for llvm-test-suite as well.

[naromero77]

• Run ROMS test out of run directory.
• Revert "Helper macro for managing intermediate dependencies on Fortran modules."
• Add warning about CMAKE_GENERATORS that are not Ninja.
• Fix comment to reflect ROMS test.
• Intermediate target dependencies are not needed when using Ninja.

[naromero77]

In D96746#2566974, @Meinersbur wrote:

LLVM required cmake 3.13.4, I think we can bump the version for llvm-test-suite as well.

I will submit a separate phabricator patch.

[Meinersbur]

Btw, I found the following at https://blog.kitware.com/fortran-for-cc-developers-made-easier-with-cmake/ (from 2012):

Building Fortran in the correct order

Fortran 90 supports a module system that allows Fortran to import and export modules from source files. This adds a huge complexity to the build problem as the Fortran code must be compiled in the correct order to ensure that module files are available for import after they have been exported, but before they are imported. To accomplish this, CMake contains a full Fortran parser. When CMake computes depend information at build time, it will parse all of the Fortran sources. The parser determines which files are producers and which files are the consumers, and then it uses that information to order the build. There is no user interaction with CMake in order to use this feature. It is only used with Makefile builds. The Intel VS Fortran IDE plugin handles this itself.

CMakeLists.txt

11

Some generators have spaces in their name ("UNIX Makefiles"), I recommend using quotes.

The syntax of STREQUAL is <variable|string> STREQUAL <variable|string>, so

if(NOT CMAKE_GENERATOR STREQUAL "Ninja")

should work too.

13–14

When I tried the "UNIX Makefile" generator, it did not even build sequentially.

Could you add that to the message that this is a warning about the Generator/-G switch? A user who does not know about what ninja is might be confused by this message.

[naromero77]

• Improved warning message for CMAKE_GENERATOR.

[Meinersbur]

LGTM

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)
+  if(NOT CMAKE_GENERATOR STREQUAL "Ninja")
+      message(WARNING
+  "Fortran test suite may NOT build with this CMAKE_GENERATOR = ${CMAKE_GENERATOR}.\n"
+  "Recommend using Ninja 1.10 or later by adding -G \"Ninja\" to cmake invocation.")
+  endif()
 endif()
 
 function(append value)
   foreach(variable ${ARGN})
     set(${variable} "${${variable}} ${value}" PARENT_SCOPE)
   endforeach(variable)
 endfunction()
 

External/SPEC/CFP2017rate/554.roms_r/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/554.roms_r.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(RATE)
+
+speccpu2017_add_include_dirs(.)
+
+# SPEC benchmark uses customized version of filepp, called specpp.
+# However, these additional filepp flags do not make any impact
+# to the benchmark results. This note serves a a reminder.
+# set(MODULE_SPECPP_DIR "${TEST_SUITE_SPEC2017_ROOT}/bin/modules.specpp")
+# add_definitions(-w -m literal-single.pm -m c-comment.pm)
+
+add_definitions(-DBENCHMARK -DNestedGrids=1 -DNO_GETTIMEOFDAY)
+  
+## test ########################################################################
+
+speccpu2017_run_test(
+  < ocean_benchmark0.in.x
+  STDOUT ocean_benchmark0.log
+  STDERR ocean_benchmark0.err
+  RUN_TYPE test
+)
+
+## train #######################################################################
+
+speccpu2017_run_test(
+  < ocean_benchmark1.in.x
+  STDOUT ocean_benchmark1.log
+  STDERR ocean_benchmark1.err  
+  RUN_TYPE train
+)
+
+## ref #########################################################################
+
+speccpu2017_run_test(
+  < ocean_benchmark2.in.x
+  STDOUT ocean_benchmark2.log
+  STDERR ocean_benchmark2.err
+  RUN_TYPE ref
+)
+
+################################################################################
+
+# ROMS has both relative and absolute tolerances
+speccpu2017_verify_output(RELATIVE_TOLERANCE 1.0e-7 ABSOLUTE_TOLERANCE 1.0e-7)
+
+speccpu2017_add_executable()
+
+speccpu2017_prepare_rundir()

External/SPEC/CFP2017rate/CMakeLists.txt

 if (TEST_SUITE_FORTRAN)
   add_subdirectory(503.bwaves_r)    # Fortran
   add_subdirectory(507.cactuBSSN_r) # C++, C, Fortran
 endif ()
 add_subdirectory(508.namd_r)       # C++
 add_subdirectory(510.parest_r)     # C++
 add_subdirectory(511.povray_r)     # C++, C
 add_subdirectory(519.lbm_r)        # C
 #add_subdirectory(521.wrf_r)       # Fortran, C
 add_subdirectory(526.blender_r)    # C++, C
 #add_subdirectory(527.cam4_r)      # Fortran, C
 add_subdirectory(538.imagick_r)    # C
 add_subdirectory(544.nab_r)        # C
 if (TEST_SUITE_FORTRAN)
   add_subdirectory(549.fotonik3d_r) # Fortran
-  #add_subdirectory(554.roms_r)     # Fortran
+  add_subdirectory(554.roms_r)      # Fortran
 endif ()
 
 add_subdirectory(997.specrand_fr)  # C

External/SPEC/CFP2017speed/654.roms_s/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/654.roms_s.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(SPEED ORIGIN 554.roms_r)
+
+speccpu2017_inherit(../../CFP2017rate/554.roms_r)

External/SPEC/CFP2017speed/CMakeLists.txt

 if (TEST_SUITE_FORTRAN)
   add_subdirectory(603.bwaves_s)    # Fortran
   add_subdirectory(607.cactuBSSN_s) # C++, C, Fortran
 endif ()
 add_subdirectory(619.lbm_s)        # C
 #add_subdirectory(621.wrf_s)       # Fortran, C
 #add_subdirectory(627.cam4_s)      # Fortran, C
 #add_subdirectory(628.pop2_s)      # Fortran, C
 add_subdirectory(638.imagick_s)    # C
 add_subdirectory(644.nab_s)        # C
 if (TEST_SUITE_FORTRAN)
   add_subdirectory(649.fotonik3d_s) # Fortran
-  #add_subdirectory(654.roms_s)     # Fortran
+  add_subdirectory(654.roms_s)      # Fortran
 endif ()
 
 add_subdirectory(996.specrand_fs)  # C