commit 124114b956d63eb15e8e4c572f1ec18b947bd749
author Benoit Jacob <jacob.benoit.1@gmail.com> Thu Oct 31 16:34:48 2024 -0400
committer GitHub <noreply@github.com> Thu Oct 31 16:34:48 2024 -0400
tree 8c8d7ca79fa1325434d348e7d093779a4d607b74
parent 57fb10f3980390beb04db576e10d11533ac40193

Only add cpu-features test suffixes on `llvm-cpu` target backend (#18964)

CPU features only concern `llvm-cpu` and the current logic was adding
useless `_generic` suffixes to all non-llvmcpu tests.

Signed-off-by: Benoit Jacob <jacob.benoit.1@gmail.com>

build_tools/cmake/iree_check_test.cmake

diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index b00741c..b2266d8 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -458,15 +458,17 @@
     list(GET _RULE_TARGET_BACKENDS ${_INDEX} _TARGET_BACKEND)
     list(GET _RULE_DRIVERS ${_INDEX} _DRIVER)
     foreach(_VARIANT_STRING IN LISTS _TARGET_CPU_FEATURES_VARIANTS)
-      parse_target_cpu_features_variant("${_VARIANT_STRING}"
-        _ENABLED _TARGET_CPU_FEATURES_NAME _VARIANT_COMPILER_FLAGS)
-      if(NOT _ENABLED)
-        # The current entry is disabled on the target CPU architecture.
-        continue()
+      if(_TARGET_BACKEND STREQUAL "llvm-cpu")
+        parse_target_cpu_features_variant("${_VARIANT_STRING}"
+          _ENABLED _TARGET_CPU_FEATURES_NAME _VARIANT_COMPILER_FLAGS)
+        if(NOT _ENABLED)
+          # The current entry is disabled on the target CPU architecture.
+          continue()
+        endif()
       endif()
       set(_TARGET_CPU_FEATURES_SUFFIX "")
       set(_LABELS "${_RULE_LABELS}")
-      if (_TARGET_CPU_FEATURES_NAME)
+      if(_TARGET_CPU_FEATURES_NAME)
         set(_TARGET_CPU_FEATURES_SUFFIX "_${_TARGET_CPU_FEATURES_NAME}")
         list(APPEND _LABELS "cpu_features=${_TARGET_CPU_FEATURES_NAME}")
       endif()

build_tools/cmake/iree_e2e_generated_runner_test.cmake

diff --git a/build_tools/cmake/iree_e2e_generated_runner_test.cmake b/build_tools/cmake/iree_e2e_generated_runner_test.cmake
index 658e7d8..605702e 100644
--- a/build_tools/cmake/iree_e2e_generated_runner_test.cmake
+++ b/build_tools/cmake/iree_e2e_generated_runner_test.cmake
@@ -454,11 +454,13 @@
     list(GET _RULE_TARGET_BACKENDS ${_INDEX} _TARGET_BACKEND)
     list(GET _RULE_DRIVERS ${_INDEX} _DRIVER)
     foreach(_VARIANT_STRING IN LISTS _TARGET_CPU_FEATURES_VARIANTS)
-      parse_target_cpu_features_variant("${_VARIANT_STRING}"
-        _ENABLED _TARGET_CPU_FEATURES_NAME _VARIANT_COMPILER_FLAGS)
-      if(NOT _ENABLED)
-        # The current entry is disabled on the target CPU architecture.
-        continue()
+      if(_TARGET_BACKEND STREQUAL "llvm-cpu")
+        parse_target_cpu_features_variant("${_VARIANT_STRING}"
+          _ENABLED _TARGET_CPU_FEATURES_NAME _VARIANT_COMPILER_FLAGS)
+        if(NOT _ENABLED)
+          # The current entry is disabled on the target CPU architecture.
+          continue()
+        endif()
       endif()
       set(_TARGET_CPU_FEATURES_SUFFIX "")
       set(_LABELS "${_RULE_LABELS}")