Skip to content

Commit 2fa3c4e

Browse files
HeliC829HeliC829
committed
build: add riscv64 support
Use the base alias implementations for most function. Signed-off-by: Julian Zhu <[email protected]>
1 parent 83463b6 commit 2fa3c4e

File tree

12 files changed

+49
-1
lines changed

12 files changed

+49
-1
lines changed

‎Makefile.am‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ lsrc32=
2727
lsrc_x86_64=
2828
lsrc_x86_32=
2929
lsrc_aarch64=
30+
lsrc_riscv64=
3031
lsrc_base_aliases=
3132
unit_tests32=
3233
perf_tests32=
@@ -73,6 +74,10 @@ if CPU_AARCH64
7374
libisal_crypto_la_SOURCES += ${lsrc_aarch64}
7475
endif
7576

77+
if CPU_RISCV64
78+
libisal_crypto_la_SOURCES += ${lsrc_riscv64}
79+
endif
80+
7681
if CPU_UNDEFINED
7782
libisal_crypto_la_SOURCES += ${lsrc_base_aliases}
7883
endif
@@ -117,6 +122,9 @@ endif
117122
if CPU_AARCH64
118123
as_filter = $(CC) -D__ASSEMBLY__
119124
endif
125+
if CPU_RISCV64
126+
as_filter = $(CC) -D__ASSEMBLY__
127+
endif
120128
CCAS = $(as_filter)
121129
EXTRA_DIST += tools/nasm-filter.sh
122130
EXTRA_DIST += tools/nasm-cet-filter.sh
@@ -127,6 +135,9 @@ AM_CCASFLAGS = ${asm_args} ${INCLUDE} $(src_include) ${D}
127135
else
128136
AM_CCASFLAGS = ${asm_args} ${INCLUDE} $(src_include) ${DEFS} ${D}
129137
endif
138+
if CPU_RISCV64
139+
AM_CCASFLAGS = ${asm_args} ${INCLUDE} $(src_include) ${D}
140+
endif
130141

131142
.asm.s:
132143
@echo " MKTMP " $@;

‎configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ AS_CASE([$host_cpu],
2929
[i?86], [CPU="x86_32"],
3030
[aarch64], [CPU="aarch64"],
3131
[arm64], [CPU="aarch64"],
32+
[riscv64], [CPU="riscv64"],
3233
)
3334
AM_CONDITIONAL([CPU_X86_64], [test "$CPU" = "x86_64"])
3435
AM_CONDITIONAL([CPU_X86_32], [test "$CPU" = "x86_32"])
3536
AM_CONDITIONAL([CPU_AARCH64], [test "$CPU" = "aarch64"])
37+
AM_CONDITIONAL([CPU_RISCV64], [test "$CPU" = "riscv64"])
3638
AM_CONDITIONAL([CPU_UNDEFINED], [test "x$CPU" = "x"])
3739
AM_CONDITIONAL([SAFE_PARAM], [test x"$SAFE_PARAM" = x"yes"])
3840

‎fips/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ extern_hdrs += include/isal_crypto_api.h include/aes_xts.h include/aes_keyex
3232

3333
lsrc_x86_64 += fips/self_tests.c fips/aes_self_tests.c
3434
lsrc_aarch64 += fips/self_tests_generic.c fips/aes_self_tests.c
35+
lsrc_riscv64 += fips/self_tests_generic.c
3536
lsrc += fips/sha_self_tests.c
3637

3738
lsrc_x86_64 += fips/asm_self_tests.asm

‎md5_mb/Makefile.am‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ lsrc_aarch64 += md5_mb/md5_ctx_base.c \
6969
md5_mb/aarch64/md5_mb_sve.S \
7070
md5_mb/aarch64/md5_mb_multibinary.S
7171

72+
lsrc_riscv64 += md5_mb/md5_ctx_base.c \
73+
md5_mb/md5_ctx_base_aliases.c
74+
7275
lsrc_base_aliases += md5_mb/md5_ctx_base.c \
7376
md5_mb/md5_ctx_base_aliases.c
7477

