p3-goldilocks 0.5.3

An implementation of the Goldilocks prime field F_p, where p = 2^64 - 2^32 + 1.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
//! Optimized Poseidon2 for Goldilocks on aarch64.
//!
//! Uses ARM inline assembly with latency hiding via interleaved S-box/MDS computation.
//! Fully unrolled internal rounds for W8, W12, W16.
//!
//! For packed operations, lanes are extracted to scalar, processed with interleaved
//! dual-lane ASM, then repacked. This is faster than using PackedGoldilocksNeon
//! arithmetic directly because the scalar `add_asm` avoids the modular reduction
//! overhead present in NEON addition.

use alloc::vec::Vec;

use p3_poseidon2::{
    ExternalLayer, ExternalLayerConstants, ExternalLayerConstructor, InternalLayer,
    InternalLayerConstructor, poseidon2_round_numbers_128,
};
use p3_symmetric::{CryptographicPermutation, Permutation};
use rand::distr::{Distribution, StandardUniform};
use rand::{Rng, RngExt};

use super::packing::PackedGoldilocksNeon;
use super::poseidon2_asm::*;
use super::utils::{pack_lanes, unpack_lanes};
use crate::{Goldilocks, MATRIX_DIAG_20_GOLDILOCKS};

/// Degree of the chosen permutation polynomial for Goldilocks.
const GOLDILOCKS_S_BOX_DEGREE: u64 = 7;

/// ASM-optimized internal layer with split-state s0-in-register, pre-converted constants.
#[derive(Debug, Default, Clone)]
pub struct Poseidon2InternalLayerGoldilocksAsm {
    constants_raw: Vec<u64>,
}

impl InternalLayerConstructor<Goldilocks> for Poseidon2InternalLayerGoldilocksAsm {
    fn new_from_constants(internal_constants: Vec<Goldilocks>) -> Self {
        let constants_raw = internal_constants.iter().map(|c| c.value).collect();
        Self { constants_raw }
    }
}

const DIAG_RAW_20: [u64; 20] = {
    let mut arr = [0u64; 20];
    let mut i = 0;
    while i < 20 {
        arr[i] = MATRIX_DIAG_20_GOLDILOCKS[i].value;
        i += 1;
    }
    arr
};

impl InternalLayer<Goldilocks, 8, GOLDILOCKS_S_BOX_DEGREE> for Poseidon2InternalLayerGoldilocksAsm {
    fn permute_state(&self, state: &mut [Goldilocks; 8]) {
        let state_raw: &mut [u64; 8] =
            unsafe { &mut *(state as *mut [Goldilocks; 8] as *mut [u64; 8]) };
        internal_permute_state_asm_w8(state_raw, &self.constants_raw);
    }
}

impl InternalLayer<Goldilocks, 12, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [Goldilocks; 12]) {
        let state_raw: &mut [u64; 12] =
            unsafe { &mut *(state as *mut [Goldilocks; 12] as *mut [u64; 12]) };
        internal_permute_state_asm_w12(state_raw, &self.constants_raw);
    }
}

impl InternalLayer<Goldilocks, 16, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [Goldilocks; 16]) {
        let state_raw: &mut [u64; 16] =
            unsafe { &mut *(state as *mut [Goldilocks; 16] as *mut [u64; 16]) };
        internal_permute_state_asm_w16(state_raw, &self.constants_raw);
    }
}

impl InternalLayer<Goldilocks, 20, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [Goldilocks; 20]) {
        let state_raw: &mut [u64; 20] =
            unsafe { &mut *(state as *mut [Goldilocks; 20] as *mut [u64; 20]) };
        internal_permute_state_asm(state_raw, &DIAG_RAW_20, &self.constants_raw);
    }
}

#[derive(Clone)]
pub struct Poseidon2ExternalLayerGoldilocksAsm<const WIDTH: usize> {
    initial_constants_raw: Vec<[u64; WIDTH]>,
    terminal_constants_raw: Vec<[u64; WIDTH]>,
}

