[SYCL][XPTI] Enable XPTI and XPTI Framework E2E tests#458
[SYCL][XPTI] Enable XPTI and XPTI Framework E2E tests#458vladimirlaz merged 14 commits intointel:intelfrom
Conversation
* upstream/intel: (70 commits) [SYCL][Matrix] Add the 8 bit type variants (intel#443) [SYCL] testing of linking in the presence of multiple kernels (intel#440) [NFC] Add Sergey to CODEOWNERS of USM test (intel#455) [ESIMD] E2E test for writeable simd_view subscript operator (intel#415) [SYCL] Eliminate usages of _class aliases (intel#449) [SYCL] Enable assert AOT test (intel#450) [SYCL] Disable flaky Plugin/level_zero_dynamic_batch_test (intel#453) [SYCL] Ensure JIT failure on all Intel devices (intel#452) [SYCL] Removed the remained handler::codeplay_host_task (intel#451) [SYCL] Test for Group Mask feature (intel#441) [SYCL] Update kernel_bundle test for default contexts (intel#446) [SYCL] Replace using of ONEAPI/INTEL namespaces with ext::oneapi/intel (intel#442) [SYCL] Replace deprecated has_extension (intel#434) [SYCL] test for intel/llvm#4405 (intel#424) [SYCL] Remove function pointers extension tests (intel#437) [SYCL] Added test for deprecated features (intel#435) Fix check for availability of sycl.hpp (intel#445) [SYCL] Update tests for default context extension (intel#433) Use sycl.hpp workaround only if compiler doesn't have it (intel#439) [SYCL] Allow extra command line options implicitely added by compiler (intel#432) ...
|
Depends on intel/llvm#4545 and intel/llvm#4494 |
SYCL/XPTI/basic_event_collection.cpp
Outdated
| // REQUIRES: xptifw | ||
| // RUN: %clangxx -fsycl %s -DXPTI_COLLECTOR -shared -fPIC -std=c++17 -o %t_collector.dll -lxptifw | ||
| // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out | ||
| // RUN: env XPTI_TRACE_ENABLED=1 env XPTI_FRAMEWORK_DISPATCHER=%xptifw_lib env XPTI_SUBSCRIBERS=%t_collector.dll %CPU_RUN_PLACEHOLDER %t %CPU_CHECK_PLACEHOLDER |
There was a problem hiding this comment.
The test is running on CPU only. Is it a requirement? If so, cpu should be added to REQUIRES. If not we can remove CPU_RUN_PLACEHOLDERs.
As for my understanding, it should work for any BE so it is better to removed dependencies on specific device type.
Co-authored-by: Romanov Vlad <vlad.romanov@intel.com>
SYCL/lit.cfg.py
Outdated
| config.substitutions.append(('%xptifw_lib', xptifw_lib)) | ||
| config.substitutions.append(('%xptifw_dispatcher', xptifw_dispatcher)) | ||
| config.substitutions.append(('%xptifw_includes', xptifw_includes)) |
There was a problem hiding this comment.
Do we really need separate substitutions? Are they used separately?
if not we can merge them
SYCL/XPTI/basic_event_collection.cpp
Outdated
| @@ -0,0 +1,125 @@ | |||
| // REQUIRES: xptifw, opencl | |||
| // RUN: %clangxx %s -DXPTI_COLLECTOR -L%xptifw_lib -I%xptifw_includes -shared -fPIC -std=c++17 -o %t_collector.dll -lxptifw | |||
There was a problem hiding this comment.
the command line will not work is clang-cl is used (-std=c++17 and -fPIC will not work).
There ar substitutions for such a case: https://github.com/intel/llvm-test-suite/blob/intel/SYCL/lit.cfg.py#L139
|
@alexbatashev, please, resolve merge conflicts and apply suggestions from previous reviews. |
…t-suite#458) Co-authored-by: Romanov Vlad <vlad.romanov@intel.com>
Add a new group of tests to ensure correct integration of XPTI tracing in SYCL runtime.