[test-suite] r264496 - cmake: Do not check for x86_64(h?)

[Matthias Braun via llvm-commits]

Author: matze
Date: Fri Mar 25 23:05:40 2016
New Revision: 264496

URL: http://llvm.org/viewvc/llvm-project?rev=264496&view=rev
Log:
cmake: Do not check for x86_64(h?)

The cmake build has never set ARCH to x86_64 or x86_64h, so no need to
check for it (things work fine without).

This way we can get rid of the llvm_filter() function.

Modified:
    test-suite/trunk/External/Nurbs/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
    test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
    test-suite/trunk/cmake/modules/MakefileFunctions.cmake

Modified: test-suite/trunk/External/Nurbs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Nurbs/CMakeLists.txt?rev=264496&r1=264495&r2=264496&view=diff
==============================================================================
--- test-suite/trunk/External/Nurbs/CMakeLists.txt (original)
+++ test-suite/trunk/External/Nurbs/CMakeLists.txt Fri Mar 25 23:05:40 2016
@@ -1,4 +1,4 @@
-# Nurbs uses SSE and only works on x86, x86_64, and x86_64h.
+# Nurbs uses SSE and only works on x86.
 if(ARCH STREQUAL "x86")
   llvm_externals_find(TEST_SUITE_NURBS_ROOT "nurbs" "Nurbs")
 

Modified: test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt?rev=264496&r1=264495&r2=264496&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt Fri Mar 25 23:05:40 2016
@@ -12,10 +12,6 @@ if(TARGET_OS STREQUAL "Darwin")
     list(APPEND PROGRAMS_TO_SKIP AtomicOps)
   endif()
 endif()
-llvm_filter(TMP1 ${ARCH} x86_64 x86_64h)
-if("" STREQUAL "${TMP1}")
-  list(APPEND PROGRAMS_TO_SKIP ms_struct-bitfield-init-1 ms_struct-bitfield-init ms_struct-bitfield ms_struct_pack_layout-1 ms_struct_pack_layout ms_struct-bitfield-1)
-endif()
 if(ARCH STREQUAL "AArch64")
   list(APPEND PROGRAMS_TO_SKIP blockstret)
 endif()

Modified: test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt?rev=264496&r1=264495&r2=264496&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt Fri Mar 25 23:05:40 2016
@@ -4,10 +4,6 @@ endif()
 if(ARCH STREQUAL "x86")
   llvm_add_subdirectories(SSE)
 endif()
-llvm_filter(TMP1 ${ARCH} x86_64 x86_64h)
-if(ARCH STREQUAL "${TMP1}")
-  llvm_add_subdirectories(SSE)
-endif()
 if(NOT "${CC_UNDER_TEST_TARGET_IS_THUMBV7}" STREQUAL "")
   llvm_add_subdirectories(NEON)
 endif()

Modified: test-suite/trunk/cmake/modules/MakefileFunctions.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/MakefileFunctions.cmake?rev=264496&r1=264495&r2=264496&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/MakefileFunctions.cmake (original)
+++ test-suite/trunk/cmake/modules/MakefileFunctions.cmake Fri Mar 25 23:05:40 2016
@@ -22,23 +22,3 @@ function(llvm_prepend var prefix)
   endforeach(f)
   set(${var} "${listVar}" PARENT_SCOPE)
 endfunction()
-
-# equivalent to $(filter needle,haystack). Returns a list containing all of the
-# items in ${ARGN} (after needle) that match needle.
-macro(llvm_filter output needle)
-  set(${output})
-  foreach(haystack_item ${ARGN})
-    foreach(needle_item ${needle})
-      if("${haystack_item}" STREQUAL "${needle_item}")
-        list(APPEND ${output} ${haystack_item})
-      endif()
-    endforeach()
-  endforeach()
-endmacro()
-
-# equivalent to $(filter-out needle,haystack). Inverse of llvm_filter.
-macro(llvm_filter_out output needle)
-  set(${output} "${ARGN}")
-  llvm_filter(tmp_output ${needle} ${ARGN})
-  list(REMOVE_ITEM ${output} ${tmp_output})
-endmacro()