Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit c658676

Browse files
author
Pavel V Chupin
committed
Addressing review comments
Also found that -DCHECK_SYCL_ALL is really required for the first run -DSYCL_TARGET_DEVICES alone is not working. TODO: need to clarify External/ExtraTests functionality
1 parent 36065b9 commit c658676

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

SYCL/External/README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ sources of tests are expected to be located outside of llvm-test-suite
55
repository. Each subdirectory represents external repository for corresponding
66
application/test.
77

8-
# Directory structure
9-
Every sub-directory (e.g. RSBench) contains the following content:
8+
# Adding external test
9+
10+
See [RSBench](RSBench) as example, it contains the following:
1011
* **CMakeLists.txt** - CMake configuration file which is used to obtain
1112
application binary and data files.
12-
* **\*.test** - test configuration files, containing command lines, test
13-
status lines and verification patterns following
14-
[LLVM tests infrastructure](https://llvm.org/docs/TestingGuide.html).
1513
* **lit.local.cfg** - application specific LIT infrastructure configuration
16-
file. In case of RSBench benchmarks it sets LIT test file suffixes to `.test`
14+
file. In case of RSBench benchmark it sets LIT test file suffixes to `.test`
1715
and mark all tests in directory unsupported if corresponding directory is
18-
not added to `SYCL_EXTERNAL_TESTS` list.
16+
not added to `SYCL_EXTERNAL_TESTS` list. See more at:
17+
[LLVM Testing Guide](https://llvm.org/docs/TestingGuide.html#platform-specific-tests)
18+
* **\*.test** - test configuration files, containing command lines, test
19+
status lines and verification patterns per each platform.
1920

2021
# CMake parameters
2122

22-
All parameters described in [Readme.md](../README.md#cmake-parameters) are
23+
All parameters described in [README.md](../README.md#cmake-parameters) are
2324
applicable.
2425

2526
***SYCL_EXTERNAL_TESTS*** semicolon-separated names of external SYCL
@@ -64,7 +65,7 @@ With compiler tools available in the PATH:
6465
cmake \
6566
-DCMAKE_CXX_COMPILER=clang++ \
6667
-DTEST_SUITE_SUBDIRS=SYCL \
67-
-DSYCL_TARGET_DEVICES="level_zero:gpu" \
68+
-DCHECK_SYCL_ALL="level_zero:gpu" \
6869
-DSYCL_EXTERNAL_TESTS="RSBench" \
6970
..
7071

SYCL/README.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ on testing scope.
1616

1717
- DPC++ compiler. Can be built following these
1818
[instructions](https://github.com/intel/llvm/blob/sycl/sycl/doc/GetStartedGuide.md#build-dpc-toolchain)
19-
- LIT tools (llvm-lit, llvm-size). They can be available as part of compiler
20-
build or built separately (e.g. with "ninja check").
19+
or taken prebuilt from [releases](https://github.com/intel/llvm/releases).
20+
- LIT tools (llvm-lit, llvm-size). They are not available at prebuilts above,
21+
but can be built in compiler project (e.g. with "ninja check").
2122
- Target runtime(s) to execute tests on devices other than host. See
2223
[installation instructions](https://github.com/intel/llvm/blob/sycl/sycl/doc/GetStartedGuide.md#install-low-level-runtime)
2324

@@ -39,7 +40,7 @@ With compiler tools available in the PATH:
3940
cmake \
4041
-DCMAKE_CXX_COMPILER=clang++ \
4142
-DTEST_SUITE_SUBDIRS=SYCL \
42-
-DSYCL_TARGET_DEVICES="host" \
43+
-DCHECK_SYCL_ALL="opencl:host" \
4344
..
4445
4546
# Build and Run
@@ -74,6 +75,15 @@ collection
7475

7576
***TEST_SUITE_LIT*** path to llvm-lit tool
7677

78+
***CHECK_SYCL_ALL*** defines selection of multiple SYCL backends with set of
79+
target devices per each to be tested iteratively. Value is semicolon-separated
80+
list of configurations. Each configuration includes backend separated
81+
from comma-separated list of target devices with colon. Example:
82+
83+
```
84+
-DCHECK_SYCL_ALL="opencl:cpu,host;level_zero:gpu,host;cuda:gpu"
85+
```
86+
7787
***SYCL_BE*** SYCL backend to be used for testing. Supported values are:
7888
- **opencl** - for OpenCL backend;
7989
- **cuda** - for CUDA backend;
@@ -86,15 +96,6 @@ Default value is cpu,gpu,acc,host. Supported values are:
8696
- **acc** - FPGA emulator device available in OpenCL backend only;
8797
- **host** - SYCL Host device available with all backends.
8898

89-
***CHECK_SYCL_ALL*** defines selection of multiple SYCL backends with set of
90-
target devices per each to be tested iteratively. Value is semicolon-separated
91-
list of configurations. Each configuration includes backend separated
92-
from comma-separated list of target devices with colon. Example:
93-
94-
```
95-
-DCHECK_SYCL_ALL="opencl:cpu,host;level_zero:gpu,host;cuda:gpu"
96-
```
97-
9899
***OpenCL_LIBRARY*** path to OpenCL ICD loader library. OpenCL interoperability
99100
tests require OpenCL ICD loader to be linked with. For such tests OpenCL ICD
100101
loader library should be installed in the system or available at the full path

0 commit comments

Comments
 (0)