Commit 8f6ee51d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.5-20191119' of... 

Merge tag 'perf-core-for-mingo-5.5-20191119' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

x86/insn:

  Adrian Hunter:

  - Add some more Intel instructions to the opcode map:

        cldemote, encls, enclu, enclv, enqcmd, enqcmds, movdir64b,
        movdiri, pconfig, tpause, umonitor, umwait, wbnoinvd.

  - The instruction decoding can be tested using the perf tools'
    "x86 instruction decoder - new instructions" test as folllows:

    $ perf test -v "new " 2>&1 | grep -i cldemote
    Decoded ok: 0f 1c 00                    cldemote (%eax)
    Decoded ok: 0f 1c 05 78 56 34 12        cldemote 0x12345678
    Decoded ok: 0f 1c 84 c8 78 56 34 12     cldemote 0x12345678(%eax,%ecx,8)
    Decoded ok: 0f 1c 00                    cldemote (%rax)
    Decoded ok: 41 0f 1c 00                 cldemote (%r8)
    Decoded ok: 0f 1c 04 25 78 56 34 12     cldemote 0x12345678
    Decoded ok: 0f 1c 84 c8 78 56 34 12     cldemote 0x12345678(%rax,%rcx,8)
    Decoded ok: 41 0f 1c 84 c8 78 56 34 12  cldemote 0x12345678(%r8,%rcx,8)
    $ perf test -v "new " 2>&1 | grep -i tpause
    Decoded ok: 66 0f ae f3                 tpause %ebx
    Decoded ok: 66 0f ae f3                 tpause %ebx
    Decoded ok: 66 41 0f ae f0              tpause %r8d

callchains:

  Adrian Hunter:

  - Fix segfault in thread__resolve_callchain_sample().

perf probe:

  - Line fixes to show only lines where probes can be used with 'perf probe -L',
    and when reporting them via 'perf probe -l'.

  - Support multiprobe events.

perf scripts python:

  Adrian Hunter:

  - Fix use of TRUE with SQLite < 3.23 in exported-sql-viewer.py.

perf maps:

  - Trim 'struct map' by removing the rb_node member for sorting
    by map name, as that is only needed for processing kernel maps,
    and only when classifying symbols by section at load time.
    Sort them by name using qsort() and do lookups using bsearch()
    when map_groups__find_by_name() is used.

perf parse:

  Ian Rogers:

  - Report initial event parsing error, providing a less cryptic message
    to state that a PMU wasn't found in the system.

perf vendor events:

  James Clark:

  - Fix commas so that PMU event files for arm64, power8 and power nine
    become valid JSON.

libtraceevent:

  Konstantin Khlebnikov:

  - Fix parsing of event %o and %X argument types.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b0aeb45b a910e466

arch/x86/lib/x86-opcode-map.txt

+12 −6
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ AVXcode: 1 
06: CLTS

07: SYSRET (o64)

08: INVD

09: WBINVD

09: WBINVD | WBNOINVD (F3)

0a:

0b: UD2 (1B)

0c:
@@ -364,7 +364,7 @@ AVXcode: 1 
# a ModR/M byte.

1a: BNDCL Gv,Ev (F3) | BNDCU Gv,Ev (F2) | BNDMOV Gv,Ev (66) | BNDLDX Gv,Ev

1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv

1c:

1c: Grp20 (1A),(1C)

1d:

1e:

1f: NOP Ev
@@ -792,6 +792,8 @@ f3: Grp17 (1A) 
f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v)

f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v)

f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v)

f8: MOVDIR64B Gv,Mdqq (66) | ENQCMD Gv,Mdqq (F2) | ENQCMDS Gv,Mdqq (F3)

f9: MOVDIRI My,Gy

EndTable



Table: 3-byte opcode 2 (0x0f 0x3a)
@@ -943,9 +945,9 @@ GrpTable: Grp6 
EndTable



GrpTable: Grp7

0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B)

1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B)

2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B)

0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B)

1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B)

2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B)

3: LIDT Ms

4: SMSW Mw/Rv

5: rdpkru (110),(11B) | wrpkru (111),(11B)
@@ -1020,7 +1022,7 @@ GrpTable: Grp15 
3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B)

4: XSAVE | ptwrite Ey (F3),(11B)

5: XRSTOR | lfence (11B)

6: XSAVEOPT | clwb (66) | mfence (11B)

6: XSAVEOPT | clwb (66) | mfence (11B) | TPAUSE Rd (66),(11B) | UMONITOR Rv (F3),(11B) | UMWAIT Rd (F2),(11B)

7: clflush | clflushopt (66) | sfence (11B)

EndTable
@@ -1051,6 +1053,10 @@ GrpTable: Grp19 
6: vscatterpf1qps/d Wx (66),(ev)

EndTable



GrpTable: Grp20

