Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit 81f132d

Browse files
qgao007qgao007
committed
Add CL Option DEVICE to enable device-specific tests only based on the device config <mtl, dg2, pvc> to address the current messy issue of "tests not matching device type"
Signed-off-by: Qun Gao <qun.gao@intel.com>
1 parent e5510c6 commit 81f132d

File tree

5 files changed

+113
-49
lines changed

5 files changed

+113
-49
lines changed

‎tests/integration/CMakeLists.txt‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,47 @@ function(add_integration_test target "host_cpp")
1919
# target_link_libraries(${TARGET} PUBLIC MKL::MKL_SYCL)
2020
endfunction()
2121

22-
# add_subdirectory(vector_add)
23-
add_subdirectory(gemm)
24-
add_subdirectory(row_reduction)
25-
add_subdirectory(layer_norm)
26-
add_subdirectory(data_transformer)
27-
add_subdirectory(default_config)
28-
add_subdirectory(sg_dropout_op)
29-
add_subdirectory(limitation)
30-
add_subdirectory(softmax)
31-
add_subdirectory(fmha)
32-
add_subdirectory(col_major_shuf)
22+
if(NOT DEVICE)
23+
set(DEVICE "dg2")
24+
endif()
25+
message(STATUS "Your Device Type is: " ${DEVICE})
26+
27+
if (DEVICE STREQUAL "mtl")
28+
add_subdirectory(vector_add)
29+
add_subdirectory(gemm)
30+
# add_subdirectory(row_reduction)
31+
# add_subdirectory(layer_norm)
32+
# add_subdirectory(data_transformer)
33+
# add_subdirectory(default_config)
34+
# add_subdirectory(sg_dropout_op)
35+
add_subdirectory(limitation)
36+
# add_subdirectory(softmax)
37+
add_subdirectory(fmha)
38+
add_subdirectory(col_major_shuf)
39+
elseif(DEVICE STREQUAL "dg2")
40+
add_subdirectory(vector_add)
41+
add_subdirectory(gemm)
42+
add_subdirectory(row_reduction)
43+
add_subdirectory(layer_norm)
44+
add_subdirectory(data_transformer)
45+
add_subdirectory(default_config)
46+
add_subdirectory(sg_dropout_op)
47+
add_subdirectory(limitation)
48+
add_subdirectory(softmax)
49+
add_subdirectory(fmha)
50+
add_subdirectory(col_major_shuf)
51+
elseif(DEVICE STREQUAL "pvc")
52+
add_subdirectory(vector_add)
53+
add_subdirectory(gemm)
54+
add_subdirectory(row_reduction)
55+
add_subdirectory(layer_norm)
56+
add_subdirectory(data_transformer)
57+
add_subdirectory(default_config)
58+
add_subdirectory(sg_dropout_op)
59+
add_subdirectory(limitation)
60+
add_subdirectory(softmax)
61+
add_subdirectory(fmha)
62+
add_subdirectory(col_major_shuf)
63+
else()
64+
message( SEND_ERROR "ERROR: Please specify the correct device type <mtl, dg2, pvc> for testing.")
65+
endif()

‎tests/integration/gemm/CMakeLists.txt‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
include_directories(${CMAKE_SOURCE_DIR}/tests/integration/gemm)
2-
3-
add_subdirectory(bf16)
4-
add_subdirectory(stream_k)
5-
add_subdirectory(fp16)
6-
add_subdirectory(fp32)
7-
add_subdirectory(int8_quantization)
8-
add_subdirectory(int8)
9-
add_subdirectory(tf32)
10-
add_subdirectory(int4_dequantization)
11-
add_subdirectory(int4_dequantization_bias)
12-
add_subdirectory(unaligned_bf16)
2+
if (DEVICE STREQUAL "mtl")
3+
else()
4+
add_subdirectory(bf16)
5+
add_subdirectory(stream_k)
6+
add_subdirectory(fp16)
7+
add_subdirectory(fp32)
8+
add_subdirectory(int8_quantization)
9+
add_subdirectory(int8)
10+
add_subdirectory(tf32)
11+
add_subdirectory(int4_dequantization)
12+
add_subdirectory(int4_dequantization_bias)
13+
add_subdirectory(unaligned_bf16)
14+
endif()

‎tests/integration/gemm/int4_dequantization_bias/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ string(PREPEND ProjectIdClient "gemm_client_")
66
string(PREPEND ProjectIdXe "gemm_xe_")
77

