Skip to content

[NFC][SYCL] Run device-agnostic tests separately #2925

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.

Sign up for GitHub

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

Merged
vladimirlaz merged 2 commits into from
Dec 22, 2020
Merged

[NFC][SYCL] Run device-agnostic tests separately #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa51dbd
[NFC][SYCL] Run device-agnostic tests separately
vladimirlaz Dec 21, 2020
a77a113
[SYCL] Apply review comments
vladimirlaz Dec 22, 2020
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
35 changes: 29 additions & 6 deletions sycl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
)

configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/on-device/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/on-device/lit.site.cfg.py
MAIN_CONFIG
${CMAKE_CURRENT_SOURCE_DIR}/on-device/lit.cfg.py
)

configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
Expand Down Expand Up @@ -64,7 +71,7 @@ add_lit_testsuites(SYCL-DEPLOY ${CMAKE_CURRENT_SOURCE_DIR}
)

add_lit_testsuite(check-sycl-opencl "Running the SYCL regression tests for OpenCL"
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/on-device
ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_PLUGIN=opencl"
DEPENDS ${SYCL_TEST_DEPS}
Expand All @@ -73,31 +80,47 @@ add_lit_testsuite(check-sycl-opencl "Running the SYCL regression tests for OpenC
set_target_properties(check-sycl-opencl PROPERTIES FOLDER "SYCL tests")

add_lit_testsuite(check-sycl-level-zero "Running the SYCL regression tests for Level Zero"
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/on-device
ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_PLUGIN=level_zero"
DEPENDS ${SYCL_TEST_DEPS}
EXCLUDE_FROM_CHECK_ALL
)

add_lit_testsuite(check-sycl-spirv "Running device-agnostic SYCL regression tests for SPIR-V"
${CMAKE_CURRENT_BINARY_DIR}
ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_TRIPLE=spir64-unknown-linux-sycldevice"
DEPENDS ${SYCL_TEST_DEPS}
EXCLUDE_FROM_CHECK_ALL
)
set_target_properties(check-sycl-level-zero PROPERTIES FOLDER "SYCL tests")

add_custom_target(check-sycl)
add_dependencies(check-sycl check-sycl-opencl check-sycl-level-zero)
add_dependencies(check-sycl check-sycl-opencl check-sycl-level-zero check-sycl-spirv)
set_target_properties(check-sycl PROPERTIES FOLDER "SYCL tests")

if(SYCL_BUILD_PI_CUDA)
add_lit_testsuite(check-sycl-cuda "Running the SYCL regression tests for CUDA"
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/on-device
Copy link
Contributor

@bader bader Dec 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, move "on-device" tests logic to on-device/CMakeLists.txt.

ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_PLUGIN=cuda"
DEPENDS ${SYCL_TEST_DEPS}
EXCLUDE_FROM_CHECK_ALL
)
set_target_properties(check-sycl-cuda PROPERTIES FOLDER "SYCL CUDA tests")

add_dependencies(check-sycl check-sycl-cuda)
add_lit_testsuite(check-sycl-ptx "Running device-agnostic SYCL regression tests for NVidia PTX"
${CMAKE_CURRENT_BINARY_DIR}
ARGS ${RT_TEST_ARGS}
PARAMS "SYCL_TRIPLE=nvptx64-nvidia-cuda-sycldevice"
DEPENDS ${SYCL_TEST_DEPS}
EXCLUDE_FROM_CHECK_ALL
)

add_dependencies(check-sycl check-sycl-cuda check-sycl-ptx)

add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR}
add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR}/on-device
PARAMS "SYCL_PLUGIN=cuda"
DEPENDS ${SYCL_TEST_DEPS}
EXCLUDE_FROM_CHECK_ALL
Expand Down
147 changes: 4 additions & 143 deletions sycl/test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
config.suffixes = ['.c', '.cpp', '.dump'] #add .spv. Currently not clear what to do with those

