From owner-svn-src-all@freebsd.org Mon May 7 15:07:29 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B222FB42A1; Mon, 7 May 2018 15:07:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48FEB7C30B; Mon, 7 May 2018 15:07:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2BA301CE9E; Mon, 7 May 2018 15:07:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w47F7TrQ035074; Mon, 7 May 2018 15:07:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w47F7SOs035073; Mon, 7 May 2018 15:07:28 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201805071507.w47F7SOs035073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Mon, 7 May 2018 15:07:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333324 - in head/sys: amd64/amd64 conf X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: amd64/amd64 conf X-SVN-Commit-Revision: 333324 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2018 15:07:30 -0000 Author: mjg Date: Mon May 7 15:07:28 2018 New Revision: 333324 URL: https://svnweb.freebsd.org/changeset/base/333324 Log: amd64: replace libkern's memset and memmove with assembly variants memmove is repurposed bcopy (arguments swapped, return value added) The libkern variant is a wrapper around bcopy, so this is a big improvement. memset is repurposed memcpy. The librkern variant is doing fishy stuff, including branching on 0 and calling bzero. Both functions are rather crude and subject to partial depessimization. This is a soft prerequisite to adding variants utilizing the 'Enhanced REP MOVSB/STOSB' bit and let the kernel patch at runtime. Modified: head/sys/amd64/amd64/support.S head/sys/conf/files.amd64 Modified: head/sys/amd64/amd64/support.S ============================================================================== --- head/sys/amd64/amd64/support.S Mon May 7 15:07:26 2018 (r333323) +++ head/sys/amd64/amd64/support.S Mon May 7 15:07:28 2018 (r333324) @@ -162,6 +162,58 @@ ENTRY(bcopy) END(bcopy) /* + * memmove(dst, src, cnt) + * rdi, rsi, rdx + * Original by: + * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 + */ +ENTRY(memmove) + PUSH_FRAME_POINTER + movq %rdi,%r9 + movq %rdx,%rcx + + movq %rdi,%rax + subq %rsi,%rax + cmpq %rcx,%rax /* overlapping && src < dst? */ + jb 1f + + shrq $3,%rcx /* copy by 64-bit words */ + rep + movsq + movq %rdx,%rcx + andq $7,%rcx /* any bytes left? */ + rep + movsb + movq %r9,%rax + POP_FRAME_POINTER + ret + + /* ALIGN_TEXT */ +1: + addq %rcx,%rdi /* copy backwards */ + addq %rcx,%rsi + decq %rdi + decq %rsi + andq $7,%rcx /* any fractional bytes? */ + std + rep + movsb + movq %rdx,%rcx /* copy remainder by 32-bit words */ + shrq $3,%rcx + subq $7,%rsi + subq $7,%rdi + rep + movsq + cld + movq %r9,%rax + POP_FRAME_POINTER + ret +END(memmove) + +/* + * memcpy(dst, src, len) + * rdi, rsi, rdx + * * Note: memcpy does not support overlapping copies */ ENTRY(memcpy) @@ -178,6 +230,27 @@ ENTRY(memcpy) POP_FRAME_POINTER ret END(memcpy) + +/* + * memset(dst, c, len) + * rdi, rsi, rdx + */ +ENTRY(memset) + PUSH_FRAME_POINTER + movq %rdi,%r9 + movq %rdx,%rcx + movq %rsi,%rax + shrq $3,%rcx + rep + stosq + movq %rdx,%rcx + andq $7,%rcx + rep + stosb + movq %r9,%rax + POP_FRAME_POINTER + ret +END(memset) /* * pagecopy(%rdi=from, %rsi=to) Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Mon May 7 15:07:26 2018 (r333323) +++ head/sys/conf/files.amd64 Mon May 7 15:07:28 2018 (r333324) @@ -620,8 +620,6 @@ isa/vga_isa.c optional vga kern/kern_clocksource.c standard kern/link_elf_obj.c standard libkern/x86/crc32_sse42.c standard -libkern/memmove.c standard -libkern/memset.c standard # # IA32 binary support #