Skip to content

[SYCL][E2E][NFC] Refactor library detection sources #11992

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
merged 2 commits into from
Nov 23, 2023
Merged

[SYCL][E2E][NFC] Refactor library detection sources #11992

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da1dc5
[SYCL][E2E][NFC] Refactor library detection sources
steffenlarsen Nov 23, 2023
3845f5c
Apply suggestions from code review
steffenlarsen Nov 23, 2023
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
31 changes: 22 additions & 9 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import re
import subprocess
import tempfile
import textwrap
from distutils.spawn import find_executable

import lit.formats
Expand Down Expand Up @@ -155,8 +156,12 @@
# Check for Level Zero SDK
check_l0_file='l0_include.cpp'
with open(check_l0_file, 'w') as fp:
fp.write('#include<level_zero/ze_api.h>\n')
fp.write('int main() { uint32_t t; zeDriverGet(&t,nullptr); return t; }')
print(textwrap.dedent(
'''
#include <level_zero/ze_api.h>
int main() { uint32_t t; zeDriverGet(&t, nullptr); return t; }
'''
), file=fp)

config.level_zero_libs_dir=lit_config.params.get("level_zero_libs_dir", config.level_zero_libs_dir)
config.level_zero_include=lit_config.params.get("level_zero_include", (config.level_zero_include if config.level_zero_include else config.sycl_include))
Expand All @@ -177,11 +182,15 @@
# Check for sycl-preview library
check_preview_breaking_changes_file='preview_breaking_changes_link.cpp'
with open(check_preview_breaking_changes_file, 'w') as fp:
fp.write('#include <sycl/sycl.hpp>\n')
fp.write('namespace sycl { inline namespace _V1 { namespace detail {\n')
fp.write('extern void PreviewMajorReleaseMarker();\n')
fp.write('}}}\n')
fp.write('int main() { sycl::detail::PreviewMajorReleaseMarker(); return 0; }\n')
print(textwrap.dedent(
'''
#include <sycl/sycl.hpp>
namespace sycl { inline namespace _V1 { namespace detail {
extern void PreviewMajorReleaseMarker();
}}}
int main() { sycl::detail::PreviewMajorReleaseMarker(); return 0; }
'''
), file=fp)

sp = subprocess.getstatusoutput(config.dpcpp_compiler+' -fsycl -fpreview-breaking-changes ' + check_preview_breaking_changes_file)
if sp[0] == 0:
Expand All @@ -190,8 +199,12 @@
# Check for CUDA SDK
check_cuda_file='cuda_include.cpp'
with open(check_cuda_file, 'w') as fp:
fp.write('#include <cuda.h>\n')
fp.write('int main() { CUresult r = cuInit(0); return r; }')
print(textwrap.dedent(
'''
#include <cuda.h>
int main() { CUresult r = cuInit(0); return r; }
'''
), file=fp)

config.cuda_libs_dir=lit_config.params.get("cuda_libs_dir", config.cuda_libs_dir)
config.cuda_include=lit_config.params.get("cuda_include", (config.cuda_include if config.cuda_include else config.sycl_include))
Expand Down