Skip to content

Commit 8d50aae

Browse files
Cleanup cmake files
remove unnecessary string(CONCAT ...) remove unused function Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
1 parent 571199d commit 8d50aae

File tree

6 files changed

+37
-32
lines changed

6 files changed

+37
-32
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#
2+
# Copyright (C) 2022 Intel Corporation
3+
#
4+
# SPDX-License-Identifier: MIT
5+
#
6+
7+
target_sources(${TARGET_NAME} PRIVATE
8+
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
9+
)
10+
add_subdirectories()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Copyright (C) 2022 Intel Corporation
3+
#
4+
# SPDX-License-Identifier: MIT
5+
#
6+
7+
if(TESTS_PVC)
8+
target_sources(${TARGET_NAME} PRIVATE
9+
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
10+
${CMAKE_CURRENT_SOURCE_DIR}/l0_aub_tests_excludes_pvc.cpp
11+
)
12+
add_subdirectories()
13+
endif()
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* Copyright (C) 2022 Intel Corporation
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
*/
7+
8+
#include "shared/test/common/test_macros/test.h"
9+
10+
HWTEST_EXCLUDE_PRODUCT(L0BindlessAub, GivenBindlessKernelWhenExecutedThenOutputIsCorrect, IGFX_PVC);

level_zero/core/test/common/gen_kernel.cmake

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ function(level_zero_generate_kernels_with_internal_options target_list platform_
7878
)
7979

8080
set(output_name "-output" "${prefix}_${basename}")
81-
string(CONCAT options \" ${options} \" )
82-
string(CONCAT internal_options \" ${internal_options} \" )
8381

84-
add_custom_command(
85-
COMMAND echo generate ${ocloc_cmd_prefix} -q -file ${absolute_filepath} -device ${platform_name} -out_dir ${outputdir} ${output_name} -revision_id ${revision_id} -options ${options} -internal_options ${internal_options} , workdir is ${workdir}
82+
add_custom_command(
83+
COMMAND echo generate ${ocloc_cmd_prefix} -q -file ${absolute_filepath} -device ${platform_name} -out_dir ${outputdir} ${output_name} -revision_id ${revision_id} -options ${options} -internal_options "$<JOIN:${internal_options}, >" , workdir is ${workdir}
8684
OUTPUT ${output_files}
87-
COMMAND ${ocloc_cmd_prefix} -q -file ${absolute_filepath} -device ${platform_name} -out_dir ${outputdir} ${output_name} -revision_id ${revision_id} -options ${options} -internal_options ${internal_options}
85+
COMMAND ${ocloc_cmd_prefix} -q -file ${absolute_filepath} -device ${platform_name} -out_dir ${outputdir} ${output_name} -revision_id ${revision_id} -options ${options} -internal_options "$<JOIN:${internal_options}, >"
8886
WORKING_DIRECTORY ${workdir}
8987
DEPENDS ${filepath} ocloc
9088
)

manifests/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ components:
3131
dest_dir: kernels_bin
3232
type: git
3333
branch: kernels_bin
34-
revision: 1904-178
34+
revision: 1904-179
3535
kmdaf:
3636
branch: kmdaf
3737
dest_dir: kmdaf

opencl/test/unit_test/CMakeLists.txt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -348,32 +348,6 @@ function(neo_gen_kernel_with_kernel_debug_options platform_name_with_type platfo
348348
set(kernels_to_compile_${platform_name_with_type}_${revision_id} ${kernels_to_compile_${platform_name_with_type}_${revision_id}} PARENT_SCOPE)
349349
endfunction()
350350

351-
function(neo_gen_kernel_from_ll platform_name_with_type platform_name suffix filepath output_name compile_options)
352-
get_filename_component(filename ${filepath} NAME)
353-
get_filename_component(basename ${filepath} NAME_WE)
354-
get_filename_component(absolute_filepath ${filepath} ABSOLUTE)
355-
356-
set(outputdir "${TargetDir}/${suffix}/test_files/${NEO_ARCH}")
357-
set(workdir "${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
358-
359-
set(outputpath_base "${outputdir}/${output_name}_${suffix}")
360-
set(output_files
361-
${outputpath_base}.bin
362-
${outputpath_base}.gen
363-
)
364-
string(CONCAT compile_options \" ${compile_options} \" )
365-
366-
add_custom_command(
367-
OUTPUT ${output_files}
368-
COMMAND ${ocloc_cmd_prefix} -q -file ${absolute_filepath} -output ${output_name} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir} -internal_options ${compile_options} -llvm_input
369-
WORKING_DIRECTORY ${workdir}
370-
DEPENDS ${filepath} ocloc
371-
)
372-
373-
list(APPEND kernels_to_compile_${platform_name_with_type} ${output_files})
374-
set(kernels_to_compile_${platform_name_with_type} ${kernels_to_compile_${platform_name_with_type}} PARENT_SCOPE)
375-
endfunction()
376-
377351
set(TEST_KERNEL test_files/CopyBuffer_simd16.cl)
378352

379353
set(TEST_KERNEL_options

0 commit comments

Comments
 (0)