[SPECCPU2017] Add addition platform options and missing flags.

[Meinersbur]

Summary

Add portability flags for 64-bit Windows and Linux on ARM.

Also add missing SPEC and SPEC_CPU flags without which the compilation could fail on these platforms.

[MatzeB]

I don't have a copy of Spec2017 yet so I cannot test any of it.

The changes look sensible though, with some suggestions below:

External/SPEC/SpecCPU2017.cmake

117–147 ↗

(On Diff #152329)

This feels like some SPEC flags (SPEC_LP64/SPEC_ILP32,SPEC_AUTO_BYTEORDER) should only depend on CMAKE_SIZEOF_VOID_P (and not the TARGET_OS) or IS_BIGENDIAN rather than getting shoved into per OS/per architecture parts.

137 ↗

(On Diff #152329)

comment typo?

[Meinersbur]

External/SPEC/SpecCPU2017.cmake

117–147 ↗

(On Diff #152329)

I didn't know about IS_BIGENDIAN. I will use that.

SPEC_LP64/SPEC_ILP32/SPEC_LLP64 is a but more complicated, it definitely does not only depend on the address width. 64 bit msvc uses LLP64, clang on Windows is LLP64 (WindowsX86_64TargetInfo), mingw on Windows is LP64. I could use cmake's CheckTypeSize to check the exact type model.

Unfortunately there are flags such as SPEC_LINUX_X64, so we don't get around checks for specific platforms.

137 ↗

(On Diff #152329)

Yes, indeed.

[Meinersbur]

• Derive platform flags by introspection as much as possible

[MatzeB]

My LGTM still stands (in case you are waiting for another approval).

[Meinersbur]

In D48442#1162526, @MatzeB wrote:

My LGTM still stands (in case you are waiting for another approval).

Thanks for the remainder. There were larger changes since the approval, so I wasn't sure.

test-suite/trunk/External/SPEC/CINT2017rate/525.x264_r/CMakeLists.txt

set(ldecod_SourceNames
   ldecod_src/input.c
 )
 set(ldecod_Sources)
 foreach (_file IN LISTS ldecod_SourceNames)
   list(APPEND ldecod_Sources "${SRC_DIR}/${_file}")
 endforeach ()
 llvm_add_host_executable(ldecod_${SUFFIX}-host
   ldecod_${SUFFIX} ${ldecod_Sources}
-  CPPFLAGS -I "${SRC_DIR}/ldecod_src/inc"
+  CPPFLAGS -I "${SRC_DIR}/ldecod_src/inc" -DSPEC
   LDFLAGS -lm
 )
 
 
 # Prepare BuckBunny.yuv used for x264 as input.
 foreach (_run_type IN LISTS TEST_SUITE_RUN_TYPE)
   add_custom_command(
     OUTPUT "${RUN_${_run_type}_DIR}/BuckBunny.yuv"

test-suite/trunk/External/SPEC/SpecCPU2017.cmake

if (NOT DEFINED BENCHMARK)
     # Create benchmark working directories.
     foreach (_run_type IN LISTS TEST_SUITE_RUN_TYPE)
       set(RUN_${_run_type}_DIR "${CMAKE_CURRENT_BINARY_DIR}/run_${_run_type}")
       file(MAKE_DIRECTORY ${RUN_${_run_type}_DIR})
     endforeach ()
 
 
     # Mandatory flags
-    add_definitions(-DSPEC -DNDEBUG)
+    add_definitions(-DSPEC -DSPEC_CPU -DNDEBUG)
 
     if (RATE)
       # rate benchmarks never use parallelism
       add_definitions(-DSPEC_AUTO_SUPPRESS_OPENMP)
     endif ()
 
     # Portability flags
-    if(ARCH STREQUAL "x86" AND TARGET_OS STREQUAL "Linux")
-      add_definitions(-DSPEC_LINUX) # 526.blender_r
+    if (ENDIAN STREQUAL "little")
       add_definitions(-DSPEC_AUTO_BYTEORDER=0x12345678)
+    elseif (ENDIAN STREQUAL "big")
+      add_definitions(-DSPEC_AUTO_BYTEORDER=0x87654321)
+    endif ()
+
+    check_type_size("long long" SIZEOF_LONG_LONG)
+    check_type_size("long" SIZEOF_LONG)
+    check_type_size("int" SIZEOF_INT)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND SIZEOF_LONG_LONG EQUAL 8 AND SIZEOF_LONG EQUAL 4 AND SIZEOF_INT EQUAL 4)
+      add_definitions(-DSPEC_ILP32)
+    elseif (CMAKE_SIZEOF_VOID_P EQUAL 8 AND SIZEOF_LONG_LONG EQUAL 8 AND SIZEOF_LONG EQUAL 4 AND SIZEOF_INT EQUAL 4)
+      add_definitions(-DSPEC_P64)
+    elseif (CMAKE_SIZEOF_VOID_P EQUAL 8 AND SIZEOF_LONG_LONG EQUAL 8 AND SIZEOF_LONG EQUAL 8 AND SIZEOF_INT EQUAL 4)
+      add_definitions(-DSPEC_LP64)
+    elseif (CMAKE_SIZEOF_VOID_P EQUAL 8 AND SIZEOF_LONG_LONG EQUAL 8 AND SIZEOF_LONG EQUAL 8 AND SIZEOF_INT EQUAL 8)
+      add_definitions(-DSPEC_ILP64)
+    else ()
+      message(FATAL_ERROR "SPEC CPU 2017 unsupported data model (supported: ILP32/LLP64/LP64/ILP64)")
+    endif ()
+
+    if (TARGET_OS STREQUAL "Linux")
+      add_definitions(-DSPEC_LINUX) # 526.blender_r
+    endif ()
+
+    if(ARCH STREQUAL "x86" AND TARGET_OS STREQUAL "Linux")
       if (CMAKE_SIZEOF_VOID_P EQUAL 8)
         # Linux x86_64
-        add_definitions(-DSPEC_LP64)
         add_definitions(-DSPEC_LINUX_X64) # perlbench
       elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
         # Linux x86
         add_definitions(-DSPEC_ILP32)
         add_definitions(-D_FILE_OFFSET_BITS=64)
         add_definitions(-DSPEC_LINUX_I32) # perlbench
       endif ()
+    elseif (ARCH STREQUAL "AArch64" AND TARGET_OS STREQUAL "Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+      # Linux ARM
+      add_definitions(-DSPEC_LINUX_AARCH64)
+    elseif (ARCH STREQUAL "x86" AND TARGET_OS STREQUAL "Windows")
+      # Windows x86/x64
     else ()
+      message("ARCH: ${ARCH}")
+      message("TARGET_OS: ${TARGET_OS}")
+      message("CMAKE_SIZEOF_VOID_P: ${CMAKE_SIZEOF_VOID_P}")
       message(FATAL_ERROR
         "Don't know portability flags for SPEC CPU 2017 on this platform")
     endif ()
 
     # No OpenMP for the moment, even for the _s suites.
     add_definitions(-DSPEC_SUPPRESS_OPENMP)
 
   endif ()
macro(speccpu2017_validate_image _imgfile _cmpfile _outfile)
   cmake_parse_arguments(_carg "" "RUN_TYPE" "SUITE_TYPE" ${ARGN})
 
   set(VALIDATOR imagevalidate_${BENCHMARK_NO})
   if (NOT TARGET ${VALIDATOR}-host)
     file(GLOB_RECURSE _validator_sources "${SRC_DIR}/image_validator/*.c")
     llvm_add_host_executable(
       ${VALIDATOR}-host ${VALIDATOR} ${_validator_sources}
       LDFLAGS -lm
+      CPPFLAGS -DSPEC
     )
   endif ()
 
   if ((NOT DEFINED _carg_SUITE_TYPE) OR (${BENCHMARK_SUITE_TYPE} IN_LIST _carg_SUITE_TYPE))
     get_filename_component(_basename "${_imgfile}" NAME_WE)
     get_filename_component(_ext "${_imgfile}" EXT)
     llvm_test_verify(
       cd "${RUN_${_carg_RUN_TYPE}_DIR}" &&