Add more optimizations for MC builds.

[simgrid.git] / tools / cmake / Flags.cmake

diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index a0d31b2..4d6b380 100644 (file)
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -22,14 +22,17 @@ if(enable_compile_warnings)
     set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered  -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized")
   endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    # ignore remark  #1418: external function definition with no prior declaration
+    # ignore remarks:
+    # 191: type qualifier is meaningless on cast type
+    # 1418: external function definition with no prior declaration
     # 2196: routine is both "inline" and "noinline"
+    # 2651: attribute does not apply to any entity
     # 3179: deprecated conversion of string literal to char* (should be const char*)
-    # 191: type qualifier is meaningless on cast type
+    # set as warning:
     # 597: entity-kind "entity" will not be called for implicit or explicit conversions
     # 2330: argument of type "type" is incompatible with parameter of type "type" (dropping qualifiers)
     # 11003: no IR in object file xxxx; was the source file compiled with xxxx
-    set(warnCFLAGS "${warnCFLAGS} -diag-disable=1418,191,2196,3179 -diag-warning=2330,597,11003")
+    set(warnCFLAGS "${warnCFLAGS} -diag-disable=191,1418,2196,2651,3179 -diag-warning=597,2330,11003")
   endif()
 
   set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")
@@ -100,9 +103,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
     set(RELATIVE_SOURCE_DIR ".")
   endif()
   if (CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0")
-    set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
+    set(optCFLAGS "${optCFLAGS} -fdebug-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"")
   else()
-    set(optCFLAGS "${optCFLAGS} -ffile-prefix-map=${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}")
+    set(optCFLAGS "${optCFLAGS} -ffile-prefix-map=\"${CMAKE_SOURCE_DIR}=${RELATIVE_SOURCE_DIR}\"")
   endif()
 endif()
 
@@ -171,17 +174,22 @@ endif()
 
 if(enable_model-checking AND enable_compile_optimizations)
   # Forget it, do not optimize the code (because it confuses the MC):
-  set(optCFLAGS "-O0 ")
+  set(optCFLAGS "-O0")
   # But you can still optimize this:
-  foreach(s
-      src/simix/popping.cpp src/simix/popping_generated.cpp src/simix/smx_global.cpp
-      ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC}
-      ${MC_SRC_BASE} ${MC_SRC})
-      set (mcCFLAGS "-O3  -funroll-loops -fno-strict-aliasing")
-       if(CMAKE_COMPILER_IS_GNUCC)
-         set (mcCFLAGS "${mcCFLAGS} -finline-functions")
+  set(src_list ${simgrid_sources})
+  # except...
+  list(REMOVE_ITEM src_list ${SIMIX_SRC} ${S4U_SRC})
+  # but...
+  list(APPEND src_list
+    src/simix/popping.cpp
+    src/simix/popping_generated.cpp
+    src/simix/smx_global.cpp)
+  foreach(src ${src_list})
+      set (mcCFLAGS "-O3 -funroll-loops -fno-strict-aliasing")
+      if(CMAKE_COMPILER_IS_GNUCC)
+        set (mcCFLAGS "${mcCFLAGS} -finline-functions")
       endif()
-      set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
+      set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
   endforeach()
 endif()
 
@@ -198,7 +206,7 @@ endif()
 set(CMAKE_C_FLAGS   "${warnCFLAGS} ${CMAKE_C_FLAGS}   ${optCFLAGS}")
 set(CMAKE_CXX_FLAGS "${warnCXXFLAGS} ${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
-# Try to make Mac a bit more complient to open source standards
+# Try to make Mac a bit more compliant to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
@@ -210,11 +218,7 @@ endif()
 
 set(TESH_OPTION "")
 if(enable_coverage)
-  if(DEFINED ENV{GCOV})
-    find_program(GCOV_PATH ENV{GCOV})
-  else()
-    find_program(GCOV_PATH gcov)
-  endif()
+  find_program(GCOV_PATH NAMES ENV{GCOV} gcov)
   if(GCOV_PATH)
     set(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCOVERAGE")