Skip to content
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.

Sign up for GitHub

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

Correctly annotate jitdump stack frames #202

Merged
merged 3 commits into from
Dec 27, 2020
Merged

Correctly annotate jitdump stack frames #202

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abad2e5
Correctly annotate jitdump stack frames
asherkin Dec 27, 2020
40a6581
Add test for perf jitdump parsing
asherkin Dec 27, 2020
7e2da84
Add changelog entry
asherkin Dec 27, 2020
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
4 changes: 2 additions & 2 deletions src/collapse/perf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ impl Folder {
} else if self.opt.annotate_kernel && is_kernel(module) {
func.push_str("_[k]"); // kernel
} else if self.opt.annotate_jit
&& module.starts_with("/tmp/perf-")
&& module.ends_with(".map")
&& ((module.starts_with("/tmp/perf-") && module.ends_with(".map"))
|| (module.contains("/jitted-") && module.ends_with(".so")))
jonhoo marked this conversation as resolved.
Show resolved Hide resolved
{
func.push_str("_[j]"); // jitted
}
Expand Down
3 changes: 2 additions & 1 deletion tests/collapse-perf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ collapse_perf_tests! {
collapse_perf_single_event,
collapse_perf_go_stacks,
collapse_perf_java_inline,
collapse_perf_versioned_vmlinux__kernel
collapse_perf_versioned_vmlinux__kernel,
collapse_perf_sourcepawn_jitdump__jit
}

#[test]
Expand Down
1 change: 1 addition & 0 deletions tests/data/collapse-perf/results/sourcepawn-jitdump-collapsed-jit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spshell;__libc_start_main;main;Execute;sp::ScriptedInvoker::Invoke;sp::PluginContext::Invoke;sp::Environment::Invoke;<jit invoke stub>_[j];fib.smx::main_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j];fib.smx::fib_[j] 1
36 changes: 36 additions & 0 deletions tests/data/collapse-perf/sourcepawn-jitdump.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
spshell 31714 451945.594655: 22145531 cycles:
f719f4a4 fib.smx::fib+0x3c (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f50b fib.smx::fib+0xa3 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f54c fib.smx::fib+0xe4 (/tmp/jitted-31714-4145673320.so)
f719f119 fib.smx::main+0x91 (/tmp/jitted-31714-4145672328.so)
f719f06f <jit invoke stub>+0x27 (/tmp/jitted-31714-4145672264.so)
8059187 sp::Environment::Invoke+0x307 (/root/code/sourcepawn/build/vm/spshell/linux-x86/spshell)
806d5d8 sp::PluginContext::Invoke+0x378 (/root/code/sourcepawn/build/vm/spshell/linux-x86/spshell)
8078bcc sp::ScriptedInvoker::Invoke+0x60c (/root/code/sourcepawn/build/vm/spshell/linux-x86/spshell)
804b413 Execute+0x3d3 (/root/code/sourcepawn/build/vm/spshell/linux-x86/spshell)
804ae7e main+0x61e (/root/code/sourcepawn/build/vm/spshell/linux-x86/spshell)
f7abc8e9 __libc_start_main+0xf9 (/usr/lib/libc-2.29.so)