[test-suite] r308947 - Improve cmake caches

[Matthias Braun via llvm-commits]

Author: matze
Date: Mon Jul 24 19:33:40 2017
New Revision: 308947

URL: http://llvm.org/viewvc/llvm-project?rev=308947&view=rev
Log:
Improve cmake caches

- Add some more common configurations.
- Make sure all non -O0 caches respect OPTFLAGS.

Added:
    test-suite/trunk/cmake/caches/OsLTO.cmake
    test-suite/trunk/cmake/caches/ReleaseThinLTO.cmake
Modified:
    test-suite/trunk/cmake/caches/CodeSize.cmake
    test-suite/trunk/cmake/caches/MinSize.cmake
    test-suite/trunk/cmake/caches/Os.cmake
    test-suite/trunk/cmake/caches/Oz.cmake

Modified: test-suite/trunk/cmake/caches/CodeSize.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/CodeSize.cmake?rev=308947&r1=308946&r2=308947&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/CodeSize.cmake (original)
+++ test-suite/trunk/cmake/caches/CodeSize.cmake Mon Jul 24 19:33:40 2017
@@ -1,5 +1,6 @@
 # Use -Os, don't increase code size.
+set(OPTFLAGS "${OPTFLAGS} -Os")
 
-set(CMAKE_C_FLAGS_RELEASE "-Os" CACHE STRING "")
-set(CMAKE_CXX_FLAGS_RELEASE "-Os" CACHE STRING "")
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Modified: test-suite/trunk/cmake/caches/MinSize.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/MinSize.cmake?rev=308947&r1=308946&r2=308947&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/MinSize.cmake (original)
+++ test-suite/trunk/cmake/caches/MinSize.cmake Mon Jul 24 19:33:40 2017
@@ -1,5 +1,6 @@
 # Minimize code size using -Oz.
+set(OPTFLAGS "${OPTFLAGS} -Oz")
 
-set(CMAKE_C_FLAGS_RELEASE "-Oz" CACHE STRING "")
-set(CMAKE_CXX_FLAGS_RELEASE "-Oz" CACHE STRING "")
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Modified: test-suite/trunk/cmake/caches/Os.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/Os.cmake?rev=308947&r1=308946&r2=308947&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/Os.cmake (original)
+++ test-suite/trunk/cmake/caches/Os.cmake Mon Jul 24 19:33:40 2017
@@ -1,5 +1,6 @@
 # Use -Os, don't increase code size.
+set(OPTFLAGS "${OPTFLAGS} -Os")
 
-set(CMAKE_C_FLAGS_RELEASE "-Os" CACHE STRING "")
-set(CMAKE_CXX_FLAGS_RELEASE "-Os" CACHE STRING "")
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Added: test-suite/trunk/cmake/caches/OsLTO.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/OsLTO.cmake?rev=308947&view=auto
==============================================================================
--- test-suite/trunk/cmake/caches/OsLTO.cmake (added)
+++ test-suite/trunk/cmake/caches/OsLTO.cmake Mon Jul 24 19:33:40 2017
@@ -0,0 +1,5 @@
+set(OPTFLAGS "${OPTFLAGS} -Os -flto")
+
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Modified: test-suite/trunk/cmake/caches/Oz.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/Oz.cmake?rev=308947&r1=308946&r2=308947&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/Oz.cmake (original)
+++ test-suite/trunk/cmake/caches/Oz.cmake Mon Jul 24 19:33:40 2017
@@ -1,5 +1,6 @@
 # Minimize code size using -Oz.
+set(OPTFLAGS "${OPTFLAGS} -Oz")
 
-set(CMAKE_C_FLAGS_RELEASE "-Oz" CACHE STRING "")
-set(CMAKE_CXX_FLAGS_RELEASE "-Oz" CACHE STRING "")
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Added: test-suite/trunk/cmake/caches/ReleaseThinLTO.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/ReleaseThinLTO.cmake?rev=308947&view=auto
==============================================================================
--- test-suite/trunk/cmake/caches/ReleaseThinLTO.cmake (added)
+++ test-suite/trunk/cmake/caches/ReleaseThinLTO.cmake Mon Jul 24 19:33:40 2017
@@ -0,0 +1,8 @@
+set(OPTFLAGS "${OPTFLAGS} -O3 -fomit-frame-pointer -flto=thin -DNDEBUG")
+if(APPLE)
+  set(OPTFLAGS "${OPTFLAGS} -mdynamic-no-pic")
+endif()
+
+set(CMAKE_C_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELEASE "${OPTFLAGS}" CACHE STRING "")
+set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")