mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +08:00
86c69fe841
In RISC-V we have multiple extensions, that can be
used to accelerate processing.
The known extensions are defined in riscv_arch.def.
From that file test functions of the following
form are generated: RISCV_HAS_$ext().
In recent commits new ways to define the availability
of these test macros have been defined. E.g.:
#define RV32I_ZKND_ZKNE_CAPABLE \
(RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
[...]
#define RV64I_ZKND_ZKNE_CAPABLE \
(RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
This leaves us with two different APIs to test capabilities.
Further, creating the same macros for RV32 and RV64 results
in duplicated code (see example above).
This inconsistent situation makes it hard to integrate
further code. So let's clean this up with the following steps:
* Replace RV32I_* and RV64I_* macros by RICSV_HAS_* macros
* Move all test macros into riscv_arch.h
* Use "AND" and "OR" to combine tests with more than one extension
* Rename include files for accelerated processing (remove extension
postfix).
We end up with compile time tests for RV32/RV64 and run-time tests
for available extensions. Adding new routines (e.g. for vector crypto
instructions) should be straightforward.
Testing showed no regressions.
Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20078)
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/*
|
|
* Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#ifndef OSSL_CRYPTO_RISCV_ARCH_H
|
|
# define OSSL_CRYPTO_RISCV_ARCH_H
|
|
|
|
# include <ctype.h>
|
|
# include <stdint.h>
|
|
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) +1
|
|
extern uint32_t OPENSSL_riscvcap_P[ ((
|
|
# include "riscv_arch.def"
|
|
) + sizeof(uint32_t) - 1) / sizeof(uint32_t) ];
|
|
|
|
# ifdef OPENSSL_RISCVCAP_IMPL
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) +1
|
|
uint32_t OPENSSL_riscvcap_P[ ((
|
|
# include "riscv_arch.def"
|
|
) + sizeof(uint32_t) - 1) / sizeof(uint32_t) ];
|
|
# endif
|
|
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) \
|
|
static inline int RISCV_HAS_##NAME(void) \
|
|
{ \
|
|
return (OPENSSL_riscvcap_P[INDEX] & (1 << BIT_INDEX)) != 0; \
|
|
}
|
|
# include "riscv_arch.def"
|
|
|
|
struct RISCV_capability_s {
|
|
const char *name;
|
|
size_t index;
|
|
size_t bit_offset;
|
|
};
|
|
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) +1
|
|
extern const struct RISCV_capability_s RISCV_capabilities[
|
|
# include "riscv_arch.def"
|
|
];
|
|
|
|
# ifdef OPENSSL_RISCVCAP_IMPL
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) \
|
|
{ #NAME, INDEX, BIT_INDEX },
|
|
const struct RISCV_capability_s RISCV_capabilities[] = {
|
|
# include "riscv_arch.def"
|
|
};
|
|
# endif
|
|
|
|
# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX) +1
|
|
static const size_t kRISCVNumCaps =
|
|
# include "riscv_arch.def"
|
|
;
|
|
|
|
/* Extension combination tests. */
|
|
#define RISCV_HAS_ZBB_AND_ZBC() (RISCV_HAS_ZBB() && RISCV_HAS_ZBC())
|
|
#define RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE() (RISCV_HAS_ZBKB() && RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
|
|
#define RISCV_HAS_ZKND_AND_ZKNE() (RISCV_HAS_ZKND() && RISCV_HAS_ZKNE())
|
|
|
|
#endif
|