[test-suite] SPEC2017 CPU Exchange2 integer tests.

[naromero77]

Summary

Support compilation of Fortran source in SPEC2017 CMake macro. Add SPEC2017 CPU Exchange2 integer rate and speed tests.

[Meinersbur]

External/SPEC/CINT2017rate/CMakeLists.txt

8–14

[style] Missing indention

The other tests are sorted numerically and I would prefer to keep it that way (a directories listing usually is sorted that way as well)

External/SPEC/CINT2017speed/CMakeLists.txt

17

[style] missing indention

[naromero77]

• Restore numerical order of SPEC tests and fix style issues.

[naromero77]

I am not sure why

arc diff --update D{id}

included the first commit after master branch got renamed to main, i.e. this one
https://github.com/llvm/llvm-test-suite/commit/41bb38d9cabf9d711c513787fb07f058ee513e40

It was not present in my original patch. Once the patch gets approved, I will make sure it is not there when I do the commit.

[jdoerfert]

Looks OK to me, @Meinersbur can accept at some point.

CMakeLists.txt

237

This seems unrelated.

[Meinersbur]

LGTM

CMakeLists.txt

237

Looks like this is because the patch https://github.com/llvm/llvm-test-suite/commit/41bb38d9cabf9d711c513787fb07f058ee513e40 is included in this diff. Unfortunately, the master branch is not kept in sync with main.

[naromero77]

This comment was removed by naromero77.

CMakeLists.txt

else()
     set(TEST_SUITE_CXX_ABI_LIBNAME "supc++")
   endif()
 else()
   STRING(REGEX REPLACE "^lib" "" TEST_SUITE_CXX_ABI_LIBNAME ${TEST_SUITE_CXX_ABI})
 endif()
 
 include(TestSuite)
 include(SingleMultiSource)
-find_package(TCL)
-find_package(OpenMP)
 
 if(NOT DEFINED TARGET_OS)
   message(STATUS "Check target operating system - ${CMAKE_SYSTEM_NAME}")
   set(TARGET_OS ${CMAKE_SYSTEM_NAME})
 endif()
 if(NOT DEFINED ARCH)
   include(DetectArchitecture)
   detect_architecture(ARCH)

External/SPEC/CINT2017rate/548.exchange2_r/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/548.exchange2_r.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(RATE)
+
+## test ########################################################################
+
+speccpu2017_run_test(
+  0
+  RUN_TYPE test
+)
+
+## train #######################################################################
+
+speccpu2017_run_test(
+  1
+  RUN_TYPE train
+)
+
+## ref #########################################################################
+
+speccpu2017_run_test(
+  6
+  RUN_TYPE ref
+)
+
+################################################################################
+
+speccpu2017_verify_output()
+speccpu2017_add_executable()
+speccpu2017_prepare_rundir()

External/SPEC/CINT2017rate/CMakeLists.txt

 add_subdirectory(500.perlbench_r)  # C
 add_subdirectory(502.gcc_r)        # C
 add_subdirectory(505.mcf_r)        # C
 add_subdirectory(520.omnetpp_r)    # C++
 add_subdirectory(523.xalancbmk_r)  # C++
 add_subdirectory(525.x264_r)       # C
 add_subdirectory(531.deepsjeng_r)  # C++
 add_subdirectory(541.leela_r)      # C++
-#add_subdirectory(548.exchange2_r) # Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(548.exchange2_r) # Fortran
+endif ()
 add_subdirectory(557.xz_r)         # C
 
 add_subdirectory(999.specrand_ir)  # C

External/SPEC/CINT2017speed/648.exchange2_s/CMakeLists.txt

+# https://www.spec.org/cpu2017/Docs/benchmarks/648.exchange2_s.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(SPEED ORIGIN 548.exchange2_r)
+
+speccpu2017_inherit(../../CINT2017rate/548.exchange2_r)

External/SPEC/CINT2017speed/CMakeLists.txt

 add_subdirectory(600.perlbench_s)  # C
 add_subdirectory(602.gcc_s)        # C
 add_subdirectory(605.mcf_s)        # C
 add_subdirectory(620.omnetpp_s)    # C++
 add_subdirectory(623.xalancbmk_s)  # C++
 add_subdirectory(625.x264_s)       # C
 add_subdirectory(631.deepsjeng_s)  # C++
 add_subdirectory(641.leela_s)      # C++
-#add_subdirectory(648.exchange2_s) # Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(648.exchange2_s) # Fortran
+endif ()
 add_subdirectory(657.xz_s)         # C
 
 add_subdirectory(998.specrand_is)  # C

External/SPEC/SpecCPU2017.cmake

if (_sources)
     set(_sources)
     foreach(_filename ${ARGN})
       get_filename_component(_absfilename "${_filename}"
         ABSOLUTE BASE_DIR ${SRC_DIR})
       list(APPEND _sources "${_absfilename}")
     endforeach()
   else ()
     file(GLOB_RECURSE _sources
-      ${SRC_DIR}/*.c ${SRC_DIR}/*.cpp ${SRC_DIR}/*.cc ${SRC_DIR}/*.C)
+      ${SRC_DIR}/*.c ${SRC_DIR}/*.cpp ${SRC_DIR}/*.cc ${SRC_DIR}/*.C ${SRC_DIR}/*.f ${SRC_DIR}/*.F ${SRC_DIR}/*.f90 ${SRC_DIR}/*.F90)
   endif ()
 
   llvm_test_executable(${PROG} ${_sources})
 
   if (TARGET ${VALIDATOR}-host)
     add_dependencies(${PROG} ${VALIDATOR}-host)
   endif ()
 endmacro()