impl<const WIDTH: usize> ExternalLayerConstructor<Goldilocks, WIDTH>
    for Poseidon2ExternalLayerGoldilocksAsm<WIDTH>
{
    fn new_from_constants(external_constants: ExternalLayerConstants<Goldilocks, WIDTH>) -> Self {
        let initial_constants_raw = external_constants
            .get_initial_constants()
            .iter()
            .map(|rc| core::array::from_fn(|i| rc[i].value))
            .collect();
        let terminal_constants_raw = external_constants
            .get_terminal_constants()
            .iter()
            .map(|rc| core::array::from_fn(|i| rc[i].value))
            .collect();
        Self {
            initial_constants_raw,
            terminal_constants_raw,
        }
    }
}

impl ExternalLayer<Goldilocks, 8, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<8>
{
    fn permute_state_initial(&self, state: &mut [Goldilocks; 8]) {
        let state_raw: &mut [u64; 8] =
            unsafe { &mut *(state as *mut [Goldilocks; 8] as *mut [u64; 8]) };
        external_initial_permute_w8(state_raw, &self.initial_constants_raw);
    }

    fn permute_state_terminal(&self, state: &mut [Goldilocks; 8]) {
        let state_raw: &mut [u64; 8] =
            unsafe { &mut *(state as *mut [Goldilocks; 8] as *mut [u64; 8]) };
        external_terminal_permute_w8(state_raw, &self.terminal_constants_raw);
    }
}

