halide · steven-johnson · Aug 3, 2023 · Aug 1, 2023 · Aug 1, 2023 · Aug 1, 2023
diff --git a/src/autoschedulers/adams2019/CMakeLists.txt b/src/autoschedulers/adams2019/CMakeLists.txt
@@ -122,5 +122,5 @@ if (WITH_TESTS)
     add_executable(adams2019_test_function_dag test_function_dag.cpp FunctionDAG.cpp)
     target_link_libraries(adams2019_test_function_dag PRIVATE ASLog Halide::Halide Halide::Tools Halide::Plugin)
     add_test(NAME adams2019_test_function_dag COMMAND adams2019_test_function_dag)
-    set_tests_properties(adams2019_test_function_dag PROPERTIES LABELS "adams2019;autoschedulers;auto_schedule")
+    set_tests_properties(adams2019_test_function_dag PROPERTIES LABELS "adams2019;autoschedulers_cpu;auto_schedule")
 endif()
diff --git a/src/autoschedulers/anderson2021/CMakeLists.txt b/src/autoschedulers/anderson2021/CMakeLists.txt
@@ -84,7 +84,7 @@ if (WITH_TESTS)
                              # This is a workaround for issues with the nvidia driver under ASAN
                              # https://forums.developer.nvidia.com/t/cuda-runtime-library-and-addresssanitizer-incompatibilty/63145
                              ENVIRONMENT ASAN_OPTIONS=protect_shadow_gap=0
-                             LABELS Anderson2021)
+                             LABELS "anderson2021;autoschedulers_cuda")
     endfunction()
 
     add_executable(anderson2021_test_function_dag test_function_dag.cpp FunctionDAG.cpp)

diff --git a/src/autoschedulers/common/CMakeLists.txt b/src/autoschedulers/common/CMakeLists.txt
@@ -27,5 +27,5 @@ endif ()
 if (WITH_TESTS)
     add_executable(test_perfect_hash_map test_perfect_hash_map.cpp)
     add_test(NAME test_perfect_hash_map COMMAND test_perfect_hash_map)
-    set_tests_properties(test_perfect_hash_map PROPERTIES LABELS "autoschedulers;auto_schedule")
+    set_tests_properties(test_perfect_hash_map PROPERTIES LABELS "autoschedulers_cpu;auto_schedule")
 endif()
diff --git a/test/autoschedulers/CMakeLists.txt b/test/autoschedulers/CMakeLists.txt
@@ -1,3 +1,11 @@
+# Note that there are 3 distinct tags for autoscheduler tests:
+#
+# autoscheduler_cpu: this autoscheduler is expected to work for CPU targets
+# autoscheduler_gpu: this autoscheduler is expected to work for GPU targets
+# autoscheduler_cuda: this autoscheduler is expected to work on Cuda targets (but probably not other GPU targets)
+#
+# There is also a legacy tag, `auto_schedule`, which is present for legacy purposes and will be removed soon.
+
 add_subdirectory(adams2019)
 if (TARGET_NVPTX)
   add_subdirectory(anderson2021)

diff --git a/test/autoschedulers/adams2019/CMakeLists.txt b/test/autoschedulers/adams2019/CMakeLists.txt
@@ -21,7 +21,8 @@ function(add_adams2019_test NAME)
         set(ARGS_LABELS "")
     endif()
     list(APPEND ARGS_LABELS adams2019)
-    list(APPEND ARGS_LABELS autoschedulers)
+    list(APPEND ARGS_LABELS autoschedulers_cpu)
+    list(APPEND ARGS_LABELS auto_schedule)
 
     add_test(NAME ${NAME}
              COMMAND ${ARGS_COMMAND})

diff --git a/test/autoschedulers/anderson2021/CMakeLists.txt b/test/autoschedulers/anderson2021/CMakeLists.txt
@@ -21,7 +21,9 @@ function(add_anderson2021_test NAME)
         set(ARGS_LABELS "")
     endif()
     list(APPEND ARGS_LABELS anderson2021)
-    list(APPEND ARGS_LABELS autoschedulers)
+    list(APPEND ARGS_LABELS autoschedulers_cuda)
+    # No: anderson2021 didn't have this label before, and it's going away soon, don't add it now
+    # list(APPEND ARGS_LABELS auto_schedule)
 
     add_test(NAME ${NAME}
              COMMAND ${ARGS_COMMAND})
@@ -52,7 +54,7 @@ add_executable(anderson2021_demo_apps_autoscheduler ${DEMO_REGISTRATION_FILE})
 target_link_libraries(anderson2021_demo_apps_autoscheduler PRIVATE anderson2021_demo Halide::RunGenMain)
 
 add_anderson2021_test(anderson2021_demo_apps_autoscheduler
-                   COMMAND anderson2021_demo_apps_autoscheduler --benchmarks=all --benchmark_min_time=1 --estimate_all --skip_bad_environment)
+                      COMMAND anderson2021_demo_apps_autoscheduler --benchmarks=all --benchmark_min_time=1 --estimate_all --skip_bad_environment)
 
 # =================================================================
 

diff --git a/test/autoschedulers/li2018/CMakeLists.txt b/test/autoschedulers/li2018/CMakeLists.txt
@@ -19,9 +19,9 @@ target_link_libraries(li2018_demo_gradient_autoscheduler PRIVATE li2018_demo_gra
 # demo_generator.cpp
 add_halide_test(li2018_demo_gradient_autoscheduler
                 COMMAND li2018_demo_gradient_autoscheduler --benchmarks=all --benchmark_min_time=1 --estimate_all --success
-                GROUPS li2018 autoschedulers auto_schedule multithreaded)
+                GROUPS li2018 autoschedulers_cpu autoschedulers_gpu auto_schedule multithreaded)
 
-tests(GROUPS li2018 autoschedulers auto_schedule
+tests(GROUPS li2018 autoschedulers_cpu autoschedulers_gpu auto_schedule
       SOURCES
       test.cpp
       ARGS $<TARGET_FILE:Halide::Li2018>)
@@ -43,7 +43,7 @@ if (WITH_PYTHON_BINDINGS)
 
         set_tests_properties(li2018_gradient_autoscheduler_test_py PROPERTIES
                              DEPENDS li2018_test
-                             LABELS "li2018;autoschedulers;auto_schedule"
+                             LABELS "li2018;autoschedulers_cpu;autoschedulers_gpu;auto_schedule"
                              ENVIRONMENT_MODIFICATION "${PYTHONPATH}")
     endif()
 endif ()
diff --git a/test/autoschedulers/mullapudi2016/CMakeLists.txt b/test/autoschedulers/mullapudi2016/CMakeLists.txt
@@ -3,13 +3,13 @@ if (NOT TARGET Halide::Mullapudi2016)
     return()
 endif()
 
-tests(GROUPS mullapudi2016 autoschedulers auto_schedule
+tests(GROUPS mullapudi2016 autoschedulers_cpu auto_schedule
       SOURCES
       extern.cpp
       param.cpp
       ARGS $<TARGET_FILE:Halide::Mullapudi2016>)
 
-tests(GROUPS mullapudi2016 autoschedulers auto_schedule multithreaded
+tests(GROUPS mullapudi2016 autoschedulers_cpu auto_schedule multithreaded
       SOURCES
       cost_function.cpp
       data_dependent.cpp