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

[naromero77]

Is someone available to review this patch?

[Meinersbur]

External/SPEC/CFP2017rate/507.cactuBSSN_r/CMakeLists.txt

13–48

I would like to suggest a different approach:

add_definitions($<$<COMPILE_LANGUAGE:Fortran>:FCODE>)
add_definitions($<$<COMPILE_LANGUAGE:C>:CCODE>)
add_definitions($<$<COMPILE_LANGUAGE:CXX>:CCODE CCTK_DISABLE_RESTRICT=1>)

set_property(TARGET ${PROG} PROPERTY C_STANDARD 11)

or

set(CMAKE_C_STANDARD 11)

(the last one sets the default for all upcoming targets; however, it is also a global variable but should only be changed within this add_subdirectory scope -- I think). At least the -std=c99 flag is something the cmake should determine.

[Meinersbur]

External/SPEC/CFP2017rate/507.cactuBSSN_r/CMakeLists.txt

13–48

add_compile_definitions should be preferred over add_definitions

[naromero77]

• Use cleaner and more modern CMake.

[naromero77]

With respect to origin/main.

[Meinersbur]

LGTM

External/SPEC/CFP2017rate/507.cactuBSSN_r/CMakeLists.txt

51–53

test-suite style usually defines compilation/linking options before adding the target (e.g. by setting LDFALGS, CFLAGS, CXXCLAGS), add_compile_definitions would be more consistent than target_compile_definitions.

But I also don't think its important.

[naromero77]

External/SPEC/CFP2017rate/507.cactuBSSN_r/CMakeLists.txt

51–53

At first I tried using add_compile_definitions, but the the generator expression was not being expanded correctly. It was being partially merged with the absolute path to the object file. I spent several hours trying to debug this but had no success:

I then found this recommendation:
https://stackoverflow.com/questions/55536140/defining-preprocessor-in-modern-cmake

and went with target_compile_definitions instead.

[Meinersbur]

I see. Maybe it's worth reporting as a cmake bug?

External/SPEC/CFP2017rate/507.cactuBSSN_r/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/507.cactuBSSN_r.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(RATE)
+
+speccpu2017_add_include_dirs(
+  include
+)
+
+# Preprocessing and compiler flags depend on programming language type.
+# Create variables for each programming language based on file extension.
+file(GLOB_RECURSE FORTRAN_SRC_FILES  ${SRC_DIR}/*.f90)
+file(GLOB_RECURSE C_SRC_FILES ${SRC_DIR}/*.c)
+file(GLOB_RECURSE CPP_SRC_FILES ${SRC_DIR}/*.cc)
+
+# Important to APPEND instead of using CMake's set_source_files_properties
+# which only supports REPLACE. There are flags set in SpecCPU2017.cmake that need to
+# be propagated.
+set_property(
+  SOURCE ${FORTRAN_SRC_FILES}
+  APPEND
+  PROPERTY COMPILE_DEFINITIONS
+  "FCODE"
+)
+
+set_property(
+  SOURCE ${C_SRC_FILES}
+  APPEND
+  PROPERTY COMPILE_DEFINITIONS
+  "CCODE"
+)
+
+set_property(
+  SOURCE ${CPP_SRC_FILES}
+  APPEND
+  PROPERTY COMPILE_DEFINITIONS
+  "CCODE;CCTK_DISABLE_RESTRICT=1"
+)
+
+set_property(
+  SOURCE ${C_SRC_FILES}
+  APPEND
+  PROPERTY COMPILE_FLAGS
+  "-std=c99"
+  )
+
+## test ########################################################################
+
+speccpu2017_run_test(
+  spec_test.par
+  WORKDIR input
+  STDOUT spec_test.out
+  RUN_TYPE test
+)
+
+
+## train #######################################################################
+
+speccpu2017_run_test(
+  spec_train.par
+  WORKDIR input
+  STDOUT spec_train.out
+  RUN_TYPE train
+)
+
+## ref #########################################################################
+
+speccpu2017_run_test(
+  spec_ref.par
+  WORKDIR input
+  STDOUT spec_ref.out
+  RUN_TYPE ref
+)
+
+################################################################################
+
+speccpu2017_verify_output(ABSOLUTE_TOLERANCE 0.0000000000005)
+speccpu2017_add_executable()
+
+

External/SPEC/CFP2017rate/CMakeLists.txt

 if (TEST_SUITE_FORTRAN)
   add_subdirectory(503.bwaves_r)    # Fortran
-  #add_subdirectory(507.cactuBSSN_r) # C++, C, 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
 #add_subdirectory(549.fotonik3d_r) # Fortran
 #add_subdirectory(554.roms_r)      # Fortran
 
 add_subdirectory(997.specrand_fr)  # C

External/SPEC/CFP2017speed/607.cactuBSSN_s/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/607.cactuBSSN_s.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(SPEED ORIGIN 507.cactuBSSN_r)
+
+speccpu2017_inherit(../../CFP2017rate/507.cactuBSSN_r)

External/SPEC/CFP2017speed/CMakeLists.txt

 if (TEST_SUITE_FORTRAN)
   add_subdirectory(603.bwaves_s)    # Fortran
-  #add_subdirectory(607.cactuBSSN_s) # C++, C, 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
 #add_subdirectory(649.fotonik3d_s) # Fortran
 #add_subdirectory(654.roms_s)      # Fortran
 
 add_subdirectory(996.specrand_fs)  # C