‎mh_sha1/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ lsrc_aarch64 += \
5757
mh_sha1/aarch64/mh_sha1_block_ce.S \
5858
mh_sha1/aarch64/mh_sha1_ce.c
5959

60+
lsrc_riscv64 += \
61+
$(lsrc_mh_sha1_base) \
62+
mh_sha1/mh_sha1_base_aliases.c
63+
6064
lsrc_base_aliases += \
6165
$(lsrc_mh_sha1_base) \
6266
mh_sha1/mh_sha1_base_aliases.c

‎mh_sha1_murmur3_x64_128/Makefile.am‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ lsrc_aarch64 += $(lsrc_murmur) \
5656
mh_sha1_murmur3_x64_128/aarch64/mh_sha1_murmur3_block_asimd.S \
5757
mh_sha1_murmur3_x64_128/aarch64/mh_sha1_murmur3_multibinary.S
5858

59+
lsrc_riscv64 += $(lsrc_murmur) \
60+
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128.c \
61+
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128_finalize_base.c \
62+
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128_update_base.c \
63+
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128_base_aliases.c
64+
5965
lsrc_base_aliases += $(lsrc_murmur) \
6066
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128.c \
6167
mh_sha1_murmur3_x64_128/mh_sha1_murmur3_x64_128_finalize_base.c \

‎mh_sha256/Makefile.am‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ lsrc_aarch64 += $(lsrc_sha256) \
6262
mh_sha256/mh_sha256_update_base.c \
6363
mh_sha256/mh_sha256_block_base.c
6464

65+
lsrc_riscv64 += $(lsrc_sha256) \
66+
mh_sha256/mh_sha256_base_aliases.c \
67+
mh_sha256/mh_sha256.c \
68+
mh_sha256/mh_sha256_finalize_base.c \
69+
mh_sha256/mh_sha256_update_base.c \
70+
mh_sha256/mh_sha256_block_base.c
71+
6572
lsrc_base_aliases += $(lsrc_sha256) \
6673
mh_sha256/mh_sha256_base_aliases.c \
6774
mh_sha256/mh_sha256.c \

‎rolling_hash/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ lsrc_aarch64 += rolling_hash/rolling_hashx_base.c \
4646
rolling_hash/aarch64/rolling_hash2_aarch64_dispatcher.c \
4747
rolling_hash/aarch64/rolling_hash2_run_until_unroll.S
4848

49+
lsrc_riscv64 += rolling_hash/rolling_hashx_base.c \
50+
rolling_hash/rolling_hash2.c \
51+
rolling_hash/rolling_hash2_base_aliases.c
52+
4953
src_include += -I $(srcdir)/rolling_hash
5054
extern_hdrs += include/rolling_hashx.h
5155

‎sha1_mb/Makefile.am‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ lsrc_aarch64 += sha1_mb/sha1_ctx_base.c \
7979
sha1_mb/aarch64/sha1_mb_mgr_asimd.c \
8080
sha1_mb/aarch64/sha1_mb_aarch64_dispatcher.c
8181

82-
82+
lsrc_riscv64 += sha1_mb/sha1_ctx_base_aliases.c \
83+
sha1_mb/sha1_ctx_base.c \
84+
sha1_mb/sha1_ref.c
8385

8486
lsrc_base_aliases += sha1_mb/sha1_ctx_base_aliases.c \
8587
sha1_mb/sha1_ctx_base.c \

‎sha256_mb/Makefile.am‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ lsrc_aarch64 += sha256_mb/aarch64/sha256_mb_multibinary.S \
7979
sha256_mb/aarch64/sha256_mb_x3_ce.S \
8080
sha256_mb/aarch64/sha256_mb_x4_ce.S
8181

82+
lsrc_riscv64 += sha256_mb/sha256_ctx_base_aliases.c \
83+
sha256_mb/sha256_ctx_base.c \
84+
sha256_mb/sha256_ref.c
8285

8386
lsrc_base_aliases += sha256_mb/sha256_ctx_base_aliases.c \
8487
sha256_mb/sha256_ctx_base.c \

0 commit comments

Comments
 (0)