[PATCH 09/10] regroup workgroup tests and add missing dependencies on pocl_version_check

Gbp-Pq: Name 0009-regroup-workgroup-tests-and-add-missing-dependencies.patch

diff --git a/examples/vecadd/CMakeLists.txt b/examples/vecadd/CMakeLists.txt
index cc13789f823ef94b1c1084713a1cc8b311bbe7e2..ba52beb4ae6ef98806330c7e2c28146d37ca34d7 100644 (file)
--- a/examples/vecadd/CMakeLists.txt
+++ b/examples/vecadd/CMakeLists.txt
@@ -42,7 +42,9 @@ if(NOT ENABLE_ANYSAN)
     PASS_REGULAR_EXPRESSION "OK")
 endif()
 
-set_tests_properties( "examples/vecadd"
+set_tests_properties(
+  "examples/vecadd"
+  "examples/vecadd_large_grid"
   PROPERTIES
     COST 3.0
     ${PROPS}

diff --git a/tests/workgroup/CMakeLists.txt b/tests/workgroup/CMakeLists.txt
index 2b8435c52d947c64e340068a7fc251fcf4778898..c66f4ad82f82d49eb9a3619395d12366f8d71be6 100644 (file)
--- a/tests/workgroup/CMakeLists.txt
+++ b/tests/workgroup/CMakeLists.txt
@@ -38,10 +38,6 @@ add_test_pocl(NAME "workgroup/different_implicit_barrier_injection_scenarios"
               EXPECTED_OUTPUT "implicit_barriers_1_2_1_1.stdout"
               COMMAND "run_kernel" "implicit_barriers.cl" 1 2 1 1)
 
-add_test_pocl(NAME "workgroup/unconditional_barriers"
-              EXPECTED_OUTPUT "basic_barriers_2_2_2_2.stdout"
-              COMMAND "run_kernel" "basic_barriers.cl" 2 2 2 2)
-
 add_test_pocl(NAME "workgroup/unbarriered_for_loops"
               EXPECTED_OUTPUT "forloops_2_2_1_1.stdout"
               COMMAND "run_kernel" "forloops.cl" 2 2 1 1)
@@ -54,10 +50,6 @@ add_test_pocl(NAME "workgroup/switch_case"
               EXPECTED_OUTPUT "switch_case_1_4_1_1.stdout"
               COMMAND "run_kernel" "switch_case.cl" 1 4 1 1)
 
-add_test_pocl(NAME "workgroup/conditional_barrier"
-              EXPECTED_OUTPUT "cond_barriers_1_2_1_1.stdout"
-              COMMAND "run_kernel" "conditional_barriers.cl" 1 2 1 1)
-
 add_test_pocl(NAME "workgroup/b_loop_with_none_of_the_WIs_reaching_the_barrier"
               EXPECTED_OUTPUT "tricky_for_1_2_1_1.stdout"
               COMMAND "run_kernel" "tricky_for.cl" 1 2 1 1)
@@ -66,6 +58,30 @@ add_test_pocl(NAME "workgroup/for_with_divergent_return"
               EXPECTED_OUTPUT "for_with_divergent_return_1_6_1_1.stdout"
               COMMAND "run_kernel" "for_with_divergent_return.cl" 1 6 1 1)
 
+# Cases which are not dependent on the work-group or work-item
+# execution (printout) order or the method (use the default method
+# for the device).
+set_tests_properties(
+  "workgroup/different_implicit_barrier_injection_scenarios"
+  "workgroup/unbarriered_for_loops"
+  "workgroup/barriered_for_loops"
+  "workgroup/switch_case"
+  "workgroup/b_loop_with_none_of_the_WIs_reaching_the_barrier"
+  "workgroup/for_with_divergent_return"
+  PROPERTIES
+    COST 2.0
+    PROCESSORS 1
+    DEPENDS "pocl_version_check"
+    LABELS "internal;workgroup")
+
+add_test_pocl(NAME "workgroup/unconditional_barriers"
+              EXPECTED_OUTPUT "basic_barriers_2_2_2_2.stdout"
+              COMMAND "run_kernel" "basic_barriers.cl" 2 2 2 2)
+
+add_test_pocl(NAME "workgroup/conditional_barrier"
+              EXPECTED_OUTPUT "cond_barriers_1_2_1_1.stdout"
+              COMMAND "run_kernel" "conditional_barriers.cl" 1 2 1 1)
+
 add_test_pocl(NAME "workgroup/forcing_horizontal_parallelization_to_some_outer_loops"
               EXPECTED_OUTPUT "outerlooppar_2_2_1_1.stdout"
               COMMAND "run_kernel" "outerlooppar.cl" 2 2 1 1)
@@ -98,7 +114,8 @@ add_test_pocl(NAME "workgroup/range_md_large_grid"
 # These tests are now always ran with the basic device with a predefined
 # work-group execution order. Their printout verification depends
 # on it.
-set_tests_properties( "workgroup/unconditional_barriers"
+set_tests_properties(
+  "workgroup/unconditional_barriers"
   "workgroup/conditional_barrier"
   "workgroup/forcing_horizontal_parallelization_to_some_outer_loops"
   "workgroup/loop_with_two_paths_to_the_latch"
@@ -110,25 +127,10 @@ set_tests_properties( "workgroup/unconditional_barriers"
   PROPERTIES
     COST 2.0
     PROCESSORS 1
-    LABELS "workgroup"
     ENVIRONMENT "POCL_DEVICES=basic;POCL_WORK_GROUP_METHOD=workitemloops"
     DEPENDS "pocl_version_check"
     LABELS "internal;workgroup")
 
-# Cases which are not dependent on the work-group or work-item
-# execution (printout) order or the method (use the default method
-# for the device).
-set_tests_properties("workgroup/unbarriered_for_loops"
-  "workgroup/barriered_for_loops"
-  "workgroup/switch_case"
-  "workgroup/b_loop_with_none_of_the_WIs_reaching_the_barrier"
-  PROPERTIES
-    COST 2.0
-    PROCESSORS 1
-    LABELS "workgroup"
-    DEPENDS "pocl_version_check"
-    LABELS "internal;workgroup")
-
 set_property(TEST
   "workgroup/unconditional_barriers"
   "workgroup/unbarriered_for_loops"