[SPECCPU2017] Add CXXPORTABILITY flags for 526.blender_r

[ychen]

Summary

as suggested by config/Example-aocc-linux-x86.cfg (v1.1) or config/Example-clang-llvm-linux-x86.cfg (v1.0)
Otherwise, it may fail to compile.

[Meinersbur]

[serious] Overriding CMAKE_CXX_FLAGS applies the change globally to everything in the test-suite. The file itself shows how it is done correctly right before the line you added.

[ychen]

Thanks for the feedback. Obviously, my CMake skills needs to catch up. My
intention was to add the macro definition only for CXX compilation, but
add_definitions, add_compile_options change both C and CXX flags AFAIK at
the time. After some digging, it seems add_compile_options and
add_compile_definitions support cmake-generator-expressions that could be
used to implement this perfectly. However, add_compile_definitions was not
available until CMake v3.12, so I use add_compile_options here.

N.B. The cmake generator expression used here is not supported for Visual
Studio generator which does not need the macro definition. Do we actually care about build this on windows at all?

[Meinersbur]

In D71684#1793685, @ychen wrote:

Thanks for the feedback. Obviously, my CMake skills needs to catch up. My
intention was to add the macro definition only for CXX compilation, but
add_definitions, add_compile_options change both C and CXX flags AFAIK at
the time.

Does defining __BOOL_DEFINED for C as well have any effect? If not, I'd define it for both languages for simplicity.

N.B. The cmake generator expression used here is not supported for Visual
Studio generator which does not need the macro definition. Do we actually care about build this on windows at all?

Many programs in the test-suite are POSIX-specific, e.g. they include unistd.h, sched.h, etc. I some point I gave up maintaining compatibility headers for windows and just compile the test-suite under WSL.

External/SPEC/CFP2017rate/526.blender_r/CMakeLists.txt

17

Did you consider using add_compile_options just for the generator-expression and keep the other as-is? We can do a clean-up once we raise the cmake requirement such that we can use add_compile_definitions.

[Meinersbur]

With or without my suggestion, the change look fine.

[ychen]

address the comment

[ychen]

In D71684#1803110, @Meinersbur wrote:

In D71684#1793685, @ychen wrote:

Thanks for the feedback. Obviously, my CMake skills needs to catch up. My
intention was to add the macro definition only for CXX compilation, but
add_definitions, add_compile_options change both C and CXX flags AFAIK at
the time.

Does defining __BOOL_DEFINED for C as well have any effect? If not, I'd define it for both languages for simplicity.

Defining __BOOL_DEFINED for C would cause build error.

N.B. The cmake generator expression used here is not supported for Visual
Studio generator which does not need the macro definition. Do we actually care about build this on windows at all?

Many programs in the test-suite are POSIX-specific, e.g. they include unistd.h, sched.h, etc. I some point I gave up maintaining compatibility headers for windows and just compile the test-suite under WSL.

Thanks. Good to know.

[ychen]

landed as 5f13cb8e5e03c5bea2ef6feea04584b18f708249

External/SPEC/CFP2017rate/526.blender_r/CMakeLists.txt

 # https://www.spec.org/cpu2017/Docs/benchmarks/526.blender_r.html
 include(../../SpecCPU2017.cmake)
 if (NOT TEST_SUITE_SPEC2017_ROOT)
   return ()
 endif ()
 
 speccpu2017_benchmark(RATE)
 
 add_definitions(
   -DGLEW_NO_ES
   -DGLEW_STATIC
   -DWITH_DNA_GHASH
   -DWITH_GL_PROFILE_COMPAT
   -DWITH_HEADLESS
   -DHAVE_UNSIGNED_CHAR
 )
 add_compile_options(-funsigned-char)
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-D__BOOL_DEFINED>)
 speccpu2017_add_include_dirs(
   specrand
   blender/extern/binreloc/include
   blender/extern/colamd/Include
   blender/extern/glew/include
   blender/extern/libmv
   blender/extern/libmv/intern
   blender/extern/rangetree