Skip to content

Commit 8306454

Browse files
willieyzmkannwischer
willieyz
authored and
mkannwischer
committed
Align native api.h with meta.h
This commit fixes two issues: - correcting the parameter type for `mld_intt_native` - making array dimensions concrete in the polyvecl pointwise accumulation functions rather than using MLDSA_L Signed-off-by: willieyz <[email protected]>
1 parent f3bc6ca commit 8306454

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎dev/x86_64/meta.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,24 +166,24 @@ static MLD_INLINE void mld_poly_pointwise_montgomery_native(
166166
}
167167

168168
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l4_native(
169-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
170-
const int32_t v[MLDSA_L][MLDSA_N])
169+
int32_t w[MLDSA_N], const int32_t u[4][MLDSA_N],
170+
const int32_t v[4][MLDSA_N])
171171
{
172172
mld_pointwise_acc_l4_avx2((__m256i *)w, (const __m256i *)u,
173173
(const __m256i *)v, mld_qdata.vec);
174174
}
175175

176176
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l5_native(
177-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
178-
const int32_t v[MLDSA_L][MLDSA_N])
177+
int32_t w[MLDSA_N], const int32_t u[5][MLDSA_N],
178+
const int32_t v[5][MLDSA_N])
179179
{
180180
mld_pointwise_acc_l5_avx2((__m256i *)w, (const __m256i *)u,
181181
(const __m256i *)v, mld_qdata.vec);
182182
}
183183

184184
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l7_native(
185-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
186-
const int32_t v[MLDSA_L][MLDSA_N])
185+
int32_t w[MLDSA_N], const int32_t u[7][MLDSA_N],
186+
const int32_t v[7][MLDSA_N])
187187
{
188188
mld_pointwise_acc_l7_avx2((__m256i *)w, (const __m256i *)u,
189189
(const __m256i *)v, mld_qdata.vec);

‎mldsa/src/native/api.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static MLD_INLINE void mld_poly_permute_bitrev_to_custom(int32_t p[MLDSA_N]);
9696
*
9797
* Arguments: - uint32_t p[MLDSA_N]: pointer to in/output polynomial
9898
**************************************************/
99-
static MLD_INLINE void mld_intt_native(int16_t p[MLDSA_N]);
99+
static MLD_INLINE void mld_intt_native(int32_t p[MLDSA_N]);
100100
#endif /* MLD_USE_NATIVE_INTT */
101101

102102
#if defined(MLD_USE_NATIVE_REJ_UNIFORM)
@@ -332,8 +332,8 @@ static MLD_INLINE void mld_poly_pointwise_montgomery_native(
332332
* - const int32_t v[MLDSA_L][MLDSA_N]: second input vector
333333
**************************************************/
334334
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l4_native(
335-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
336-
const int32_t v[MLDSA_L][MLDSA_N]);
335+
int32_t w[MLDSA_N], const int32_t u[4][MLDSA_N],
336+
const int32_t v[4][MLDSA_N]);
337337
#endif /* MLD_USE_NATIVE_POLYVECL_POINTWISE_ACC_MONTGOMERY_L4 */
338338

339339
#if defined(MLD_USE_NATIVE_POLYVECL_POINTWISE_ACC_MONTGOMERY_L5)
@@ -352,8 +352,8 @@ static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l4_native(
352352
* - const int32_t v[MLDSA_L][MLDSA_N]: second input vector
353353
**************************************************/
354354
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l5_native(
355-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
356-
const int32_t v[MLDSA_L][MLDSA_N]);
355+
int32_t w[MLDSA_N], const int32_t u[5][MLDSA_N],
356+
const int32_t v[5][MLDSA_N]);
357357
#endif /* MLD_USE_NATIVE_POLYVECL_POINTWISE_ACC_MONTGOMERY_L5 */
358358

359359
#if defined(MLD_USE_NATIVE_POLYVECL_POINTWISE_ACC_MONTGOMERY_L7)
@@ -372,8 +372,8 @@ static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l5_native(
372372
* - const int32_t v[MLDSA_L][MLDSA_N]: second input vector
373373
**************************************************/
374374
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l7_native(
375-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
376-
const int32_t v[MLDSA_L][MLDSA_N]);
375+
int32_t w[MLDSA_N], const int32_t u[7][MLDSA_N],
376+
const int32_t v[7][MLDSA_N]);
377377
#endif /* MLD_USE_NATIVE_POLYVECL_POINTWISE_ACC_MONTGOMERY_L7 */
378378

379379
#endif /* !MLD_NATIVE_API_H */

‎mldsa/src/native/x86_64/meta.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,24 +166,24 @@ static MLD_INLINE void mld_poly_pointwise_montgomery_native(
166166
}
167167

168168
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l4_native(
169-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
170-
const int32_t v[MLDSA_L][MLDSA_N])
169+
int32_t w[MLDSA_N], const int32_t u[4][MLDSA_N],
170+
const int32_t v[4][MLDSA_N])
171171
{
172172
mld_pointwise_acc_l4_avx2((__m256i *)w, (const __m256i *)u,
173173
(const __m256i *)v, mld_qdata.vec);
174174
}
175175

176176
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l5_native(
177-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
178-
const int32_t v[MLDSA_L][MLDSA_N])
177+
int32_t w[MLDSA_N], const int32_t u[5][MLDSA_N],
178+
const int32_t v[5][MLDSA_N])
179179
{
180180
mld_pointwise_acc_l5_avx2((__m256i *)w, (const __m256i *)u,
181181
(const __m256i *)v, mld_qdata.vec);
182182
}
183183

184184
static MLD_INLINE void mld_polyvecl_pointwise_acc_montgomery_l7_native(
185-
int32_t w[MLDSA_N], const int32_t u[MLDSA_L][MLDSA_N],
186-
const int32_t v[MLDSA_L][MLDSA_N])
185+
int32_t w[MLDSA_N], const int32_t u[7][MLDSA_N],
186+
const int32_t v[7][MLDSA_N])
187187
{
188188
mld_pointwise_acc_l7_avx2((__m256i *)w, (const __m256i *)u,
189189
(const __m256i *)v, mld_qdata.vec);

0 commit comments

Comments
 (0)