0: cldemote Mb

EndTable



# AMD's Prefetch Group

GrpTable: GrpP

0: PREFETCH

tools/arch/x86/lib/x86-opcode-map.txt

+12 −6
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ AVXcode: 1 
06: CLTS

07: SYSRET (o64)

08: INVD

09: WBINVD

09: WBINVD | WBNOINVD (F3)

0a:

0b: UD2 (1B)

0c:
@@ -364,7 +364,7 @@ AVXcode: 1 
# a ModR/M byte.

1a: BNDCL Gv,Ev (F3) | BNDCU Gv,Ev (F2) | BNDMOV Gv,Ev (66) | BNDLDX Gv,Ev

1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv

1c:

1c: Grp20 (1A),(1C)

1d:

1e:

1f: NOP Ev
@@ -792,6 +792,8 @@ f3: Grp17 (1A) 
f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v)

f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v)

f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v)

f8: MOVDIR64B Gv,Mdqq (66) | ENQCMD Gv,Mdqq (F2) | ENQCMDS Gv,Mdqq (F3)

f9: MOVDIRI My,Gy

EndTable



Table: 3-byte opcode 2 (0x0f 0x3a)
@@ -943,9 +945,9 @@ GrpTable: Grp6 
EndTable



GrpTable: Grp7

0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B)

1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B)

2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B)

0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B)

1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B)

2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B)

3: LIDT Ms

4: SMSW Mw/Rv

5: rdpkru (110),(11B) | wrpkru (111),(11B)
@@ -1020,7 +1022,7 @@ GrpTable: Grp15 
3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B)

4: XSAVE | ptwrite Ey (F3),(11B)

5: XRSTOR | lfence (11B)

6: XSAVEOPT | clwb (66) | mfence (11B)

6: XSAVEOPT | clwb (66) | mfence (11B) | TPAUSE Rd (66),(11B) | UMONITOR Rv (F3),(11B) | UMWAIT Rd (F2),(11B)

7: clflush | clflushopt (66) | sfence (11B)

EndTable
@@ -1051,6 +1053,10 @@ GrpTable: Grp19 
6: vscatterpf1qps/d Wx (66),(ev)

EndTable



GrpTable: Grp20

0: cldemote Mb

EndTable



# AMD's Prefetch Group

GrpTable: GrpP

0: PREFETCH

tools/lib/traceevent/event-parse.c

+5 −2
Original line number Diff line number Diff line
@@ -4395,8 +4395,10 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s 
				/* fall through */

			case 'd':

			case 'u':

			case 'x':

			case 'i':

			case 'x':

			case 'X':

			case 'o':

				switch (ls) {

				case 0:

					vsize = 4;
@@ -5078,10 +5080,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e 


				/* fall through */

			case 'd':

			case 'u':

			case 'i':

			case 'x':

			case 'X':

			case 'u':

			case 'o':

				if (!arg) {

					do_warning_event(event, "no argument match");

					event->flags |= TEP_EVENT_FL_FAILED;

tools/perf/arch/powerpc/util/kvm-stat.c

+2 −2
Original line number Diff line number Diff line
@@ -113,10 +113,10 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist) 
	struct parse_events_error err;

	int ret;



	err.str = NULL;

	bzero(&err, sizeof(err));

	ret = parse_events(evlist, str, &err);

	if (err.str)

		pr_err("%s : %s\n", str, err.str);

		parse_events_print_error(&err, "tracepoint");

	return ret;

}

tools/perf/arch/x86/tests/insn-x86-dat-32.c

+52 −0
Original line number Diff line number Diff line
@@ -1647,6 +1647,12 @@ 
"0f ae 30             \txsaveopt (%eax)",},

{{0x0f, 0xae, 0xf0, }, 3, 0, "", "",

"0f ae f0             \tmfence ",},

{{0x0f, 0x1c, 0x00, }, 3, 0, "", "",

"0f 1c 00             \tcldemote (%eax)",},

{{0x0f, 0x1c, 0x05, 0x78, 0x56, 0x34, 0x12, }, 7, 0, "", "",

"0f 1c 05 78 56 34 12 \tcldemote 0x12345678",},

{{0x0f, 0x1c, 0x84, 0xc8, 0x78, 0x56, 0x34, 0x12, }, 8, 0, "", "",

"0f 1c 84 c8 78 56 34 12 \tcldemote 0x12345678(%eax,%ecx,8)",},

{{0x0f, 0xc7, 0x20, }, 3, 0, "", "",

"0f c7 20             \txsavec (%eax)",},

{{0x0f, 0xc7, 0x25, 0x78, 0x56, 0x34, 0x12, }, 7, 0, "", "",
@@ -1677,3 +1683,49 @@ 
"f3 0f ae 25 78 56 34 12 \tptwritel 0x12345678",},

