Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMake] Mark multi-threaded tests as such #6810

Merged
merged 6 commits into from
Jun 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/autoschedulers/adams2019/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if (BUILD_SHARED_LIBS)
COMMAND test_apps_autoscheduler $<TARGET_FILE:Halide_Adams2019>)

set_tests_properties(test_apps_autoscheduler PROPERTIES
LABELS Adams2019
LebedevRI marked this conversation as resolved.
Show resolved Hide resolved
LABELS "Adams2019;multithreaded"
ENVIRONMENT "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:Halide_Adams2019>:$ENV{LD_LIBRARY_PATH};HL_TARGET=${Halide_TARGET}")
endif ()

Expand Down
2 changes: 1 addition & 1 deletion src/autoschedulers/li2018/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target_link_libraries(demo_gradient_autoscheduler PRIVATE demo_gradient Halide::
add_test(NAME demo_gradient_autoscheduler
COMMAND demo_gradient_autoscheduler --benchmarks=all --benchmark_min_time=1 --estimate_all)

set_tests_properties(demo_gradient_autoscheduler PROPERTIES LABELS Li2018)
set_tests_properties(demo_gradient_autoscheduler PROPERTIES LABELS "Li2018;multithreaded")

##

Expand Down
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ option(WITH_TEST_GENERATOR "Build generator tests" ON)
if (WITH_TEST_GENERATOR)
add_subdirectory(generator)
endif ()

# FIXME: failing_with_issue is dead code :)
8 changes: 6 additions & 2 deletions test/auto_schedule/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
if (TARGET Halide::Mullapudi2016)
tests(GROUPS auto_schedule
SOURCES
extern.cpp
param.cpp
ARGS $<TARGET_FILE:Halide::Mullapudi2016>)

tests(GROUPS auto_schedule multithreaded
SOURCES
cost_function.cpp
data_dependent.cpp
extern.cpp
fibonacci.cpp
histogram.cpp
large_window.cpp
mat_mul.cpp
max_filter.cpp
multi_output.cpp
overlap.cpp
param.cpp
reorder.cpp
small_pure_update.cpp
tile_vs_inline.cpp
Expand Down
87 changes: 45 additions & 42 deletions test/correctness/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,15 @@ tests(GROUPS correctness
SOURCES
align_bounds.cpp
argmax.cpp
assertion_failure_in_parallel_for.cpp
async.cpp
async_copy_chain.cpp
async_device_copy.cpp
atomic_tuples.cpp
atomics.cpp
autodiff.cpp
bad_likely.cpp
bit_counting.cpp
bitwise_ops.cpp
bool_compute_root_vectorize.cpp
bound.cpp
bound_storage.cpp
bound_small_allocations.cpp
bound_storage.cpp
boundary_conditions.cpp
bounds.cpp
bounds_inference.cpp
Expand Down Expand Up @@ -51,16 +46,13 @@ tests(GROUPS correctness
compute_at_reordered_update_stage.cpp
compute_at_split_rvar.cpp
compute_inside_guard.cpp
compute_outermost.cpp
compute_with.cpp
compute_with_in.cpp
compute_with_inlined.cpp
computed_index.cpp
concat.cpp
constant_expr.cpp
constant_type.cpp
constraints.cpp
convolution.cpp
convolution_multiple_kernels.cpp
cross_compilation.cpp
cse_nan.cpp
Expand All @@ -85,21 +77,19 @@ tests(GROUPS correctness
div_by_zero.cpp
dynamic_allocation_in_gpu_kernel.cpp
dynamic_reduction_bounds.cpp
embed_bitcode.cpp
early_out.cpp
embed_bitcode.cpp
erf.cpp
exception.cpp
explicit_inline_reductions.cpp
extern_bounds_inference.cpp
extern_consumer.cpp
extern_consumer_tiled.cpp
extern_error.cpp
extern_output_expansion.cpp
extern_partial.cpp
extern_producer.cpp
extern_reorder_storage.cpp
extern_sort.cpp
extern_stage.cpp
extern_stage_on_device.cpp
external_code.cpp
failed_unroll.cpp
Expand All @@ -113,10 +103,8 @@ tests(GROUPS correctness
float16_t_neon_op_check.cpp
for_each_element.cpp
force_onto_stack.cpp
func_clone.cpp
func_lifetime.cpp
func_lifetime_2.cpp
func_wrapper.cpp
fuse.cpp
fuse_gpu_threads.cpp
fused_where_inner_extent_is_zero.cpp
Expand Down Expand Up @@ -171,7 +159,6 @@ tests(GROUPS correctness
host_alignment.cpp
image_io.cpp
image_of_lists.cpp
image_wrapper.cpp
implicit_args.cpp
implicit_args_tests.cpp
in_place.cpp
Expand All @@ -185,7 +172,6 @@ tests(GROUPS correctness
interleave.cpp
interleave_rgb.cpp
interleave_x.cpp
interpreter.cpp
interval.cpp
intrinsics.cpp
introspection.cpp
Expand All @@ -197,7 +183,6 @@ tests(GROUPS correctness
lazy_convolution.cpp
leak_device_memory.cpp
left_shift_negative.cpp
legal_race_condition.cpp
lerp.cpp
let_in_rdom_bound.cpp
likely.cpp
Expand All @@ -206,48 +191,32 @@ tests(GROUPS correctness
loop_invariant_extern_calls.cpp
loop_level_generator_param.cpp
lossless_cast.cpp
lots_of_dimensions.cpp
lots_of_loop_invariants.cpp
make_struct.cpp
many_dimensions.cpp
many_small_extern_stages.cpp
many_updates.cpp
math.cpp
median3x3.cpp
memoize.cpp
memoize_cloned.cpp
min_extent.cpp
mod.cpp
mul_div_mod.cpp
multi_output_pipeline_with_bad_sizes.cpp
multi_pass_reduction.cpp
multi_splits_with_diff_tail_strategies.cpp
multi_way_select.cpp
multipass_constraints.cpp
multiple_outputs.cpp
multiple_outputs_extern.cpp
multiple_scatter.cpp
mux.cpp
named_updates.cpp
nested_shiftinwards.cpp
nested_tail_strategies.cpp
newtons_method.cpp
non_nesting_extern_bounds_query.cpp
non_vector_aligned_embeded_buffer.cpp
obscure_image_references.cpp
oddly_sized_output.cpp
out_constraint.cpp
out_of_memory.cpp
output_larger_than_two_gigs.cpp
parallel.cpp
parallel_alloc.cpp
parallel_fork.cpp
parallel_gpu_nested.cpp
parallel_nested.cpp
parallel_nested_1.cpp
parallel_scatter.cpp
parallel_reductions.cpp
parallel_rvar.cpp
param.cpp
param_map.cpp
parameter_constraints.cpp
Expand All @@ -267,19 +236,16 @@ tests(GROUPS correctness
pseudostack_shares_slots.cpp
python_extension_gen.cpp
pytorch.cpp
random.cpp
realize_larger_than_two_gigs.cpp
realize_over_shifted_domain.cpp
reduction_chain.cpp
reduction_non_rectangular.cpp
reduction_schedule.cpp
register_shuffle.cpp
reorder_rvars.cpp
reorder_storage.cpp
require.cpp
reschedule.cpp
reuse_stack_alloc.cpp
rfactor.cpp
round.cpp
saturating_casts.cpp
scatter.cpp
Expand Down Expand Up @@ -312,33 +278,28 @@ tests(GROUPS correctness
stmt_to_html.cpp
storage_folding.cpp
store_in.cpp
stream_compaction.cpp
strict_float.cpp
strict_float_bounds.cpp
strided_load.cpp
target.cpp
thread_safety.cpp
tiled_matmul.cpp
tracing.cpp
tracing_bounds.cpp
tracing_broadcast.cpp
tracing_stack.cpp
transitive_bounds.cpp
trim_no_ops.cpp
truncated_pyramid.cpp
tuple_partial_update.cpp
tuple_reduction.cpp
tuple_select.cpp
tuple_undef.cpp
tuple_update_ops.cpp
tuple_vector_reduce.cpp
two_vector_args.cpp
typed_func.cpp
undef.cpp
uninitialized_read.cpp
unique_func_image.cpp
unroll_dynamic_loop.cpp
unroll_huge_mux.cpp
unrolled_reduction.cpp
unsafe_dedup_lets.cpp
unsafe_promises.cpp
Expand All @@ -363,6 +324,49 @@ tests(GROUPS correctness
widening_reduction.cpp
)

tests(GROUPS correctness multithreaded
SOURCES
assertion_failure_in_parallel_for.cpp
async.cpp
async_copy_chain.cpp
atomic_tuples.cpp
atomics.cpp
compute_outermost.cpp
compute_with.cpp
convolution.cpp
extern_consumer_tiled.cpp
extern_stage.cpp
func_clone.cpp
func_wrapper.cpp
image_wrapper.cpp
interpreter.cpp
legal_race_condition.cpp
lots_of_dimensions.cpp
memoize.cpp
multi_pass_reduction.cpp
multiple_outputs_extern.cpp
multiple_scatter.cpp
named_updates.cpp
nested_shiftinwards.cpp
oddly_sized_output.cpp
parallel.cpp
parallel_alloc.cpp
parallel_fork.cpp
parallel_nested.cpp
parallel_nested_1.cpp
parallel_reductions.cpp
parallel_rvar.cpp
parallel_scatter.cpp
random.cpp
reorder_rvars.cpp
rfactor.cpp
stream_compaction.cpp
thread_safety.cpp
truncated_pyramid.cpp
tuple_vector_reduce.cpp
unroll_huge_mux.cpp
)

# Make sure the test that needs image_io has it
target_link_libraries(correctness_image_io PRIVATE Halide::ImageIO)

Expand Down Expand Up @@ -406,4 +410,3 @@ set_target_properties(correctness_async
correctness_sliding_window
correctness_storage_folding
PROPERTIES ENABLE_EXPORTS TRUE)

8 changes: 4 additions & 4 deletions test/error/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ tests(GROUPS error
auto_schedule_no_parallel.cpp
auto_schedule_no_reorder.cpp
autodiff_unbounded.cpp
bad_bound_storage.cpp
bad_bound.cpp
bad_bound_storage.cpp
bad_compute_at.cpp
bad_compute_with.cpp
bad_compute_with_invalid_specialization.cpp
Expand Down Expand Up @@ -55,16 +55,16 @@ tests(GROUPS error
func_tuple_update_types_mismatch.cpp
implicit_args.cpp
impossible_constraints.cpp
init_def_should_be_all_vars.cpp
incomplete_target.cpp
init_def_should_be_all_vars.cpp
inspect_loop_level.cpp
lerp_float_weight_out_of_range.cpp
lerp_mismatch.cpp
lerp_signed_weight.cpp
memoize_different_compute_store.cpp
memoize_redefine_eviction_key.cpp
metal_vector_too_large.cpp
metal_threads_too_large.cpp
metal_vector_too_large.cpp
missing_args.cpp
no_default_device.cpp
nonexistent_update_stage.cpp
Expand Down Expand Up @@ -98,11 +98,11 @@ tests(GROUPS error
undefined_pipeline_realize.cpp
undefined_rdom_dimension.cpp
unknown_target.cpp
vector_tile.cpp
vectorize_dynamic.cpp
vectorize_too_little.cpp
vectorize_too_much.cpp
vectorized_extern.cpp
vector_tile.cpp
wrap_custom_after_shared.cpp
wrap_frozen.cpp
wrapper_never_used.cpp
Expand Down
2 changes: 1 addition & 1 deletion test/failing_with_issue/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ tests(GROUPS failing_with_issue
3293_storage_folding_async.cpp
3357_vectorize_pred.cpp
4283_store_at_gpu.cpp
)
)
Loading