# feature tests are considered not so lightweight, so, they are excluded by default
config.excludes = ['Inputs', 'feature-tests']
config.excludes = ['Inputs', 'feature-tests', 'on-device']

# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
Expand Down Expand Up @@ -75,152 +75,13 @@

llvm_config.add_tool_substitutions(['llvm-spirv'], [config.sycl_tools_dir])

backend=lit_config.params.get('SYCL_PLUGIN', "opencl")
lit_config.note("Backend: {}".format(backend))
config.substitutions.append( ('%sycl_be', { 'opencl': 'PI_OPENCL', 'cuda': 'PI_CUDA', 'level_zero': 'PI_LEVEL_ZERO'}[backend]) )
config.substitutions.append( ('%BE_RUN_PLACEHOLDER', "env SYCL_DEVICE_FILTER={SYCL_PLUGIN} ".format(SYCL_PLUGIN=backend)) )
config.substitutions.append( ('%RUN_ON_HOST', "env SYCL_DEVICE_FILTER=host ") )

get_device_count_by_type_path = os.path.join(config.llvm_tools_dir, "get_device_count_by_type")

def getDeviceCount(device_type):
is_cuda = False;
is_level_zero = False;
process = subprocess.Popen([get_device_count_by_type_path, device_type, backend],
stdout=subprocess.PIPE)
(output, err) = process.communicate()
exit_code = process.wait()

if exit_code != 0:
lit_config.error("getDeviceCount {TYPE} {BACKEND}: Non-zero exit code {CODE}".format(
TYPE=device_type, BACKEND=backend, CODE=exit_code))
return [0,False,False]

result = output.decode().replace('\n', '').split(':', 1)
try:
value = int(result[0])
except ValueError:
value = 0
lit_config.error("getDeviceCount {TYPE} {BACKEND}: Cannot get value from output: {OUT}".format(
TYPE=device_type, BACKEND=backend, OUT=result[0]))

# if we have found gpu and there is additional information, let's check
# whether this is CUDA device or Level Zero device or none of these.
if device_type == "gpu" and value > 0 and len(result[1]):
if re.match(r".*cuda", result[1]):
is_cuda = True;
if re.match(r".*level zero", result[1]):
is_level_zero = True;

if err:
lit_config.warning("getDeviceCount {TYPE} {BACKEND} stderr:{ERR}".format(
TYPE=device_type, BACKEND=backend, ERR=err))
return [value,is_cuda,is_level_zero]

# Every SYCL implementation provides a host implementation.
config.available_features.add('host')

# Configure device-specific substitutions based on availability of corresponding
# devices/runtimes

found_at_least_one_device = False

cpu_run_substitute = "true"
cpu_run_on_linux_substitute = "true "
cpu_check_substitute = ""
cpu_check_on_linux_substitute = ""

if getDeviceCount("cpu")[0]:
found_at_least_one_device = True
lit_config.note("Found available CPU device")
cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu ".format(SYCL_PLUGIN=backend)
cpu_check_substitute = "| FileCheck %s"
config.available_features.add('cpu')
if platform.system() == "Linux":
cpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu ".format(SYCL_PLUGIN=backend)
cpu_check_on_linux_substitute = "| FileCheck %s"
else:
lit_config.warning("CPU device not found")

config.substitutions.append( ('%CPU_RUN_PLACEHOLDER', cpu_run_substitute) )
config.substitutions.append( ('%CPU_RUN_ON_LINUX_PLACEHOLDER', cpu_run_on_linux_substitute) )
config.substitutions.append( ('%CPU_CHECK_PLACEHOLDER', cpu_check_substitute) )
config.substitutions.append( ('%CPU_CHECK_ON_LINUX_PLACEHOLDER', cpu_check_on_linux_substitute) )

gpu_run_substitute = "true"
gpu_run_on_linux_substitute = "true "
gpu_check_substitute = ""
gpu_check_on_linux_substitute = ""