88
FILE(GLOB src_client main_client.cpp)
9-
add_integration_test(${ProjectIdClient} ${src_client})
9+
if (DEVICE STREQUAL "mtl")
10+
add_integration_test(${ProjectIdClient} ${src_client})
11+
endif()
1012
FILE(GLOB src_xe main_xe.cpp)
1113
add_integration_test(${ProjectIdXe} ${src_xe})

‎tests/integration/vector_add/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
add_subdirectory(tf32_1d)
2-
add_subdirectory(bf16_2d)
3-
add_subdirectory(int32_1d)
4-
add_subdirectory(int32_2d)
1+
if (DEVICE STREQUAL "mtl")
2+
add_subdirectory(int32_1d)
3+
else()
4+
add_subdirectory(tf32_1d)
5+
add_subdirectory(bf16_2d)
6+
add_subdirectory(int32_1d)
7+
add_subdirectory(int32_2d)
8+
endif()

‎tests/unit/CMakeLists.txt‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,48 @@ function(add_unit_test target kernel_func_file test_host)
1919
set_tests_properties(${TARGET} PROPERTIES LABELS "unit" TIMEOUT ${UNIT_TIMEOUT})
2020
endfunction()
2121

22-
add_subdirectory(global_load_store)
23-
add_subdirectory(global_atomic)
24-
add_subdirectory(block_load_store)
25-
add_subdirectory(tile_load_store)
26-
add_subdirectory(tile_load_store_local)
27-
add_subdirectory(internal_type_load_store_cvt)
28-
add_subdirectory(local_load_store)
29-
add_subdirectory(raw_send)
30-
add_subdirectory(buff_compare)
31-
add_subdirectory(tile_mma)
32-
add_subdirectory(named_barrier)
33-
add_subdirectory(tile_row_reduction)
34-
add_subdirectory(add_c)
35-
add_subdirectory(imul)
36-
add_subdirectory(philox_rng)
37-
add_subdirectory(exp_inv_sqrt_tanh)
38-
add_subdirectory(reg_layout_conversion)
39-
add_subdirectory(reg_reduce)
40-
add_subdirectory(math_general)
41-
add_subdirectory(epilogue_tile_op)
42-
add_subdirectory(bit_mask_manipulation)
43-
22+
if (DEVICE STREQUAL "mtl")
23+
add_subdirectory(global_load_store)
24+
add_subdirectory(global_atomic)
25+
# add_subdirectory(block_load_store)
26+
# add_subdirectory(tile_load_store)
27+
# add_subdirectory(tile_load_store_local)
28+
# add_subdirectory(internal_type_load_store_cvt)
29+
add_subdirectory(local_load_store)
30+
# add_subdirectory(raw_send)
31+
add_subdirectory(buff_compare)
32+
# add_subdirectory(tile_mma)
33+
# add_subdirectory(named_barrier)
34+
# add_subdirectory(tile_row_reduction)
35+
add_subdirectory(add_c)
36+
add_subdirectory(imul)
37+
add_subdirectory(philox_rng)
38+
# add_subdirectory(exp_inv_sqrt_tanh)
39+
# add_subdirectory(reg_layout_conversion)
40+
add_subdirectory(reg_reduce)
41+
add_subdirectory(math_general)
42+
# add_subdirectory(epilogue_tile_op)
43+
# add_subdirectory(bit_mask_manipulation)
44+
else()
45+
add_subdirectory(global_load_store)
46+
add_subdirectory(global_atomic)
47+
add_subdirectory(block_load_store)
48+
add_subdirectory(tile_load_store)
49+
add_subdirectory(tile_load_store_local)
50+
add_subdirectory(internal_type_load_store_cvt)
51+
add_subdirectory(local_load_store)
52+
add_subdirectory(raw_send)
53+
add_subdirectory(buff_compare)
54+
add_subdirectory(tile_mma)
55+
add_subdirectory(named_barrier)
56+
add_subdirectory(tile_row_reduction)
57+
add_subdirectory(add_c)
58+
add_subdirectory(imul)
59+
add_subdirectory(philox_rng)
60+
add_subdirectory(exp_inv_sqrt_tanh)
61+
add_subdirectory(reg_layout_conversion)
62+
add_subdirectory(reg_reduce)
63+
add_subdirectory(math_general)
64+
add_subdirectory(epilogue_tile_op)
65+
add_subdirectory(bit_mask_manipulation)
66+
endif()

0 commit comments

Comments
 (0)