Commit 35cb8c71 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy' 



To bring in the change made in this cset:

  f94909ce ("x86: Prepare asm files for straight-line-speculation")

It silences these perf tools build warnings, no change in the tools:

  Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S'
  diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S
  Warning: Kernel ABI header at 'tools/arch/x86/lib/memset_64.S' differs from latest version at 'arch/x86/lib/memset_64.S'
  diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S

The code generated was checked before and after using 'objdump -d /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o',
no changes.

Cc: Borislav Petkov <bp@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1aa77e71

tools/arch/x86/lib/memcpy_64.S

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ SYM_FUNC_START_WEAK(memcpy) 
	rep movsq

	movl %edx, %ecx

	rep movsb

	ret

	RET

SYM_FUNC_END(memcpy)

SYM_FUNC_END_ALIAS(__memcpy)

EXPORT_SYMBOL(memcpy)
@@ -53,7 +53,7 @@ SYM_FUNC_START_LOCAL(memcpy_erms) 
	movq %rdi, %rax

	movq %rdx, %rcx

	rep movsb

	ret

	RET

SYM_FUNC_END(memcpy_erms)



SYM_FUNC_START_LOCAL(memcpy_orig)
@@ -137,7 +137,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig) 
	movq %r9,	1*8(%rdi)

	movq %r10,	-2*8(%rdi, %rdx)

	movq %r11,	-1*8(%rdi, %rdx)

	retq

	RET

	.p2align 4

.Lless_16bytes:

	cmpl $8,	%edx
@@ -149,7 +149,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig) 
	movq -1*8(%rsi, %rdx),	%r9

	movq %r8,	0*8(%rdi)

	movq %r9,	-1*8(%rdi, %rdx)

	retq

	RET

	.p2align 4

.Lless_8bytes:

	cmpl $4,	%edx
@@ -162,7 +162,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig) 
	movl -4(%rsi, %rdx), %r8d

	movl %ecx, (%rdi)

	movl %r8d, -4(%rdi, %rdx)

	retq

	RET

	.p2align 4

.Lless_3bytes:

	subl $1, %edx
@@ -180,7 +180,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig) 
	movb %cl, (%rdi)



.Lend:

	retq

	RET

SYM_FUNC_END(memcpy_orig)



.popsection

tools/arch/x86/lib/memset_64.S

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ SYM_FUNC_START(__memset) 
	movl %edx,%ecx

	rep stosb

	movq %r9,%rax

	ret

	RET

SYM_FUNC_END(__memset)

SYM_FUNC_END_ALIAS(memset)

EXPORT_SYMBOL(memset)
@@ -63,7 +63,7 @@ SYM_FUNC_START_LOCAL(memset_erms) 
	movq %rdx,%rcx

	rep stosb

	movq %r9,%rax

	ret

	RET

SYM_FUNC_END(memset_erms)



SYM_FUNC_START_LOCAL(memset_orig)
@@ -125,7 +125,7 @@ SYM_FUNC_START_LOCAL(memset_orig) 


.Lende:

	movq	%r10,%rax

	ret

	RET



.Lbad_alignment:

	cmpq $7,%rdx