Skip to content

Commit e78f595

Browse files
AaronLiu20AaronLiu20
authored
Additional Redlist/Greenlist functionality to External/smoke and External/HeCBench (#63)
* updating the functionality to allow for mutliple lists of tests to be used * minor fix-reorganized the lists to be consistent * removing the stalling tests from the greenlist
1 parent 249c7ac commit e78f595

File tree

3 files changed

+200
-49
lines changed

3 files changed

+200
-49
lines changed

‎External/HeCBench/CMakeLists.txt‎

Lines changed: 96 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,24 @@ option(TEST_SUITE_HECBENCH_FORCE_ALL "Execute all HeCBench tests, even those kno
88
set(TEST_SUITE_OFFLOADING_FLAGS --offload-arch=native CACHE STRING "Compiler arguments for OpenMP offloading")
99
set(TEST_SUITE_OFFLOADING_LDFLAGS --offload-arch=native CACHE STRING "Linker arguments for OpenMP offloading")
1010

11-
set(TEST_SUITE_HECBENCH_EXPECT_PASS
11+
set(ALL_LIST_OPTIONS
12+
AMD
13+
AMD_RUNTIME_REDLIST
14+
AMD_COMPILER_REDLIST
15+
AMD_REDLIST
16+
INTEL
17+
INTEL_RUNTIME_REDLIST
18+
INTEL_COMPILER_REDLIST
19+
INTEL_REDLIST
20+
NVIDIA
21+
NVIDIA_RUNTIME_REDLIST
22+
NVIDIA_COMPILER_REDLIST
23+
NVIDIA_REDLIST
24+
)
25+
26+
set(CHOOSEN_LISTS)
27+
28+
set(NVIDIA
1229
ace-omp/main.cpp
1330
1
1431

@@ -29,6 +46,36 @@ set(TEST_SUITE_HECBENCH_EXPECT_PASS
2946
1
3047
1
3148
)
49+
set(NVIDIA_RUNTIME_REDLIST)
50+
set(NVIDIA_COMPILER_REDLIST)
51+
52+
set(AMD
53+
ace-omp/main.cpp
54+
1
55+
56+
adam-omp/main.cpp
57+
1
58+
1
59+
1
60+
61+
aidw-omp/main.cpp
62+
1
63+
1
64+
1
65+
66+
aobench-omp/ao.cpp
67+
1
68+
69+
atan2-omp/main.cpp
70+
1
71+
1
72+
)
73+
set(AMD_RUNTIME_REDLIST)
74+
set(AMD_COMPILER_REDLIST)
75+
76+
set(INTEL)
77+
set(INTEL_RUNTIME_REDLIST)
78+
set(INTEL_COMPILER_REDLIST)
3279

3380
function (add_hecbench LANG)
3481
if (NOT OpenMP_${LANG}_FOUND)
@@ -41,7 +88,7 @@ function (add_hecbench LANG)
4188
get_filename_component(_directory "${_file}" DIRECTORY)
4289
set(_name "hecbench-${_directory}")
4390

44-
if (NOT TEST_SUITE_HECBENCH_FORCE_ALL AND NOT "${_file}" IN_LIST TEST_SUITE_HECBENCH_EXPECT_PASS)
91+
if (NOT TEST_SUITE_HECBENCH_FORCE_ALL AND NOT "${_file}" IN_LIST CHOOSEN_LISTS)
4592
message(STATUS "Skipping HeCBench Benchmark ${_file}")
4693
continue ()
4794
endif ()
@@ -138,9 +185,56 @@ if (TEST_SUITE_HECBENCH_ROOT AND NOT TEST_SUITE_BENCHMARKING_ONLY)
138185
return ()
139186
endif ()
140187

188+
list(REMOVE_DUPLICATES SYSTEM_GPU)
189+
foreach(list_option ${SYSTEM_GPU})
190+
string(TOUPPER ${list_option} list_option)
191+
if(list_option IN_LIST ALL_LIST_OPTIONS)
192+
if(list_option STREQUAL "AMD")
193+
list(APPEND CHOOSEN_LISTS ${AMD})
194+
message(STATUS "adding AMD")
195+
endif()
196+
if(list_option STREQUAL "AMD_RUNTIME_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
197+
list(APPEND CHOOSEN_LISTS ${AMD_RUNTIME_REDLIST})
198+
message(STATUS "adding AMD_RUNTIME_REDLIST")
199+
endif()
200+
if(list_option STREQUAL "AMD_COMPILER_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
201+
list(APPEND CHOOSEN_LISTS ${AMD_COMPILER_REDLIST})
202+
message(STATUS "adding AMD_COMPILER_REDLIST")
203+
endif()
204+
if(list_option STREQUAL "NVIDIA")
205+
list(APPEND CHOOSEN_LISTS ${NVIDIA})
206+
message(STATUS "adding NVIDIA")
207+
endif()
208+
if(list_option STREQUAL "NVIDIA_RUNTIME_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
209+
list(APPEND CHOOSEN_LISTS ${NVIDIA_RUNTIME_REDLIST})
210+
message(STATUS "adding NVIDIA_RUNTIME_REDLIST")
211+
endif()
212+
if(list_option STREQUAL "NVIDIA_COMPILER_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
213+
list(APPEND CHOOSEN_LISTS ${NVIDIA_COMPILER_REDLIST})
214+
message(STATUS "adding NVIDIA_COMPILER_REDLIST")
215+
endif()
216+
if(list_option STREQUAL "INTEL")
217+
list(APPEND CHOOSEN_LISTS ${INTEL})
218+
message(STATUS "adding INTEL")
219+
endif()
220+
if(list_option STREQUAL "INTEL_RUNTIME_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
221+
list(APPEND CHOOSEN_LISTS ${INTEL_RUNTIME_REDLIST})
222+
message(STATUS "adding INTEL_RUNTIME_REDLIST")
223+
endif()
224+
if(list_option STREQUAL "INTEL_COMPILER_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
225+
list(APPEND CHOOSEN_LISTS ${INTEL_COMPILER_REDLIST})
226+
message(STATUS "adding INTEL_COMPILER_REDLIST")
227+
endif()
228+
else()
229+
message(STATUS "Option is unrecognized (${list_option})")
230+
endif()
231+
endforeach()
232+
list(REMOVE_DUPLICATES CHOOSEN_LISTS)
233+
141234
foreach (_lang in CXX)
142235
if (CMAKE_${_lang}_COMPILER)
143236
add_hecbench(${_lang})
144237
endif()
145238
endforeach ()
146239
endif ()
240+

‎External/smoke/CMakeLists.txt‎

Lines changed: 76 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,24 @@ option(TEST_SUITE_SMOKE_FORCE_ALL "Execute all Smoke tests, even those known to
88
set(TEST_SUITE_OFFLOADING_FLAGS --offload-arch=native CACHE STRING "Compiler arguments for OpenMP offloading")
99
set(TEST_SUITE_OFFLOADING_LDFLAGS --offload-arch=native CACHE STRING "Linker arguments for OpenMP offloading")
1010

11-
set(INTEL_TEST_SUITE_EXPECT_PASS)
11+
set(ALL_LIST_OPTIONS
12+
AMD
13+
AMD_RUNTIME_REDLIST
14+
AMD_COMPILER_REDLIST
15+
AMD_REDLIST
16+
INTEL
17+
INTEL_RUNTIME_REDLIST
18+
INTEL_COMPILER_REDLIST
19+
INTEL_REDLIST
20+
NVIDIA
21+
NVIDIA_RUNTIME_REDLIST
22+
NVIDIA_COMPILER_REDLIST
23+
NVIDIA_REDLIST
24+
)
25+
26+
set(CHOOSEN_LISTS)
1227

13-
set(AMD_TEST_SUITE_EXPECT_PASS
28+
set(AMD
1429
alignedattribute
1530
already_locked
1631
ancestorC
@@ -195,8 +210,14 @@ set(AMD_TEST_SUITE_EXPECT_PASS
195210
vmuldemo
196211
wgs64
197212
)
213+
set(AMD_RUNTIME_REDLIST)
214+
set(AMD_COMPILER_REDLIST)
198215

199-
set(NVIDIA_TEST_SUITE_EXPECT_PASS
216+
set(INTEL)
217+
set(INTEL_RUNTIME_REDLIST)
218+
set(INTEL_COMPILER_REDLIST)
219+
220+
set(NVIDIA
200221
alignedattribute
201222
already_locked
202223
ancestorC
@@ -372,8 +393,10 @@ set(NVIDIA_TEST_SUITE_EXPECT_PASS
372393
vmuldemo
373394
wgs64
374395
)
396+
set(NVIDIA_RUNTIME_REDLIST)
397+
set(NVIDIA_COMPILER_REDLIST)
375398

376-
function (add_smoke LANG WHITE_LIST_CHOOSEN)
399+
function (add_smoke LANG)
377400
set(_includedir "${TEST_SUITE_SMOKE_ROOT}/ompvv" )
378401

379402
if (NOT OPENMP_${LANG}_FOUND)
@@ -394,7 +417,7 @@ function (add_smoke LANG WHITE_LIST_CHOOSEN)
394417
get_filename_component(_directory "${_makefile}" DIRECTORY)
395418
set(_name "smoke-${_directory}")
396419

397-
if (NOT TEST_SUITE_SMOKE_FORCE_ALL AND NOT "${_directory}" IN_LIST ${WHITE_LIST_CHOOSEN})
420+
if (NOT TEST_SUITE_SMOKE_FORCE_ALL AND NOT "${_directory}" IN_LIST CHOOSEN_LISTS)
398421
message(STATUS "Skipping Smoke test ${_directory}")
399422
continue ()
400423
endif ()
@@ -458,21 +481,56 @@ if(TEST_SUITE_SMOKE_ROOT AND NOT TEST_SUITE_BENCHMARKING_ONLY)
458481
return()
459482
endif()
460483

484+
list(REMOVE_DUPLICATES SYSTEM_GPU)
485+
foreach(list_option ${SYSTEM_GPU})
486+
string(TOUPPER ${list_option} list_option)
487+
if(list_option IN_LIST ALL_LIST_OPTIONS)
488+
if(list_option STREQUAL "AMD")
489+
list(APPEND CHOOSEN_LISTS ${AMD})
490+
message(STATUS "adding AMD")
491+
endif()
492+
if(list_option STREQUAL "AMD_RUNTIME_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
493+
list(APPEND CHOOSEN_LISTS ${AMD_RUNTIME_REDLIST})
494+
message(STATUS "adding AMD_RUNTIME_REDLIST")
495+
endif()
496+
if(list_option STREQUAL "AMD_COMPILER_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
497+
list(APPEND CHOOSEN_LISTS ${AMD_COMPILER_REDLIST})
498+
message(STATUS "adding AMD_COMPILER_REDLIST")
499+
endif()
500+
if(list_option STREQUAL "NVIDIA")
501+
list(APPEND CHOOSEN_LISTS ${NVIDIA})
502+
message(STATUS "adding NVIDIA")
503+
endif()
504+
if(list_option STREQUAL "NVIDIA_RUNTIME_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
505+
list(APPEND CHOOSEN_LISTS ${NVIDIA_RUNTIME_REDLIST})
506+
message(STATUS "adding NVIDIA_RUNTIME_REDLIST")
507+
endif()
508+
if(list_option STREQUAL "NVIDIA_COMPILER_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
509+
list(APPEND CHOOSEN_LISTS ${NVIDIA_COMPILER_REDLIST})
510+
message(STATUS "adding NVIDIA_COMPILER_REDLIST")
511+
endif()
512+
if(list_option STREQUAL "INTEL")
513+
list(APPEND CHOOSEN_LISTS ${INTEL})
514+
message(STATUS "adding INTEL")
515+
endif()
516+
if(list_option STREQUAL "INTEL_RUNTIME_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
517+
list(APPEND CHOOSEN_LISTS ${INTEL_RUNTIME_REDLIST})
518+
message(STATUS "adding INTEL_RUNTIME_REDLIST")
519+
endif()
520+
if(list_option STREQUAL "INTEL_COMPILER_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
521+
list(APPEND CHOOSEN_LISTS ${INTEL_COMPILER_REDLIST})
522+
message(STATUS "adding INTEL_COMPILER_REDLIST")
523+
endif()
524+
else()
525+
message(STATUS "Option is unrecognized (${list_option})")
526+
endif()
527+
endforeach()
528+
list(REMOVE_DUPLICATES CHOOSEN_LISTS)
529+
461530
foreach (_lang in C)
462531
if(CMAKE_${_lang}_COMPILER)
463-
if(SYSTEM_GPU)
464-
if(SYSTEM_GPU STREQUAL "nvidia" OR SYSTEM_GPU STREQUAL "NVIDIA")
465-
add_SMOKE(${_lang} NVIDIA_TEST_SUITE_EXPECT_PASS)
466-
elseif(SYSTEM_GPU STREQUAL "amd" OR SYSTEM_GPU STREQUAL "AMD")
467-
add_SMOKE(${_lang} AMD_TEST_SUITE_EXPECT_PASS)
468-
elseif(SYSTEM_GPU STREQUAL "intel" OR SYSTEM_GPU STREQUAL "INTEL")
469-
add_SMOKE(${_lang} INTEL_TEST_SUITE_EXPECT_PASS)
470-
else()
471-
message("Currently have whitelists for nvidia, amd intel gpus")
472-
endif()
473-
else()
474-
message("Please declare what target gpu, AMD, NVIDIA, or INTEL")
475-
endif()
532+
add_SMOKE(${_lang})
476533
endif()
477534
endforeach ()
478535
endif ()
536+

‎External/sollve_vv/CMakeLists.txt‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,23 @@ set(ALL_LIST_OPTIONS
1212
AMD
1313
AMD_RUNTIME_REDLIST
1414
AMD_COMPILER_REDLIST
15-
NVIDIA
16-
NVIDIA_RUNTIME_REDLIST
17-
NVIDIA_COMPILER_REDLIST
15+
AMD_REDLIST
1816
INTEL
1917
INTEL_RUNTIME_REDLIST
2018
INTEL_COMPILER_REDLIST
19+
INTEL_REDLIST
20+
NVIDIA
21+
NVIDIA_RUNTIME_REDLIST
22+
NVIDIA_COMPILER_REDLIST
23+
NVIDIA_REDLIST
2124
REGRESSION
2225
REGRESSION_RUNTIME_REDLIST
2326
REGRESSION_COMPILER_REDLIST
24-
AMD_REDLIST
25-
NVIDIA_REDLIST
26-
INTEL_REDLIST
2727
REGRESSION_REDLIST
2828
)
2929

3030
set(CHOOSEN_LISTS)
3131

32-
set(INTEL)
33-
set(INTEL_RUNTIME_REDLIST)
34-
set(INTEL_COMPILER_REDLIST)
35-
36-
set(REGRESSION)
37-
set(REGRESSION_RUNTIME_REDLIST)
38-
set(REGRESSION_COMPILER_REDLIST)
39-
4032
set(AMD
4133
4.5/application_kernels/alpaka_complex_template.cpp
4234
4.5/application_kernels/gemv_target.cpp
@@ -301,11 +293,6 @@ set(AMD
301293
5.1/allocate/test_omp_alloctrait_key.c
302294
5.1/assume/test_assumes_contains.c
303295
5.1/assume/test_begin_end_assumes_contains.c
304-
5.1/atomic/test_atomic_compare.c
305-
5.1/atomic/test_atomic_compare_device.c
306-
5.1/atomic/test_atomic_fail_acquire.c
307-
5.1/atomic/test_atomic_fail_relaxed.c
308-
5.1/atomic/test_atomic_fail_seq_cst.c
309296
5.1/cpp_attribute_specifier/test_cpp_attribute_specifier.cpp
310297
5.1/declare_variant/test_begin_end_declare_variant.c
311298
5.1/default/test_default_firstprivate_parallel.c
@@ -351,13 +338,9 @@ set(AMD
351338
5.2/misc/test_printf_in_target_region.c
352339
5.2/runtime_calls/test_omp_in_explicit_task.c
353340
)
354-
######## Running Too Long 4 ###############
355-
#4.5/target_teams_distribute_parallel_for/test_target_teams_distribute_parallel_for_if_parallel_modifier.c
356-
#5.0/target_requires/test_target_requires_atomic_default_mem_order_acq_rel.c
357-
#5.0/target_requires/test_target_requires_atomic_default_mem_order_relaxed.c
358-
#5.0/target_requires/test_target_requires_atomic_default_mem_order_seq_cst.c
359341

360342
set(AMD_RUNTIME_REDLIST
343+
4.5/target_teams_distribute_parallel_for/test_target_teams_distribute_parallel_for_if_parallel_modifier.c
361344
5.0/loop/test_loop_bind_device.c
362345
5.0/loop/test_loop_nested_device.c
363346
5.0/master_taskloop/test_master_taskloop_device.c
@@ -379,11 +362,19 @@ set(AMD_RUNTIME_REDLIST
379362
5.0/requires/test_requires_unified_shared_memory_static_map.c
380363
5.0/target/test_target_task_depend_mutexinoutset.c
381364
5.0/target/test_target_uses_allocators_const.c
365+
5.0/target_requires/test_target_requires_atomic_default_mem_order_acq_rel.c
366+
5.0/target_requires/test_target_requires_atomic_default_mem_order_relaxed.c
367+
5.0/target_requires/test_target_requires_atomic_default_mem_order_seq_cst.c
382368
5.0/target_update/test_target_update_from_discontiguous.c
383369
5.0/target_update/test_target_update_mapper_from_discontiguous.c
384370
5.0/target_update/test_target_update_mapper_to_discontiguous.c
385371
5.0/target_update/test_target_update_to_discontiguous.c
386372
5.0/task/test_task_affinity_device.c
373+
5.1/atomic/test_atomic_compare.c
374+
5.1/atomic/test_atomic_compare_device.c
375+
5.1/atomic/test_atomic_fail_acquire.c
376+
5.1/atomic/test_atomic_fail_relaxed.c
377+
5.1/atomic/test_atomic_fail_seq_cst.c
387378
5.1/env_var/test_omp_num_teams_env_2.c
388379
5.1/env_var/test_omp_places_env_ll_caches.c
389380
5.1/env_var/test_omp_places_env_numa_domains.c
@@ -457,6 +448,10 @@ set(AMD_COMPILER_REDLIST
457448
5.2/target_enter_data/test_target_enter_data_map.c
458449
)
459450

451+
set(INTEL)
452+
set(INTEL_RUNTIME_REDLIST)
453+
set(INTEL_COMPILER_REDLIST)
454+
460455
set(NVIDIA
461456
4.5/application_kernels/alpaka_complex_template.cpp
462457
4.5/application_kernels/gemv_target.cpp
@@ -729,11 +724,6 @@ set(NVIDIA
729724
5.1/allocate/test_omp_alloctrait_key.c
730725
5.1/assume/test_assumes_contains.c
731726
5.1/assume/test_begin_end_assumes_contains.c
732-
5.1/atomic/test_atomic_compare.c
733-
5.1/atomic/test_atomic_compare_device.c
734-
5.1/atomic/test_atomic_fail_acquire.c
735-
5.1/atomic/test_atomic_fail_relaxed.c
736-
5.1/atomic/test_atomic_fail_seq_cst.c
737727
5.1/cpp_attribute_specifier/test_cpp_attribute_specifier.cpp
738728
5.1/declare_variant/test_begin_end_declare_variant.c
739729
5.1/default/test_default_firstprivate_parallel.c
@@ -813,6 +803,11 @@ set(NVIDIA_RUNTIME_REDLIST
813803
5.0/taskwait/test_taskwait_depend.c
814804
5.0/teams_loop/test_target_teams_loop_firstprivate.c
815805
5.0/teams_loop/test_target_teams_loop_private.c
806+
5.1/atomic/test_atomic_compare.c
807+
5.1/atomic/test_atomic_compare_device.c
808+
5.1/atomic/test_atomic_fail_acquire.c
809+
5.1/atomic/test_atomic_fail_relaxed.c
810+
5.1/atomic/test_atomic_fail_seq_cst.c
816811
5.1/env_var/test_omp_num_teams_env_2.c
817812
5.1/env_var/test_omp_places_env_ll_caches.c
818813
5.1/env_var/test_omp_places_env_numa_domains.c
@@ -878,6 +873,10 @@ set(NVIDIA_COMPILER_REDLIST
878873
5.2/target_enter_data/test_target_enter_data_map.c
879874
)
880875

876+
set(REGRESSION)
877+
set(REGRESSION_RUNTIME_REDLIST)
878+
set(REGRESSION_COMPILER_REDLIST)
879+
881880
function (add_sollvevv LANG)
882881
set(_includedir "${TEST_SUITE_SOLLVEVV_ROOT}/ompvv" )
883882

0 commit comments

Comments
 (0)