cuda = False
level_zero = False
[gpu_count, cuda, level_zero] = getDeviceCount("gpu")

if gpu_count > 0:
found_at_least_one_device = True
lit_config.note("Found available GPU device")
gpu_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=backend)
gpu_check_substitute = "| FileCheck %s"
config.available_features.add('gpu')
if cuda:
config.available_features.add('cuda')
elif level_zero:
config.available_features.add('level_zero')

if platform.system() == "Linux":
gpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=backend)
gpu_check_on_linux_substitute = "| FileCheck %s"
# ESIMD-specific setup. Requires OpenCL for now.
esimd_run_substitute = " env SYCL_DEVICE_FILTER=opencl:gpu SYCL_PROGRAM_COMPILE_OPTIONS=-vc-codegen"
config.substitutions.append( ('%ESIMD_RUN_PLACEHOLDER', esimd_run_substitute) )
config.substitutions.append( ('%clangxx-esimd', "clang++ -fsycl-explicit-simd" ) )
else:
lit_config.warning("GPU device not found")

config.substitutions.append( ('%GPU_RUN_PLACEHOLDER', gpu_run_substitute) )
config.substitutions.append( ('%GPU_RUN_ON_LINUX_PLACEHOLDER', gpu_run_on_linux_substitute) )
config.substitutions.append( ('%GPU_CHECK_PLACEHOLDER', gpu_check_substitute) )
config.substitutions.append( ('%GPU_CHECK_ON_LINUX_PLACEHOLDER', gpu_check_on_linux_substitute) )

acc_run_substitute = "true"
acc_check_substitute = ""
if getDeviceCount("accelerator")[0]:
found_at_least_one_device = True
lit_config.note("Found available accelerator device")
acc_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:acc ".format(SYCL_PLUGIN=backend)
acc_check_substitute = "| FileCheck %s"
config.available_features.add('accelerator')
else:
lit_config.warning("Accelerator device not found")
config.substitutions.append( ('%ACC_RUN_PLACEHOLDER', acc_run_substitute) )
config.substitutions.append( ('%ACC_CHECK_PLACEHOLDER', acc_check_substitute) )

# LIT testing either supports OpenCL or CUDA or Level Zero.
if not cuda and not level_zero and found_at_least_one_device:
config.available_features.add('opencl')

if cuda:
config.substitutions.append( ('%sycl_triple', "nvptx64-nvidia-cuda-sycldevice" ) )
else:
config.substitutions.append( ('%sycl_triple', "spir64-unknown-linux-sycldevice" ) )

if "opencl-aot" in config.llvm_enable_projects:
lit_config.note("Using opencl-aot version which is built as part of the project")
config.available_features.add("opencl-aot")
llvm_config.add_tool_substitutions(['opencl-aot'], [config.sycl_tools_dir])

# Device AOT compilation tools aren't part of the SYCL project,
# so they need to be pre-installed on the machine
aot_tools = ["ocloc", "aoc"]
if "opencl-aot" not in config.llvm_enable_projects:
aot_tools.append('opencl-aot')

for aot_tool in aot_tools:
if find_executable(aot_tool) is not None:
lit_config.note("Found pre-installed AOT device compiler " + aot_tool)
config.available_features.add(aot_tool)
else:
lit_config.warning("Couldn't find pre-installed AOT device compiler " + aot_tool)
triple=lit_config.params.get('SYCL_TRIPLE', 'spir64-unknown-linux-sycldevice')
lit_config.note("Triple: {}".format(triple))
config.substitutions.append( ('%sycl_triple', triple ) )

# Set timeout for test = 10 mins
try:
Expand Down
0 ...asic_tests/parallel_for_range_roundup.cpp → ...asic_tests/parallel_for_range_roundup.cpp
View file
Open in desktop
File renamed without changes.
0 sycl/test/basic_tests/device_selector.cpp → ...test/on-device/config/device_selector.cpp
View file
Open in desktop
File renamed without changes.
Loading