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

Commit 4f1fd32

Browse files
author
Alexander Batashev
committed
update test
1 parent 9b7519b commit 4f1fd32

File tree

2 files changed

+50
-39
lines changed

2 files changed

+50
-39
lines changed

‎SYCL/XPTI/basic_event_collection.cpp

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: xptifw, opencl
2-
// RUN: %clangxx %s -DXPTI_COLLECTOR -L%xptifw_lib -I%xptifw_includes -shared -fPIC -std=c++17 -o %t_collector.dll -lxptifw
2+
// RUN: %clangxx %s -DXPTI_COLLECTOR -L%xptifw_lib -I%xptifw_includes -shared %fPIC -std=c++17 -o %t_collector.dll -lxptifw
33
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out
44
// 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
55

@@ -36,80 +36,93 @@ int main() {
3636

3737
#endif
3838

39-
// CHECK: xptiTraceInit: Stream Name = sycl
39+
// CHECK: xptiTraceInit: Stream Name = sycl
4040
// CHECK-NEXT: Graph create
4141
// CHECK-NEXT: xptiTraceInit: Stream Name = sycl.pi
4242
// CHECK-NEXT: xptiTraceInit: Stream Name = sycl.pi.debug
4343
// CHECK-NEXT: PI Call Begin : piPlatformsGet
4444
// CHECK-NEXT: PI Call Begin : piPlatformsGet
45-
// CHECK: PI Call Begin : piContextCreate
45+
// CHECK-NEXT: PI Call Begin : piDevicesGet
46+
// CHECK-NEXT: PI Call Begin : piDevicesGet
47+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
48+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
49+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
50+
// CHECK-NEXT: PI Call Begin : piDeviceRetain
51+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
52+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
53+
// CHECK-NEXT: PI Call Begin : piPlatformGetInfo
54+
// CHECK-NEXT: PI Call Begin : piPlatformGetInfo
55+
// CHECK-NEXT: PI Call Begin : piDeviceRelease
56+
// CHECK-NEXT: PI Call Begin : piDevicesGet
57+
// CHECK-NEXT: PI Call Begin : piDevicesGet
58+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
59+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
60+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
61+
// CHECK-NEXT: PI Call Begin : piDeviceRetain
62+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
63+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
64+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
65+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
66+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
67+
// CHECK-NEXT: PI Call Begin : piDevicesGet
68+
// CHECK-NEXT: PI Call Begin : piDevicesGet
69+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
70+
// CHECK-NEXT: PI Call Begin : piContextCreate
4671
// CHECK-NEXT: PI Call Begin : piQueueCreate
4772
// CHECK-NEXT: PI Call Begin : piextUSMDeviceAlloc
4873
// CHECK-NEXT: PI Call Begin : piextDeviceSelectBinary
49-
// CHECK-NEXT: Node create
50-
// CHECK-NEXT: from_source : false
51-
// CHECK-NEXT: kernel_name :
52-
// CHECK-NEXT: sycl_device : CPU
53-
// CHECK-NEXT: Task begin
54-
// CHECK-NEXT: from_source : false
55-
// CHECK-NEXT: kernel_name :
56-
// CHECK-NEXT: sycl_device : CPU
57-
// CHECK-NEXT: PI Call Begin : piextDeviceSelectBinary
58-
// CHECK: PI Call Begin : piProgramCreate
59-
// CHECK-NEXT: PI Call Begin : piProgramBuild
74+
// CHECK-NEXT: PI Call Begin : piDeviceGetInfo
6075
// CHECK: PI Call Begin : piKernelCreate
6176
// CHECK-NEXT: PI Call Begin : piKernelSetExecInfo
6277
// CHECK-NEXT: PI Call Begin : piextKernelSetArgPointer
6378
// CHECK-NEXT: PI Call Begin : piKernelGetGroupInfo
6479
// CHECK-NEXT: PI Call Begin : piEnqueueKernelLaunch
65-
// CHECK-NEXT: Signal
66-
// CHECK-NEXT: from_source : false
67-
// CHECK-NEXT: kernel_name :
68-
// CHECK-NEXT: sycl_device : CPU
69-
// CHECK-NEXT: Task end
70-
// CHECK-NEXT: from_source : false
71-
// CHECK-NEXT: kernel_name :
72-
// CHECK-NEXT: sycl_device : CPU
73-
// CHECK: PI Call Begin : piextDeviceSelectBinary
7480
// CHECK-NEXT: Node create
81+
// CHECK-NEXT: sym_line_no : 21
82+
// CHECK-NEXT: sym_source_file_name : {{.*}}
83+
// CHECK-NEXT: sym_function_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
7584
// CHECK-NEXT: from_source : false
76-
// CHECK-NEXT: kernel_name :
85+
// CHECK-NEXT: kernel_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
7786
// CHECK-NEXT: sycl_device : CPU
7887
// CHECK-NEXT: Node create
79-
// CHECK-NEXT: kernel_name : virtual_node
88+
// CHECK-NEXT: kernel_name : virtual_node[{{.*}}]
8089
// CHECK-NEXT: Edge create
81-
// CHECK-NEXT: event : Event
82-
// CHECK-NEXT: kernel_name : virtual_node
90+
// CHECK-NEXT: event : Event[{{.*}}]
8391
// CHECK-NEXT: Task begin
92+
// CHECK-NEXT: sym_line_no : 21
93+
// CHECK-NEXT: sym_source_file_name : {{.*}}
94+
// CHECK-NEXT: sym_function_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
8495
// CHECK-NEXT: from_source : false
85-
// CHECK-NEXT: kernel_name :
96+
// CHECK-NEXT: kernel_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
8697
// CHECK-NEXT: sycl_device : CPU
8798
// CHECK-NEXT: PI Call Begin : piKernelCreate
8899
// CHECK-NEXT: PI Call Begin : piKernelSetExecInfo
89100
// CHECK-NEXT: PI Call Begin : piextKernelSetArgPointer
90101
// CHECK-NEXT: PI Call Begin : piKernelGetGroupInfo
91102
// CHECK-NEXT: PI Call Begin : piEnqueueKernelLaunch
92103
// CHECK-NEXT: Signal
104+
// CHECK-NEXT: sym_line_no : 21
105+
// CHECK-NEXT: sym_source_file_name : {{.*}}
106+
// CHECK-NEXT: sym_function_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
93107
// CHECK-NEXT: from_source : false
94-
// CHECK-NEXT: kernel_name :
108+
// CHECK-NEXT: kernel_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
95109
// CHECK-NEXT: sycl_device : CPU
96110
// CHECK-NEXT: Task end
111+
// CHECK-NEXT: sym_line_no : 21
112+
// CHECK-NEXT: sym_source_file_name : {{.*}}
113+
// CHECK-NEXT: sym_function_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
97114
// CHECK-NEXT: from_source : false
98-
// CHECK-NEXT: kernel_name :
115+
// CHECK-NEXT: kernel_name : typeinfo name for main::{lambda(cl::sycl::handler&)#1}::operator()(cl::sycl::handler&) const::{lambda()#1}
99116
// CHECK-NEXT: sycl_device : CPU
100-
// CHECK: Wait begin
117+
// CHECK-NEXT: Wait begin
101118
// CHECK-NEXT: PI Call Begin : piEventsWait
102119
// CHECK-NEXT: Wait end
103120
// CHECK-NEXT: PI Call Begin : piextUSMEnqueueMemcpy
104121
// CHECK-NEXT: PI Call Begin : piEventRelease
105122
// CHECK-NEXT: Wait begin
106-
// CHECK-NEXT: sym_line_no : 30
107-
// CHECK-NEXT: sym_function_name : main
108123
// CHECK-NEXT: sycl_device : CPU
109124
// CHECK-NEXT: PI Call Begin : piQueueFinish
110125
// CHECK-NEXT: Wait end
111-
// CHECK-NEXT: sym_line_no : 30
112-
// CHECK-NEXT: sym_function_name : main
113126
// CHECK-NEXT: sycl_device : CPU
114127
// CHECK-NEXT: PI Call Begin : piEventRelease
115128
// CHECK-NEXT: PI Call Begin : piEventRelease
@@ -120,6 +133,3 @@ int main() {
120133
// CHECK-NEXT: PI Call Begin : piProgramRelease
121134
// CHECK-NEXT: PI Call Begin : piDeviceRelease
122135
// CHECK-NEXT: PI Call Begin : piTearDown
123-
// CHECK-NEXT: xptiTraceFinish: Stream Name = sycl.pi
124-
// CHECK-NEXT: xptiTraceFinish: Stream Name = sycl.pi.debug
125-
// CHECK-NEXT: xptiTraceFinish: Stream Name = sycl

‎SYCL/lit.cfg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,14 @@
142142
config.substitutions.append( ('%include_option', '/FI' ) )
143143
config.substitutions.append( ('%debug_option', '/DEBUG' ) )
144144
config.substitutions.append( ('%cxx_std_option', '/std:' ) )
145+
config.substitutions.append( ('%fPIC', '') )
145146
else:
146147
config.substitutions.append( ('%sycl_options', ' -lsycl -I' +
147148
config.sycl_include + ' -I' + os.path.join(config.sycl_include, 'sycl')) )
148149
config.substitutions.append( ('%include_option', '-include' ) )
149150
config.substitutions.append( ('%debug_option', '-g' ) )
150151
config.substitutions.append( ('%cxx_std_option', '-std=' ) )
152+
config.substitutions.append( ('%fPIC', '-fPIC') )
151153

152154
if not config.gpu_aot_target_opts:
153155
config.gpu_aot_target_opts = '"-device *"'
@@ -326,7 +328,6 @@
326328
if find_executable('sycl-ls'):
327329
config.available_features.add('sycl-ls')
328330

329-
<<<<<<< HEAD
330331
# TODO properly set XPTIFW include and runtime dirs
331332
xptifw_lib = os.path.join(config.dpcpp_root_dir, 'lib')
332333
xptifw_dispatcher = ""

0 commit comments

Comments
 (0)