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

[SYCL][XPTI] Fix test #659

Merged
bader merged 5 commits into from
Dec 23, 2021
Merged

[SYCL][XPTI] Fix test #659

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29527f8
[SYCL][XPTI] Fix test
vladimirlaz Dec 22, 2021
bb663bd
Support CL-options format
vladimirlaz Dec 22, 2021
815e34b
Merge remote-tracking branch 'intel_suite/intel' into fix_xpti_tests
vladimirlaz Dec 22, 2021
db86d86
Enable test back
vladimirlaz Dec 22, 2021
b455adf
Apply review comments
vladimirlaz Dec 23, 2021
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
3 changes: 2 additions & 1 deletion SYCL/XPTI/basic_event_collection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: xptifw, opencl, TEMPORARILY_DISABLED
// REQUIRES: xptifw, opencl
// RUN: %clangxx %s -DXPTI_COLLECTOR -DXPTI_CALLBACK_API_EXPORTS %xptifw_lib %shared_lib %fPIC %cxx_std_optionc++17 -o %t_collector.dll
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env XPTI_TRACE_ENABLE=1 env XPTI_FRAMEWORK_DISPATCHER=%xptifw_dispatcher env XPTI_SUBSCRIBERS=%t_collector.dll env SYCL_DEVICE_FILTER=opencl %t.out | FileCheck %s 2>&1
Expand Down Expand Up @@ -36,6 +36,7 @@ int main() {

#endif

// CHECK: xptiTraceInit: Stream Name = sycl.experimental.mem_alloc
// CHECK: xptiTraceInit: Stream Name = sycl
// CHECK-NEXT: Graph create
// CHECK-NEXT: xptiTraceInit: Stream Name = sycl.pi
Expand Down
7 changes: 5 additions & 2 deletions SYCL/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,12 @@
config.available_features.add('xptifw')
config.substitutions.append(('%xptifw_dispatcher', xptifw_dispatcher))
if platform.system() == "Linux":
config.substitutions.append(('%xptifw_lib', " {}/xptifw.lib".format(xptifw_lib_dir)))
config.substitutions.append(('%xptifw_lib', " {}/libxpti.a -I{} ".format(xptifw_lib_dir, xptifw_includes)))
Comment thread
vladimirlaz marked this conversation as resolved.
Outdated
elif platform.system() == "Windows":
config.substitutions.append(('%xptifw_lib', "-L{} -I{} -lxptifw".format(xptifw_lib_dir, xptifw_includes)))
if cl_options:
config.substitutions.append(('%xptifw_lib', " {}/xpti.lib /I{} ".format(xptifw_lib_dir, xptifw_includes)))
else:
config.substitutions.append(('%xptifw_lib', " {}/xpti.lib -I{} ".format(xptifw_lib_dir, xptifw_includes)))


llvm_tools = ["llvm-spirv", "llvm-link"]
Expand Down