impl ExternalLayer<Goldilocks, 12, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<12>
{
    fn permute_state_initial(&self, state: &mut [Goldilocks; 12]) {
        let state_raw: &mut [u64; 12] =
            unsafe { &mut *(state as *mut [Goldilocks; 12] as *mut [u64; 12]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
    }

    fn permute_state_terminal(&self, state: &mut [Goldilocks; 12]) {
        let state_raw: &mut [u64; 12] =
            unsafe { &mut *(state as *mut [Goldilocks; 12] as *mut [u64; 12]) };
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

impl ExternalLayer<Goldilocks, 16, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<16>
{
    fn permute_state_initial(&self, state: &mut [Goldilocks; 16]) {
        let state_raw: &mut [u64; 16] =
            unsafe { &mut *(state as *mut [Goldilocks; 16] as *mut [u64; 16]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
    }

    fn permute_state_terminal(&self, state: &mut [Goldilocks; 16]) {
        let state_raw: &mut [u64; 16] =
            unsafe { &mut *(state as *mut [Goldilocks; 16] as *mut [u64; 16]) };
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

impl ExternalLayer<Goldilocks, 20, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<20>
{
    fn permute_state_initial(&self, state: &mut [Goldilocks; 20]) {
        let state_raw: &mut [u64; 20] =
            unsafe { &mut *(state as *mut [Goldilocks; 20] as *mut [u64; 20]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
    }

    fn permute_state_terminal(&self, state: &mut [Goldilocks; 20]) {
        let state_raw: &mut [u64; 20] =
            unsafe { &mut *(state as *mut [Goldilocks; 20] as *mut [u64; 20]) };
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

/// Type alias for scalar ASM-optimized Poseidon2.
pub type Poseidon2GoldilocksAsm<const WIDTH: usize> = p3_poseidon2::Poseidon2<
    Goldilocks,
    Poseidon2ExternalLayerGoldilocksAsm<WIDTH>,
    Poseidon2InternalLayerGoldilocksAsm,
    WIDTH,
    GOLDILOCKS_S_BOX_DEGREE,
>;

impl InternalLayer<PackedGoldilocksNeon, 8, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [PackedGoldilocksNeon; 8]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        internal_permute_split_dual_w8(&mut lane0, &mut lane1, &self.constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl InternalLayer<PackedGoldilocksNeon, 12, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [PackedGoldilocksNeon; 12]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        internal_permute_split_dual_w12(&mut lane0, &mut lane1, &self.constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl InternalLayer<PackedGoldilocksNeon, 16, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [PackedGoldilocksNeon; 16]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        internal_permute_split_dual_w16(&mut lane0, &mut lane1, &self.constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl InternalLayer<PackedGoldilocksNeon, 20, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2InternalLayerGoldilocksAsm
{
    fn permute_state(&self, state: &mut [PackedGoldilocksNeon; 20]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        internal_permute_split_dual(&mut lane0, &mut lane1, &DIAG_RAW_20, &self.constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl ExternalLayer<PackedGoldilocksNeon, 8, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<8>
{
    fn permute_state_initial(&self, state: &mut [PackedGoldilocksNeon; 8]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_initial_permute_dual_w8(&mut lane0, &mut lane1, &self.initial_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }

    fn permute_state_terminal(&self, state: &mut [PackedGoldilocksNeon; 8]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_terminal_permute_dual_w8(&mut lane0, &mut lane1, &self.terminal_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl ExternalLayer<PackedGoldilocksNeon, 12, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<12>
{
    fn permute_state_initial(&self, state: &mut [PackedGoldilocksNeon; 12]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_initial_permute_dual(&mut lane0, &mut lane1, &self.initial_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }

    fn permute_state_terminal(&self, state: &mut [PackedGoldilocksNeon; 12]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_terminal_permute_dual(&mut lane0, &mut lane1, &self.terminal_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl ExternalLayer<PackedGoldilocksNeon, 16, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<16>
{
    fn permute_state_initial(&self, state: &mut [PackedGoldilocksNeon; 16]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_initial_permute_dual(&mut lane0, &mut lane1, &self.initial_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }

    fn permute_state_terminal(&self, state: &mut [PackedGoldilocksNeon; 16]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_terminal_permute_dual(&mut lane0, &mut lane1, &self.terminal_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl ExternalLayer<PackedGoldilocksNeon, 20, GOLDILOCKS_S_BOX_DEGREE>
    for Poseidon2ExternalLayerGoldilocksAsm<20>
{
    fn permute_state_initial(&self, state: &mut [PackedGoldilocksNeon; 20]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_initial_permute_dual(&mut lane0, &mut lane1, &self.initial_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }

    fn permute_state_terminal(&self, state: &mut [PackedGoldilocksNeon; 20]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_terminal_permute_dual(&mut lane0, &mut lane1, &self.terminal_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

/// Fused Poseidon2 permutation for Goldilocks.
///
/// Instead of unpacking/packing between each of the 3 phases (initial external,
/// internal, terminal external), this performs a single unpack at the start and
/// a single pack at the end, eliminating the redundant lane conversions per
/// packed permutation.
#[derive(Clone, Debug)]
pub struct Poseidon2GoldilocksFused<const WIDTH: usize> {
    internal_constants_raw: Vec<u64>,
    initial_constants_raw: Vec<[u64; WIDTH]>,
    terminal_constants_raw: Vec<[u64; WIDTH]>,
}

impl<const WIDTH: usize> Poseidon2GoldilocksFused<WIDTH> {
    pub fn new(
        external_constants: &ExternalLayerConstants<Goldilocks, WIDTH>,
        internal_constants: &[Goldilocks],
    ) -> Self {
        let internal_constants_raw = internal_constants.iter().map(|c| c.value).collect();
        let initial_constants_raw = external_constants
            .get_initial_constants()
            .iter()
            .map(|rc| core::array::from_fn(|i| rc[i].value))
            .collect();
        let terminal_constants_raw = external_constants
            .get_terminal_constants()
            .iter()
            .map(|rc| core::array::from_fn(|i| rc[i].value))
            .collect();
        Self {
            internal_constants_raw,
            initial_constants_raw,
            terminal_constants_raw,
        }
    }

    pub fn new_from_rng<R: Rng>(rounds_f: usize, rounds_p: usize, rng: &mut R) -> Self
    where
        StandardUniform: Distribution<Goldilocks> + Distribution<[Goldilocks; WIDTH]>,
    {
        let external_constants = ExternalLayerConstants::new_from_rng(rounds_f, rng);
        let internal_constants = rng
            .sample_iter(StandardUniform)
            .take(rounds_p)
            .collect::<Vec<_>>();
        Self::new(&external_constants, &internal_constants)
    }

    pub fn new_from_rng_128<R: Rng>(rng: &mut R) -> Self
    where
        StandardUniform: Distribution<Goldilocks> + Distribution<[Goldilocks; WIDTH]>,
    {
        let round_numbers =
            poseidon2_round_numbers_128::<Goldilocks>(WIDTH, GOLDILOCKS_S_BOX_DEGREE);
        let (rounds_f, rounds_p) = round_numbers.unwrap_or_else(|e| panic!("{e}"));
        Self::new_from_rng(rounds_f, rounds_p, rng)
    }
}

impl Permutation<[Goldilocks; 8]> for Poseidon2GoldilocksFused<8> {
    fn permute_mut(&self, state: &mut [Goldilocks; 8]) {
        let state_raw: &mut [u64; 8] =
            unsafe { &mut *(state as *mut [Goldilocks; 8] as *mut [u64; 8]) };
        external_initial_permute_w8(state_raw, &self.initial_constants_raw);
        internal_permute_state_asm_w8(state_raw, &self.internal_constants_raw);
        external_terminal_permute_w8(state_raw, &self.terminal_constants_raw);
    }
}

impl CryptographicPermutation<[Goldilocks; 8]> for Poseidon2GoldilocksFused<8> {}

impl Permutation<[Goldilocks; 12]> for Poseidon2GoldilocksFused<12> {
    fn permute_mut(&self, state: &mut [Goldilocks; 12]) {
        let state_raw: &mut [u64; 12] =
            unsafe { &mut *(state as *mut [Goldilocks; 12] as *mut [u64; 12]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
        internal_permute_state_asm_w12(state_raw, &self.internal_constants_raw);
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

impl CryptographicPermutation<[Goldilocks; 12]> for Poseidon2GoldilocksFused<12> {}

impl Permutation<[Goldilocks; 16]> for Poseidon2GoldilocksFused<16> {
    fn permute_mut(&self, state: &mut [Goldilocks; 16]) {
        let state_raw: &mut [u64; 16] =
            unsafe { &mut *(state as *mut [Goldilocks; 16] as *mut [u64; 16]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
        internal_permute_state_asm_w16(state_raw, &self.internal_constants_raw);
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

impl CryptographicPermutation<[Goldilocks; 16]> for Poseidon2GoldilocksFused<16> {}

impl Permutation<[Goldilocks; 20]> for Poseidon2GoldilocksFused<20> {
    fn permute_mut(&self, state: &mut [Goldilocks; 20]) {
        let state_raw: &mut [u64; 20] =
            unsafe { &mut *(state as *mut [Goldilocks; 20] as *mut [u64; 20]) };
        external_initial_permute_state_asm(state_raw, &self.initial_constants_raw);
        internal_permute_state_asm(state_raw, &DIAG_RAW_20, &self.internal_constants_raw);
        external_terminal_permute_state_asm(state_raw, &self.terminal_constants_raw);
    }
}

impl CryptographicPermutation<[Goldilocks; 20]> for Poseidon2GoldilocksFused<20> {}

impl Permutation<[PackedGoldilocksNeon; 8]> for Poseidon2GoldilocksFused<8> {
    fn permute_mut(&self, state: &mut [PackedGoldilocksNeon; 8]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        external_initial_permute_dual_w8(&mut lane0, &mut lane1, &self.initial_constants_raw);
        internal_permute_split_dual_w8(&mut lane0, &mut lane1, &self.internal_constants_raw);
        external_terminal_permute_dual_w8(&mut lane0, &mut lane1, &self.terminal_constants_raw);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl CryptographicPermutation<[PackedGoldilocksNeon; 8]> for Poseidon2GoldilocksFused<8> {}

impl Permutation<[PackedGoldilocksNeon; 12]> for Poseidon2GoldilocksFused<12> {
    fn permute_mut(&self, state: &mut [PackedGoldilocksNeon; 12]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        let mut sv = lanes_to_neon(&lane0, &lane1);
        external_initial_neon(&mut sv, &self.initial_constants_raw);
        internal_permute_neon_w12(&mut sv, &self.internal_constants_raw);
        external_terminal_neon(&mut sv, &self.terminal_constants_raw);
        neon_to_lanes(&sv, &mut lane0, &mut lane1);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl CryptographicPermutation<[PackedGoldilocksNeon; 12]> for Poseidon2GoldilocksFused<12> {}

impl Permutation<[PackedGoldilocksNeon; 16]> for Poseidon2GoldilocksFused<16> {
    fn permute_mut(&self, state: &mut [PackedGoldilocksNeon; 16]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        let mut sv = lanes_to_neon(&lane0, &lane1);
        external_initial_neon(&mut sv, &self.initial_constants_raw);
        internal_permute_neon_w16(&mut sv, &self.internal_constants_raw);
        external_terminal_neon(&mut sv, &self.terminal_constants_raw);
        neon_to_lanes(&sv, &mut lane0, &mut lane1);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl CryptographicPermutation<[PackedGoldilocksNeon; 16]> for Poseidon2GoldilocksFused<16> {}

impl Permutation<[PackedGoldilocksNeon; 20]> for Poseidon2GoldilocksFused<20> {
    fn permute_mut(&self, state: &mut [PackedGoldilocksNeon; 20]) {
        let (mut lane0, mut lane1) = unpack_lanes(state);
        let mut sv = lanes_to_neon(&lane0, &lane1);
        external_initial_neon(&mut sv, &self.initial_constants_raw);
        internal_permute_neon(&mut sv, &DIAG_RAW_20, &self.internal_constants_raw);
        external_terminal_neon(&mut sv, &self.terminal_constants_raw);
        neon_to_lanes(&sv, &mut lane0, &mut lane1);
        pack_lanes(state, &lane0, &lane1);
    }
}

impl CryptographicPermutation<[PackedGoldilocksNeon; 20]> for Poseidon2GoldilocksFused<20> {}

#[cfg(test)]
mod tests {
    use p3_field::{PrimeCharacteristicRing, PrimeField64};
    use p3_poseidon2::{ExternalLayerConstants, InternalLayer, Poseidon2};
    use p3_symmetric::Permutation;
    use rand::rngs::SmallRng;
    use rand::{RngExt, SeedableRng};

    use super::*;
    use crate::poseidon1::GOLDILOCKS_S_BOX_DEGREE;
    use crate::{
        GOLDILOCKS_POSEIDON2_HALF_FULL_ROUNDS, GOLDILOCKS_POSEIDON2_PARTIAL_ROUNDS_8,
        Poseidon2ExternalLayerGoldilocks, Poseidon2InternalLayerGoldilocks,
    };

    type F = Goldilocks;

    // Test that fully ASM-optimized implementation matches generic scalar
    fn test_asm_matches_generic<const WIDTH: usize>()
    where
        Poseidon2InternalLayerGoldilocks: InternalLayer<F, WIDTH, GOLDILOCKS_S_BOX_DEGREE>,
        Poseidon2InternalLayerGoldilocksAsm: InternalLayer<F, WIDTH, GOLDILOCKS_S_BOX_DEGREE>,
        Poseidon2ExternalLayerGoldilocksAsm<WIDTH>:
            ExternalLayer<Goldilocks, WIDTH, GOLDILOCKS_S_BOX_DEGREE>,
    {
        let mut rng = SmallRng::seed_from_u64(42);

        let external_constants = ExternalLayerConstants::<Goldilocks, WIDTH>::new_from_rng(
            2 * GOLDILOCKS_POSEIDON2_HALF_FULL_ROUNDS,
            &mut rng,
        );
        let internal_constants: Vec<Goldilocks> = (0..GOLDILOCKS_POSEIDON2_PARTIAL_ROUNDS_8)
            .map(|_| F::from_u64(rng.random()))
            .collect();

        // Generic scalar implementation
        let generic_poseidon2: Poseidon2<
            Goldilocks,
            Poseidon2ExternalLayerGoldilocks<WIDTH>,
            Poseidon2InternalLayerGoldilocks,
            WIDTH,
            GOLDILOCKS_S_BOX_DEGREE,
        > = Poseidon2::new(external_constants.clone(), internal_constants.clone());

        // Fully ASM-optimized implementation
        let asm_poseidon2: Poseidon2GoldilocksAsm<WIDTH> =
            Poseidon2::new(external_constants, internal_constants);

        // Test with zeros
        let mut generic_input = [F::ZERO; WIDTH];
        let mut asm_input = [F::ZERO; WIDTH];

        generic_poseidon2.permute_mut(&mut generic_input);
        asm_poseidon2.permute_mut(&mut asm_input);

        for i in 0..WIDTH {
            assert_eq!(
                asm_input[i].as_canonical_u64(),
                generic_input[i].as_canonical_u64(),
                "ASM mismatch at index {i} for zero input"
            );
        }

        // Test with random input
        let mut generic_input: [F; WIDTH] = core::array::from_fn(|_| F::from_u64(rng.random()));
        let mut asm_input = generic_input;

        generic_poseidon2.permute_mut(&mut generic_input);
        asm_poseidon2.permute_mut(&mut asm_input);

        for i in 0..WIDTH {
            assert_eq!(
                asm_input[i].as_canonical_u64(),
                generic_input[i].as_canonical_u64(),
                "ASM mismatch at index {i} for random input"
            );
        }
    }

    fn test_fused_matches_generic<const WIDTH: usize>()
    where
        Poseidon2InternalLayerGoldilocks: InternalLayer<F, WIDTH, GOLDILOCKS_S_BOX_DEGREE>,
        Poseidon2GoldilocksFused<WIDTH>:
            Permutation<[F; WIDTH]> + Permutation<[PackedGoldilocksNeon; WIDTH]>,
    {
        let mut rng = SmallRng::seed_from_u64(42);

        let external_constants = ExternalLayerConstants::<Goldilocks, WIDTH>::new_from_rng(
            2 * GOLDILOCKS_POSEIDON2_HALF_FULL_ROUNDS,
            &mut rng,
        );
        let internal_constants: Vec<Goldilocks> = (0..GOLDILOCKS_POSEIDON2_PARTIAL_ROUNDS_8)
            .map(|_| rng.random())
            .collect();

        let generic_poseidon2: Poseidon2<
            Goldilocks,
            Poseidon2ExternalLayerGoldilocks<WIDTH>,
            Poseidon2InternalLayerGoldilocks,
            WIDTH,
            GOLDILOCKS_S_BOX_DEGREE,
        > = Poseidon2::new(external_constants.clone(), internal_constants.clone());

        let fused =
            Poseidon2GoldilocksFused::<WIDTH>::new(&external_constants, &internal_constants);

        // Scalar: fused vs generic
        let mut generic_input = [F::ZERO; WIDTH];
        let mut fused_input = [F::ZERO; WIDTH];
        generic_poseidon2.permute_mut(&mut generic_input);
        fused.permute_mut(&mut fused_input);
        for i in 0..WIDTH {
            assert_eq!(
                fused_input[i].as_canonical_u64(),
                generic_input[i].as_canonical_u64(),
                "Fused scalar mismatch at index {i} for zero input"
            );
        }

        let mut generic_input: [F; WIDTH] = rng.random();
        let mut fused_input = generic_input;
        generic_poseidon2.permute_mut(&mut generic_input);
        fused.permute_mut(&mut fused_input);
        for i in 0..WIDTH {
            assert_eq!(
                fused_input[i].as_canonical_u64(),
                generic_input[i].as_canonical_u64(),
                "Fused scalar mismatch at index {i} for random input"
            );
        }

        // Packed: fused packed vs scalar (each packed lane should match scalar)
        let scalar_a: [F; WIDTH] = rng.random();
        let scalar_b: [F; WIDTH] = rng.random();

        let mut packed_input: [PackedGoldilocksNeon; WIDTH] =
            core::array::from_fn(|i| PackedGoldilocksNeon([scalar_a[i], scalar_b[i]]));
        fused.permute_mut(&mut packed_input);

        let mut expected_a = scalar_a;
        let mut expected_b = scalar_b;
        fused.permute_mut(&mut expected_a);
        fused.permute_mut(&mut expected_b);

        for i in 0..WIDTH {
            assert_eq!(
                packed_input[i].0[0].as_canonical_u64(),
                expected_a[i].as_canonical_u64(),
                "Fused packed lane0 mismatch at index {i}"
            );
            assert_eq!(
                packed_input[i].0[1].as_canonical_u64(),
                expected_b[i].as_canonical_u64(),
                "Fused packed lane1 mismatch at index {i}"
            );
        }
    }

    #[test]
    fn test_asm_matches_generic_width_8() {
        test_asm_matches_generic::<8>();
    }

    #[test]
    fn test_asm_matches_generic_width_12() {
        test_asm_matches_generic::<12>();
    }

    #[test]
    fn test_asm_matches_generic_width_16() {
        test_asm_matches_generic::<16>();
    }

    #[test]
    fn test_asm_matches_generic_width_20() {
        test_asm_matches_generic::<20>();
    }

    #[test]
    fn test_fused_matches_generic_width_8() {
        test_fused_matches_generic::<8>();
    }

    #[test]
    fn test_fused_matches_generic_width_12() {
        test_fused_matches_generic::<12>();
    }

    #[test]
    fn test_fused_matches_generic_width_16() {
        test_fused_matches_generic::<16>();
    }

    #[test]
    fn test_fused_matches_generic_width_20() {
        test_fused_matches_generic::<20>();
    }
}