From owner-svn-src-head@freebsd.org Sat Oct 10 01:13:15 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94BE4433D31; Sat, 10 Oct 2020 01:13:15 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7RlH3Tslz3gm2; Sat, 10 Oct 2020 01:13:15 +0000 (UTC) (envelope-from emaste@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 5B3A2224EC; Sat, 10 Oct 2020 01:13:15 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09A1DF0N018924; Sat, 10 Oct 2020 01:13:15 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09A1DFUN018923; Sat, 10 Oct 2020 01:13:15 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202010100113.09A1DFUN018923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 10 Oct 2020 01:13:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366596 - head/sys/modules/crypto X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/modules/crypto X-SVN-Commit-Revision: 366596 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Oct 2020 01:13:15 -0000 Author: emaste Date: Sat Oct 10 01:13:14 2020 New Revision: 366596 URL: https://svnweb.freebsd.org/changeset/base/366596 Log: modules/crypto: reenable assembly optimized skein implementation r366344 corrected the optimized amd64 skein assembly implementation, so we can now enable it again. Also add a dependency on this Makefile for the skein_block object, so that it will be rebuit (similar to r366362). PR: 248221 Sponsored by: The FreeBSD Foundation Modified: head/sys/modules/crypto/Makefile Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Sat Oct 10 00:01:40 2020 (r366595) +++ head/sys/modules/crypto/Makefile Sat Oct 10 01:13:14 2020 (r366596) @@ -28,14 +28,18 @@ SRCS += sha1.c sha256c.c sha512c.c SRCS += skein.c skein_block.c # unroll the 256 and 512 loops, half unroll the 1024 CFLAGS.skein_block.c += -DSKEIN_LOOP=995 -#.if exists(${MACHINE_ARCH}/skein_block_asm.S) -#.PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -#SRCS += skein_block_asm.S -#CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 -#ACFLAGS += -DELF -Wa,--noexecstack -## Fully unroll all loops in the assembly optimized version -#ACFLAGS += -DSKEIN_LOOP=0 -#.endif +.if exists(${MACHINE_ARCH}/skein_block_asm.S) +.PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} +SRCS += skein_block_asm.S +CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 +ACFLAGS += -DELF -Wa,--noexecstack +# Fully unroll all loops in the assembly optimized version +ACFLAGS += -DSKEIN_LOOP=0 +# 20201002 Add explict Makefile dependency for reenabled assembly optimized +# version. SKEIN_USE_ASM determines which routines should come from the assembly +# vs C versions, and skein_block needs to be rebuilt if it changes. +skein_block.o: Makefile +.endif SRCS += siphash.c SRCS += gmac.c gfmult.c SRCS += blake2b-ref.c