{{0xf3, 0x0f, 0xae, 0xa4, 0xc8, 0x78, 0x56, 0x34, 0x12, }, 9, 0, "", "",

"f3 0f ae a4 c8 78 56 34 12 \tptwritel 0x12345678(%eax,%ecx,8)",},

{{0x66, 0x0f, 0xae, 0xf3, }, 4, 0, "", "",

"66 0f ae f3          \ttpause %ebx",},

{{0x67, 0xf3, 0x0f, 0xae, 0xf0, }, 5, 0, "", "",

"67 f3 0f ae f0       \tumonitor %ax",},

{{0xf3, 0x0f, 0xae, 0xf0, }, 4, 0, "", "",

"f3 0f ae f0          \tumonitor %eax",},

{{0xf2, 0x0f, 0xae, 0xf0, }, 4, 0, "", "",

"f2 0f ae f0          \tumwait %eax",},

{{0x0f, 0x38, 0xf9, 0x03, }, 4, 0, "", "",

"0f 38 f9 03          \tmovdiri %eax,(%ebx)",},

{{0x0f, 0x38, 0xf9, 0x88, 0x78, 0x56, 0x34, 0x12, }, 8, 0, "", "",

"0f 38 f9 88 78 56 34 12 \tmovdiri %ecx,0x12345678(%eax)",},

{{0x66, 0x0f, 0x38, 0xf8, 0x18, }, 5, 0, "", "",

"66 0f 38 f8 18       \tmovdir64b (%eax),%ebx",},

{{0x66, 0x0f, 0x38, 0xf8, 0x88, 0x78, 0x56, 0x34, 0x12, }, 9, 0, "", "",

"66 0f 38 f8 88 78 56 34 12 \tmovdir64b 0x12345678(%eax),%ecx",},

{{0x67, 0x66, 0x0f, 0x38, 0xf8, 0x1c, }, 6, 0, "", "",

"67 66 0f 38 f8 1c    \tmovdir64b (%si),%bx",},

{{0x67, 0x66, 0x0f, 0x38, 0xf8, 0x8c, 0x34, 0x12, }, 8, 0, "", "",

"67 66 0f 38 f8 8c 34 12 \tmovdir64b 0x1234(%si),%cx",},

{{0xf2, 0x0f, 0x38, 0xf8, 0x18, }, 5, 0, "", "",

"f2 0f 38 f8 18       \tenqcmd (%eax),%ebx",},

{{0xf2, 0x0f, 0x38, 0xf8, 0x88, 0x78, 0x56, 0x34, 0x12, }, 9, 0, "", "",

"f2 0f 38 f8 88 78 56 34 12 \tenqcmd 0x12345678(%eax),%ecx",},

{{0x67, 0xf2, 0x0f, 0x38, 0xf8, 0x1c, }, 6, 0, "", "",

"67 f2 0f 38 f8 1c    \tenqcmd (%si),%bx",},

{{0x67, 0xf2, 0x0f, 0x38, 0xf8, 0x8c, 0x34, 0x12, }, 8, 0, "", "",

"67 f2 0f 38 f8 8c 34 12 \tenqcmd 0x1234(%si),%cx",},

{{0xf3, 0x0f, 0x38, 0xf8, 0x18, }, 5, 0, "", "",

"f3 0f 38 f8 18       \tenqcmds (%eax),%ebx",},

{{0xf3, 0x0f, 0x38, 0xf8, 0x88, 0x78, 0x56, 0x34, 0x12, }, 9, 0, "", "",

"f3 0f 38 f8 88 78 56 34 12 \tenqcmds 0x12345678(%eax),%ecx",},

{{0x67, 0xf3, 0x0f, 0x38, 0xf8, 0x1c, }, 6, 0, "", "",

"67 f3 0f 38 f8 1c    \tenqcmds (%si),%bx",},

{{0x67, 0xf3, 0x0f, 0x38, 0xf8, 0x8c, 0x34, 0x12, }, 8, 0, "", "",

"67 f3 0f 38 f8 8c 34 12 \tenqcmds 0x1234(%si),%cx",},

{{0x0f, 0x01, 0xcf, }, 3, 0, "", "",

"0f 01 cf             \tencls  ",},

{{0x0f, 0x01, 0xd7, }, 3, 0, "", "",

"0f 01 d7             \tenclu  ",},

{{0x0f, 0x01, 0xc0, }, 3, 0, "", "",

"0f 01 c0             \tenclv  ",},

{{0x0f, 0x01, 0xc5, }, 3, 0, "", "",

"0f 01 c5             \tpconfig ",},

{{0xf3, 0x0f, 0x09, }, 3, 0, "", "",

"f3 0f 09             \twbnoinvd ",},

CRA Git | Maintained and supported by SUSTech CRA and CCSE