Skip to content

Commit

Permalink
Revert "crypto: blowfish - add AVX2/x86_64 implementation of blowfish…
Browse files Browse the repository at this point in the history
… cipher"

This reverts commit 6048801.

Instruction (vpgatherdd) that this implementation relied on turned out to be
slow performer on real hardware (i5-4570). The previous 4-way blowfish
implementation is therefore faster and this implementation should be removed.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
jkivilin authored and herbertx committed Jun 21, 2013
1 parent acfffdb commit 3d387ef
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 1,119 deletions.
4 changes: 0 additions & 4 deletions arch/x86/crypto/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#

avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no)
avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\
$(comma)4)$(comma)%ymm2,yes,no)

obj-$(CONFIG_CRYPTO_ABLK_HELPER_X86) += ablk_helper.o
obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o
Expand Down Expand Up @@ -43,7 +41,6 @@ endif

# These modules require assembler to support AVX2.
ifeq ($(avx2_supported),yes)
obj-$(CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64) += blowfish-avx2.o
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
obj-$(CONFIG_CRYPTO_TWOFISH_AVX2_X86_64) += twofish-avx2.o
Expand Down Expand Up @@ -74,7 +71,6 @@ ifeq ($(avx_supported),yes)
endif

ifeq ($(avx2_supported),yes)
blowfish-avx2-y := blowfish-avx2-asm_64.o blowfish_avx2_glue.o
camellia-aesni-avx2-y := camellia-aesni-avx2-asm_64.o camellia_aesni_avx2_glue.o
serpent-avx2-y := serpent-avx2-asm_64.o serpent_avx2_glue.o
twofish-avx2-y := twofish-avx2-asm_64.o twofish_avx2_glue.o
Expand Down
Loading

0 comments on commit 3d387ef

Please sign in to comment.