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

[SYCL][XPTI] Enable XPTI and XPTI Framework E2E tests #458

Merged
merged 14 commits into from
Dec 22, 2021

Conversation

alexbatashev
Copy link

@alexbatashev alexbatashev commented Sep 11, 2021

Add a new group of tests to ensure correct integration of XPTI tracing in SYCL runtime.

* 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)
  ...
@alexbatashev
Copy link
Author

alexbatashev commented Sep 12, 2021

Depends on intel/llvm#4545 and intel/llvm#4494

@alexbatashev alexbatashev marked this pull request as ready for review September 12, 2021 15:26
@alexbatashev alexbatashev changed the title [SYCL][XPTI] Enable XPTI and XPTI Frameworks E2E tests [SYCL][XPTI] Enable XPTI and XPTI Framework E2E tests Sep 12, 2021
// 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

Choose a reason for hiding this comment

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

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.

SYCL/lit.cfg.py Outdated
Comment on lines 326 to 328
config.substitutions.append(('%xptifw_lib', xptifw_lib))
config.substitutions.append(('%xptifw_dispatcher', xptifw_dispatcher))
config.substitutions.append(('%xptifw_includes', xptifw_includes))

Choose a reason for hiding this comment

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

Do we really need separate substitutions? Are they used separately?
if not we can merge them

@@ -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

Choose a reason for hiding this comment

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

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

@bader
Copy link

bader commented Dec 9, 2021

@alexbatashev, please, resolve merge conflicts and apply suggestions from previous reviews.

vladimirlaz
vladimirlaz previously approved these changes Dec 21, 2021
vladimirlaz
vladimirlaz previously approved these changes Dec 21, 2021
@vladimirlaz vladimirlaz merged commit 89c007b into intel:intel Dec 22, 2021
aelovikov-intel pushed a commit to aelovikov-intel/llvm that referenced this pull request Mar 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants