Skip to content

Commit 35cb8c7

Browse files
committed
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: f94909c ("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 <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 1aa77e7 commit 35cb8c7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tools/arch/x86/lib/memcpy_64.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SYM_FUNC_START_WEAK(memcpy)
3939
rep movsq
4040
movl %edx, %ecx
4141
rep movsb
42-
ret
42+
RET
4343
SYM_FUNC_END(memcpy)
4444
SYM_FUNC_END_ALIAS(__memcpy)
4545
EXPORT_SYMBOL(memcpy)
@@ -53,7 +53,7 @@ SYM_FUNC_START_LOCAL(memcpy_erms)
5353
movq %rdi, %rax
5454
movq %rdx, %rcx
5555
rep movsb
56-
ret
56+
RET
5757
SYM_FUNC_END(memcpy_erms)
5858

5959
SYM_FUNC_START_LOCAL(memcpy_orig)
@@ -137,7 +137,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig)
137137
movq %r9, 1*8(%rdi)
138138
movq %r10, -2*8(%rdi, %rdx)
139139
movq %r11, -1*8(%rdi, %rdx)
140-
retq
140+
RET
141141
.p2align 4
142142
.Lless_16bytes:
143143
cmpl $8, %edx
@@ -149,7 +149,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig)
149149
movq -1*8(%rsi, %rdx), %r9
150150
movq %r8, 0*8(%rdi)
151151
movq %r9, -1*8(%rdi, %rdx)
152-
retq
152+
RET
153153
.p2align 4
154154
.Lless_8bytes:
155155
cmpl $4, %edx
@@ -162,7 +162,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig)
162162
movl -4(%rsi, %rdx), %r8d
163163
movl %ecx, (%rdi)
164164
movl %r8d, -4(%rdi, %rdx)
165-
retq
165+
RET
166166
.p2align 4
167167
.Lless_3bytes:
168168
subl $1, %edx
@@ -180,7 +180,7 @@ SYM_FUNC_START_LOCAL(memcpy_orig)
180180
movb %cl, (%rdi)
181181

182182
.Lend:
183-
retq
183+
RET
184184
SYM_FUNC_END(memcpy_orig)
185185

186186
.popsection

tools/arch/x86/lib/memset_64.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SYM_FUNC_START(__memset)
4040
movl %edx,%ecx
4141
rep stosb
4242
movq %r9,%rax
43-
ret
43+
RET
4444
SYM_FUNC_END(__memset)
4545
SYM_FUNC_END_ALIAS(memset)
4646
EXPORT_SYMBOL(memset)
@@ -63,7 +63,7 @@ SYM_FUNC_START_LOCAL(memset_erms)
6363
movq %rdx,%rcx
6464
rep stosb
6565
movq %r9,%rax
66-
ret
66+
RET
6767
SYM_FUNC_END(memset_erms)
6868

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

126126
.Lende:
127127
movq %r10,%rax
128-
ret
128+
RET
129129

130130
.Lbad_alignment:
131131
cmpq $7,%rdx

0 commit comments

Comments
 (0)