Skip to content

Commit 13e1d3c

Browse files
hanno-beckerhanno-becker
authored
Merge pull request #1038 from pq-code-package/avx2-cleanup
Minor clean-up of AVX2 backend
2 parents ad0d815 + 05aba51 commit 13e1d3c

File tree

10 files changed

+4
-210
lines changed

10 files changed

+4
-210
lines changed

‎BIBLIOGRAPHY.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ source code and documentation.
236236
- [dev/x86_64/src/intt.S](dev/x86_64/src/intt.S)
237237
- [dev/x86_64/src/ntt.S](dev/x86_64/src/ntt.S)
238238
- [dev/x86_64/src/nttfrombytes.S](dev/x86_64/src/nttfrombytes.S)
239-
- [dev/x86_64/src/nttpack.S](dev/x86_64/src/nttpack.S)
240239
- [dev/x86_64/src/ntttobytes.S](dev/x86_64/src/ntttobytes.S)
241240
- [dev/x86_64/src/nttunpack.S](dev/x86_64/src/nttunpack.S)
242241
- [dev/x86_64/src/reduce.S](dev/x86_64/src/reduce.S)
@@ -251,7 +250,6 @@ source code and documentation.
251250
- [mlkem/native/x86_64/src/intt.S](mlkem/native/x86_64/src/intt.S)
252251
- [mlkem/native/x86_64/src/ntt.S](mlkem/native/x86_64/src/ntt.S)
253252
- [mlkem/native/x86_64/src/nttfrombytes.S](mlkem/native/x86_64/src/nttfrombytes.S)
254-
- [mlkem/native/x86_64/src/nttpack.S](mlkem/native/x86_64/src/nttpack.S)
255253
- [mlkem/native/x86_64/src/ntttobytes.S](mlkem/native/x86_64/src/ntttobytes.S)
256254
- [mlkem/native/x86_64/src/nttunpack.S](mlkem/native/x86_64/src/nttunpack.S)
257255
- [mlkem/native/x86_64/src/reduce.S](mlkem/native/x86_64/src/reduce.S)

‎dev/x86_64/meta.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
static MLK_INLINE void mlk_poly_permute_bitrev_to_custom(int16_t data[MLKEM_N])
3838
{
39-
mlk_nttunpack_avx2((__m256i *)(data), mlk_qdata.vec);
39+
mlk_nttunpack_avx2((__m256i *)(data));
4040
}
4141

4242
static MLK_INLINE int mlk_rej_uniform_native(int16_t *r, unsigned len,

‎dev/x86_64/src/arith_native_x86_64.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ void mlk_ntt_avx2(__m256i *r, const __m256i *mlk_qdata);
2626
#define mlk_invntt_avx2 MLK_NAMESPACE(invntt_avx2)
2727
void mlk_invntt_avx2(__m256i *r, const __m256i *mlk_qdata);
2828

29-
#define mlk_nttpack_avx2 MLK_NAMESPACE(nttpack_avx2)
30-
void mlk_nttpack_avx2(__m256i *r, const __m256i *mlk_qdata);
31-
3229
#define mlk_nttunpack_avx2 MLK_NAMESPACE(nttunpack_avx2)
33-
void mlk_nttunpack_avx2(__m256i *r, const __m256i *mlk_qdata);
30+
void mlk_nttunpack_avx2(__m256i *r);
3431

3532
#define mlk_reduce_avx2 MLK_NAMESPACE(reduce_avx2)
3633
void mlk_reduce_avx2(__m256i *r, const __m256i *mlk_qdata);

‎dev/x86_64/src/consts.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@
3535
#define MLK_AVX2_BACKEND_DATA_OFFSET_16XSHIFT 624
3636
#define MLK_AVX2_BACKEND_DATA_OFFSET_MULCACHE_TWIDDLES 640
3737

38-
/* The C ABI on MacOS exports all symbols with a leading
39-
* underscore. This means that any symbols we refer to from
40-
* C files (functions) can't be found, and all symbols we
41-
* refer to from ASM also can't be found.
42-
*
43-
* This define helps us get around this
44-
*/
45-
4638
#ifndef __ASSEMBLER__
4739
#include "align.h"
4840
typedef MLK_ALIGNED_INT16(768) qdata_t;

‎dev/x86_64/src/nttpack.S

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎examples/monolithic_build/mlkem_native_monobuild.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,6 @@
486486
#undef mlk_invntt_avx2
487487
#undef mlk_ntt_avx2
488488
#undef mlk_nttfrombytes_avx2
489-
#undef mlk_nttpack_avx2
490489
#undef mlk_ntttobytes_avx2
491490
#undef mlk_nttunpack_avx2
492491
#undef mlk_poly_compress_d10_avx2

‎mlkem/native/x86_64/meta.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
static MLK_INLINE void mlk_poly_permute_bitrev_to_custom(int16_t data[MLKEM_N])
3838
{
39-
mlk_nttunpack_avx2((__m256i *)(data), mlk_qdata.vec);
39+
mlk_nttunpack_avx2((__m256i *)(data));
4040
}
4141

4242
static MLK_INLINE int mlk_rej_uniform_native(int16_t *r, unsigned len,

‎mlkem/native/x86_64/src/arith_native_x86_64.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ void mlk_ntt_avx2(__m256i *r, const __m256i *mlk_qdata);
2626
#define mlk_invntt_avx2 MLK_NAMESPACE(invntt_avx2)
2727
void mlk_invntt_avx2(__m256i *r, const __m256i *mlk_qdata);
2828

29-
#define mlk_nttpack_avx2 MLK_NAMESPACE(nttpack_avx2)
30-
void mlk_nttpack_avx2(__m256i *r, const __m256i *mlk_qdata);
31-
3229
#define mlk_nttunpack_avx2 MLK_NAMESPACE(nttunpack_avx2)
33-
void mlk_nttunpack_avx2(__m256i *r, const __m256i *mlk_qdata);
30+
void mlk_nttunpack_avx2(__m256i *r);
3431

3532
#define mlk_reduce_avx2 MLK_NAMESPACE(reduce_avx2)
3633
void mlk_reduce_avx2(__m256i *r, const __m256i *mlk_qdata);

‎mlkem/native/x86_64/src/consts.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@
3535
#define MLK_AVX2_BACKEND_DATA_OFFSET_16XSHIFT 624
3636
#define MLK_AVX2_BACKEND_DATA_OFFSET_MULCACHE_TWIDDLES 640
3737

38-
/* The C ABI on MacOS exports all symbols with a leading
39-
* underscore. This means that any symbols we refer to from
40-
* C files (functions) can't be found, and all symbols we
41-
* refer to from ASM also can't be found.
42-
*
43-
* This define helps us get around this
44-
*/
45-
4638
#ifndef __ASSEMBLER__
4739
#include "align.h"
4840
typedef MLK_ALIGNED_INT16(768) qdata_t;

‎mlkem/native/x86_64/src/nttpack.S

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)