Skip to content

[SYCL][XPTI] Add unique queue ID to trace #11548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Oct 26, 2023

Conversation

KseniyaTikhomirova
Copy link
Contributor

No description provided.

@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 16, 2023 10:54 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 16, 2023 11:16 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 10:40 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 10:48 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 11:12 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 12:24 — with GitHub Actions Inactive
@KseniyaTikhomirova
Copy link
Contributor Author

KseniyaTikhomirova commented Oct 23, 2023

sycl-trace run example:

bash-5.1$ ./build/bin/sycl-trace --sycl --print-format=verbose ./a.out
[SYCL] Queue create:
queue_handle: 0x1b11a18
queue_id: 0
is_inorder: 1
sycl_device: 0x1c3fba8
sycl_device_name: Intel(R) Xeon(R) Platinum 8380 CPU @ 2.30GHz
sycl_context: 0x1a97728
[SYCL] Queue create:
queue_id: 1
is_inorder: 0
sycl_device: 0
sycl_device_name: SYCL host device
sycl_context: 0
[SYCL] Queue destroy:
queue_handle: 0x1b11a18
queue_id: 0
[SYCL] Queue destroy:
queue_id: 1

@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 12:47 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 23, 2023 15:47 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 24, 2023 15:09 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 24, 2023 16:03 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 24, 2023 16:44 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 11:57 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 12:12 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova marked this pull request as ready for review October 25, 2023 12:17
@KseniyaTikhomirova KseniyaTikhomirova requested a review from a team as a code owner October 25, 2023 12:17
@KseniyaTikhomirova KseniyaTikhomirova requested review from sergey-semenov and tovinkere and removed request for sergey-semenov October 25, 2023 12:17
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 12:35 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 15:06 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 15:42 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
Copy link
Contributor

@tovinkere tovinkere left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -448,7 +453,7 @@ void *queue_impl::instrumentationProlog(const detail::code_location &CodeLoc,
DevStr = "ACCELERATOR";
else
DevStr = "UNKNOWN";
xpti::addMetadata(WaitEvent, "sycl_device", DevStr);
xpti::addMetadata(WaitEvent, "sycl_device_type", DevStr);
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

@@ -231,10 +192,18 @@ class queue_impl {
MDevice->is_host() ? 0 : MDevice->getHandleRef()));
}
xpti::addMetadata(TEvent, "is_inorder", MIsInorder);
xpti::addMetadata(TEvent, "queue_id", MQueueID);
if (!MHostQueue)
xpti::addMetadata(PrepareNotify.traceEvent(), "queue_handle",
Copy link
Contributor

Choose a reason for hiding this comment

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

Please replace "PrepareNotify.traceEvent()" with "TEvent" and avoid a function call

Copy link
Contributor Author

Choose a reason for hiding this comment

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

xpti::addMetadata(TEvent, "is_inorder", MIsInorder);
xpti::addMetadata(TEvent, "queue_id", MQueueID);
if (!MHostQueue)
xpti::addMetadata(PrepareNotify.traceEvent(), "queue_handle",
Copy link
Contributor

Choose a reason for hiding this comment

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

Replace PrepareNotify.traceEvent() with TEvent

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 17:15 — with GitHub Actions Inactive
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 17:44 — with GitHub Actions Inactive
@KseniyaTikhomirova KseniyaTikhomirova temporarily deployed to WindowsCILock October 25, 2023 18:57 — with GitHub Actions Inactive
@@ -0,0 +1,189 @@
//==------------ NodeCreation.cpp --- XPTI integration unit tests ----------==//
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
//==------------ NodeCreation.cpp --- XPTI integration unit tests ----------==//
//==------------ QueueIDCheck.cpp --- XPTI integration unit tests ----------==//

Not blocking

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixing here #11690

@againull againull merged commit da4b83c into intel:sycl Oct 26, 2023
@againull
Copy link
Contributor

@KseniyaTikhomirova Could you please fix post-commit failures after your commit: https://github.com/intel/llvm/actions/runs/6658855529/job/18096640484

@againull
Copy link
Contributor

@KseniyaTikhomirova Could you please fix post-commit failures after your commit: https://github.com/intel/llvm/actions/runs/6658855529/job/18096640484

Fixed here #11682

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants