From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 04/37] crypto/aes: Add AES_SH, AES_ISH macros
Date: Sun, 9 Jul 2023 14:59:12 +0100 [thread overview]
Message-ID: <20230709135945.250311-5-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230709135945.250311-1-richard.henderson@linaro.org>
These macros will constant fold and avoid the indirection through
memory when fully unrolling some new primitives.
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
crypto/aes.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/crypto/aes.c b/crypto/aes.c
index 67bb74b8e3..e65c97e0c1 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -108,12 +108,24 @@ const uint8_t AES_isbox[256] = {
0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D,
};
+/* AES ShiftRows, for complete unrolling. */
+#define AES_SH(X) (((X) * 5) & 15)
+
const uint8_t AES_shifts[16] = {
- 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, 1, 6, 11
+ AES_SH(0x0), AES_SH(0x1), AES_SH(0x2), AES_SH(0x3),
+ AES_SH(0x4), AES_SH(0x5), AES_SH(0x6), AES_SH(0x7),
+ AES_SH(0x8), AES_SH(0x9), AES_SH(0xA), AES_SH(0xB),
+ AES_SH(0xC), AES_SH(0xD), AES_SH(0xE), AES_SH(0xF),
};
+/* AES InvShiftRows, for complete unrolling. */
+#define AES_ISH(X) (((X) * 13) & 15)
+
const uint8_t AES_ishifts[16] = {
- 0, 13, 10, 7, 4, 1, 14, 11, 8, 5, 2, 15, 12, 9, 6, 3
+ AES_ISH(0x0), AES_ISH(0x1), AES_ISH(0x2), AES_ISH(0x3),
+ AES_ISH(0x4), AES_ISH(0x5), AES_ISH(0x6), AES_ISH(0x7),
+ AES_ISH(0x8), AES_ISH(0x9), AES_ISH(0xA), AES_ISH(0xB),
+ AES_ISH(0xC), AES_ISH(0xD), AES_ISH(0xE), AES_ISH(0xF),
};
/*
--
2.34.1
next prev parent reply other threads:[~2023-07-09 14:01 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 13:59 [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
2023-07-09 13:59 ` [PULL 01/37] util: Add cpuinfo-ppc.c Richard Henderson
2023-07-09 13:59 ` [PULL 02/37] tests/multiarch: Add test-aes Richard Henderson
2023-07-09 13:59 ` [PULL 03/37] target/arm: Move aesmc and aesimc tables to crypto/aes.c Richard Henderson
2023-07-09 13:59 ` Richard Henderson [this message]
2023-07-09 13:59 ` [PULL 05/37] crypto: Add aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 07/37] crypto: Add aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 08/37] crypto: Add aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 09/37] crypto: Add aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 10/37] crypto: Add aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 11/37] crypto: Add aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 12/37] host/include/i386: Implement aes-round.h Richard Henderson
2023-07-09 13:59 ` [PULL 13/37] host/include/aarch64: " Richard Henderson
2023-07-09 13:59 ` [PULL 14/37] host/include/ppc: " Richard Henderson
2023-07-09 13:59 ` [PULL 15/37] target/ppc: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 16/37] target/ppc: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 17/37] target/ppc: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 18/37] target/ppc: Use aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 19/37] target/i386: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 20/37] target/i386: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 21/37] target/i386: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 22/37] target/i386: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 24/37] target/arm: Demultiplex AESE and AESMC Richard Henderson
2023-07-09 13:59 ` [PULL 25/37] target/arm: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 26/37] target/arm: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 27/37] target/arm: Use aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 28/37] target/arm: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 29/37] target/riscv: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 30/37] target/riscv: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 31/37] target/riscv: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 32/37] target/riscv: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 33/37] target/riscv: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 34/37] crypto: Remove AES_shifts, AES_ishifts Richard Henderson
2023-07-09 13:59 ` [PULL 35/37] crypto: Implement aesdec_IMC with AES_imc_rot Richard Henderson
2023-07-09 13:59 ` [PULL 36/37] crypto: Remove AES_imc Richard Henderson
2023-07-09 13:59 ` [PULL 37/37] crypto: Unexport AES_*_rot, AES_TeN, AES_TdN Richard Henderson
2023-07-09 17:30 ` [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
-- strict thread matches above, loose matches on Subject: below --
2023-07-09 18:28 [PATCH 00/45] linux-user: patch roundup Richard Henderson
2023-07-09 18:28 ` [PULL 04/37] crypto/aes: Add AES_SH, AES_ISH macros Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230709135945.250311-5-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=berrange@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).