oxillama-quant 0.1.2

Quantization kernels for all GGUF quantization types
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
653
654
655
656
657
//! AVX2+FMA accelerated Q2_K quantization kernel.
//!
//! Q2_K block layout (84 bytes per 256 weights):
//! - bytes\[0..16\]  — 16 scale bytes (lo 4 bits = scale, hi 4 bits = min)
//! - bytes\[16..80\] — 64 qs bytes (256 × 2-bit packed, 4 per byte via shifts 0,2,4,6)
//! - bytes\[80..82\] — FP16 super-block scale `d` (little-endian)
//! - bytes\[82..84\] — FP16 super-block minimum `dmin` (little-endian)
//!
//! NOTE: In Q2_K, d/dmin come AFTER scales and qs in memory.
//!
//! 16 sub-blocks of 16 weights each (2 groups of 128, each group processes
//! the same 32 qs bytes with 4 different shift amounts).
//!
//! Weight formula: `w = d * scale_i * q - dmin * min_i` where q is 2-bit (0..3).
//!
//! AVX2 strategy: for each shift, extract 2-bit values from pre-loaded qs bytes
//! via `_mm_srli_epi16` + AND 0x03, widen via `_mm256_cvtepu8_epi32`, convert
//! to f32, then apply `_mm256_fmsub_ps` for `d*scale*q - dmin*min`.

#![cfg(all(feature = "simd-avx2", target_arch = "x86_64"))]

use core::arch::x86_64::*;

use crate::error::{QuantError, QuantResult};
use crate::simd::avx2::util::{f16_to_f32, hsum_f32_avx};
use crate::traits::QuantKernel;
use crate::types::QuantTensor;

/// Block size for Q2_K: 256 weights per block.
pub const BLOCK_SIZE: usize = 256;
/// Bytes per Q2_K block: 16 (scales) + 64 (qs) + 2 (FP16 d) + 2 (FP16 dmin).
pub const BLOCK_BYTES: usize = 84;

/// AVX2+FMA accelerated Q2_K kernel.
///
/// Requires `avx2` and `fma` CPU features.  The [`crate::dispatch::KernelDispatcher`]
/// checks for these at runtime before constructing this kernel.
#[allow(non_camel_case_types)]
pub struct Q2_KAvx2;

/// Extract 2-bit values from 16 packed bytes using the given bit-shift.
///
/// Each source byte contains four 2-bit values at positions 0..1, 2..3, 4..5,
/// 6..7.  The `shift` parameter (0, 2, 4, or 6) selects which 2-bit field to
/// extract.  `_mm_srli_epi16` shifts 16-bit lanes but the subsequent AND with
/// 0x03 discards any cross-byte contamination (because the leak is always a
/// multiple of 4, which vanishes under the 0x03 mask).
///
/// # Safety
/// Requires `avx2` CPU feature.  `shift` must be one of 0, 2, 4, 6.
#[target_feature(enable = "avx2")]
#[inline]
unsafe fn extract_2bit_16(raw: __m128i, shift: u32, mask: __m128i) -> __m128i {
    // SAFETY: each branch uses a compile-time const generic for _mm_srli_epi16.
    // The runtime match selects the correct shift amount; cross-byte leakage from
    // the 16-bit shift is harmless because it is always a multiple of 4, eliminated
    // by the AND with 0x03.
    let shifted = match shift {
        0 => raw,
        2 => _mm_srli_epi16::<2>(raw),
        4 => _mm_srli_epi16::<4>(raw),
        _ => _mm_srli_epi16::<6>(raw),
    };
    _mm_and_si128(shifted, mask)
}

impl QuantKernel for Q2_KAvx2 {
    fn dequant_block(&self, block: &[u8], output: &mut [f32]) -> QuantResult<()> {
        if block.len() < BLOCK_BYTES {
            return Err(QuantError::BufferTooSmall {
                needed: BLOCK_BYTES,
                available: block.len(),
            });
        }
        if output.len() < BLOCK_SIZE {
            return Err(QuantError::BufferTooSmall {
                needed: BLOCK_SIZE,
                available: output.len(),
            });
        }

        // SAFETY: block.len() >= 84 and output.len() >= 256 verified above.
        // CPU avx2+fma support guaranteed by KernelDispatcher.
        unsafe { dequant_block_avx2(block, output) }
        Ok(())
    }

    fn gemv(
        &self,
        quant_matrix: &QuantTensor,
        input: &[f32],
        output: &mut [f32],
    ) -> QuantResult<()> {
        let n_rows = quant_matrix.shape[0];
        let n_cols = if quant_matrix.shape.len() > 1 {
            quant_matrix.shape[1]
        } else {
            quant_matrix.n_elements() / n_rows
        };

        if input.len() < n_cols {
            return Err(QuantError::DimensionMismatch {
                expected: n_cols,
                got: input.len(),
            });
        }
        if output.len() < n_rows {
            return Err(QuantError::DimensionMismatch {
                expected: n_rows,
                got: output.len(),
            });
        }

        let blocks_per_row = n_cols.div_ceil(BLOCK_SIZE);
        let row_bytes = blocks_per_row * BLOCK_BYTES;

        for (row, out) in output.iter_mut().enumerate().take(n_rows) {
            let row_start = row * row_bytes;
            // SAFETY: row/block bounds verified above.
            // CPU avx2+fma support guaranteed by KernelDispatcher.
            *out = unsafe {
                gemv_row_avx2(
                    &quant_matrix.data[row_start..row_start + row_bytes],
                    input,
                    blocks_per_row,
                    n_cols,
                )
            };
        }

        Ok(())
    }

    fn gemm(
        &self,
        quant_matrix: &QuantTensor,
        input: &[f32],
        output: &mut [f32],
        m: usize,
        n: usize,
        k: usize,
    ) -> QuantResult<()> {
        for row in 0..m {
            let input_row = &input[row * k..(row + 1) * k];
            let output_row = &mut output[row * n..(row + 1) * n];
            self.gemv(quant_matrix, input_row, output_row)?;
        }
        Ok(())
    }

    fn block_size(&self) -> usize {
        BLOCK_SIZE
    }

    fn block_bytes(&self) -> usize {
        BLOCK_BYTES
    }

    fn name(&self) -> &'static str {
        "Q2_K"
    }
}

// ---------------------------------------------------------------------------
// Internal AVX2 kernels
// ---------------------------------------------------------------------------

/// Dequantize one 84-byte Q2_K block into 256 FP32 values using AVX2.
///
/// Processes 2 groups of 128 weights.  Within each group, the same 32 qs
/// bytes are re-used with 4 different shift amounts (0, 2, 4, 6) to extract
/// all four 2-bit fields per byte.
///
/// # Safety
/// - `block.len() >= 84`
/// - `output.len() >= 256`
/// - CPU must support `avx2` and `fma`
#[target_feature(enable = "avx2,fma")]
unsafe fn dequant_block_avx2(block: &[u8], output: &mut [f32]) {
    let scales = &block[0..16];
    let qs = &block[16..80];

    // SAFETY: block.len() >= 84, so byte offsets 80..84 are valid.
    let d = f16_to_f32(&block[80..]);
    let dmin = f16_to_f32(&block[82..]);

    let mask_2bit = _mm_set1_epi8(0x03);

    let mut is = 0usize;
    let mut out_off = 0usize;

    for group in 0..2usize {
        let qs_base = group * 32;

        // Pre-load the 32 qs bytes for this group (two 16-byte halves).
        // SAFETY: qs_base + 32 <= 64; qs.len() == 64.
        let raw_a = _mm_loadu_si128(qs.as_ptr().add(qs_base) as *const __m128i);
        let raw_b = _mm_loadu_si128(qs.as_ptr().add(qs_base + 16) as *const __m128i);

        for &shift in &[0u32, 2, 4, 6] {
            // --- Sub-block A: 16 weights from qs[qs_base..qs_base+16] ---
            let sc_byte_a = scales[is];
            is += 1;
            let dl_a = d * (sc_byte_a & 0x0F) as f32;
            let ml_a = dmin * (sc_byte_a >> 4) as f32;
            let vdl_a = _mm256_set1_ps(dl_a);
            let vml_a = _mm256_set1_ps(ml_a);

            // SAFETY: extract_2bit_16 requires avx2 and shift in {0,2,4,6}.
            let q_bytes_a = extract_2bit_16(raw_a, shift, mask_2bit);

            // First 8 weights: widen bytes 0..7 to i32, convert to f32.
            // SAFETY: _mm256_cvtepu8_epi32 reads from the low 8 bytes of q_bytes_a.
            let q0_f32 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_a));
            let w0 = _mm256_fmsub_ps(vdl_a, q0_f32, vml_a); // dl*q - ml

            // Next 8 weights: shift the 128-bit register right by 8 bytes.
            let q_bytes_a_hi = _mm_srli_si128(q_bytes_a, 8);
            let q1_f32 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_a_hi));
            let w1 = _mm256_fmsub_ps(vdl_a, q1_f32, vml_a);

            // SAFETY: out_off + 16 <= 256; output.len() >= 256.
            let ptr_a = output.as_mut_ptr().add(out_off);
            _mm256_storeu_ps(ptr_a, w0);
            _mm256_storeu_ps(ptr_a.add(8), w1);
            out_off += 16;

            // --- Sub-block B: 16 weights from qs[qs_base+16..qs_base+32] ---
            let sc_byte_b = scales[is];
            is += 1;
            let dl_b = d * (sc_byte_b & 0x0F) as f32;
            let ml_b = dmin * (sc_byte_b >> 4) as f32;
            let vdl_b = _mm256_set1_ps(dl_b);
            let vml_b = _mm256_set1_ps(ml_b);

            let q_bytes_b = extract_2bit_16(raw_b, shift, mask_2bit);

            let q2_f32 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_b));
            let w2 = _mm256_fmsub_ps(vdl_b, q2_f32, vml_b);

            let q_bytes_b_hi = _mm_srli_si128(q_bytes_b, 8);
            let q3_f32 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_b_hi));
            let w3 = _mm256_fmsub_ps(vdl_b, q3_f32, vml_b);

            // SAFETY: out_off + 16 <= 256; output.len() >= 256.
            let ptr_b = output.as_mut_ptr().add(out_off);
            _mm256_storeu_ps(ptr_b, w2);
            _mm256_storeu_ps(ptr_b.add(8), w3);
            out_off += 16;
        }
    }
}

/// Compute the dot product of one row of a Q2_K matrix with an FP32 vector.
///
/// Returns the scalar result for this row.
///
/// # Safety
/// - `row_data.len() == blocks_per_row * BLOCK_BYTES`
/// - `input.len() >= n_cols`
/// - CPU must support `avx2` and `fma`
#[target_feature(enable = "avx2,fma")]
unsafe fn gemv_row_avx2(
    row_data: &[u8],
    input: &[f32],
    blocks_per_row: usize,
    n_cols: usize,
) -> f32 {
    let mut row_sum = 0.0f32;

    for blk in 0..blocks_per_row {
        let block_offset = blk * BLOCK_BYTES;
        // SAFETY: row_data.len() == blocks_per_row * BLOCK_BYTES; blk < blocks_per_row.
        let block = &row_data[block_offset..block_offset + BLOCK_BYTES];
        let input_offset = blk * BLOCK_SIZE;
        let remaining = n_cols.saturating_sub(input_offset);

        let scales = &block[0..16];
        let qs = &block[16..80];

        // SAFETY: block.len() == 84 >= 84.
        let d = f16_to_f32(&block[80..]);
        let dmin = f16_to_f32(&block[82..]);

        if remaining >= BLOCK_SIZE {
            // Fast path: all 256 weights in bounds — fully vectorized.
            let mask_2bit = _mm_set1_epi8(0x03);
            let mut block_acc = _mm256_setzero_ps();
            let mut is = 0usize;
            let mut w_off = input_offset;

            for group in 0..2usize {
                let qs_base = group * 32;

                // SAFETY: qs_base + 32 <= 64; qs.len() == 64.
                let raw_a = _mm_loadu_si128(qs.as_ptr().add(qs_base) as *const __m128i);
                let raw_b = _mm_loadu_si128(qs.as_ptr().add(qs_base + 16) as *const __m128i);

                for &shift in &[0u32, 2, 4, 6] {
                    // --- Sub-block A ---
                    let sc_byte_a = scales[is];
                    is += 1;
                    let dl_a = d * (sc_byte_a & 0x0F) as f32;
                    let ml_a = dmin * (sc_byte_a >> 4) as f32;
                    let vdl_a = _mm256_set1_ps(dl_a);
                    let vml_a = _mm256_set1_ps(ml_a);

                    let q_bytes_a = extract_2bit_16(raw_a, shift, mask_2bit);

                    // SAFETY: w_off + 16 <= input_offset + BLOCK_SIZE <= n_cols.
                    let inp_ptr_a = input.as_ptr().add(w_off);

                    // First 8
                    let q0 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_a));
                    let w0 = _mm256_fmsub_ps(vdl_a, q0, vml_a);
                    let i0 = _mm256_loadu_ps(inp_ptr_a);
                    block_acc = _mm256_fmadd_ps(w0, i0, block_acc);

                    // Next 8
                    let q_bytes_a_hi = _mm_srli_si128(q_bytes_a, 8);
                    let q1 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_a_hi));
                    let w1 = _mm256_fmsub_ps(vdl_a, q1, vml_a);
                    let i1 = _mm256_loadu_ps(inp_ptr_a.add(8));
                    block_acc = _mm256_fmadd_ps(w1, i1, block_acc);

                    w_off += 16;

                    // --- Sub-block B ---
                    let sc_byte_b = scales[is];
                    is += 1;
                    let dl_b = d * (sc_byte_b & 0x0F) as f32;
                    let ml_b = dmin * (sc_byte_b >> 4) as f32;
                    let vdl_b = _mm256_set1_ps(dl_b);
                    let vml_b = _mm256_set1_ps(ml_b);

                    let q_bytes_b = extract_2bit_16(raw_b, shift, mask_2bit);

                    // SAFETY: w_off + 16 <= input_offset + BLOCK_SIZE <= n_cols.
                    let inp_ptr_b = input.as_ptr().add(w_off);

                    let q2 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_b));
                    let w2 = _mm256_fmsub_ps(vdl_b, q2, vml_b);
                    let i2 = _mm256_loadu_ps(inp_ptr_b);
                    block_acc = _mm256_fmadd_ps(w2, i2, block_acc);

                    let q_bytes_b_hi = _mm_srli_si128(q_bytes_b, 8);
                    let q3 = _mm256_cvtepi32_ps(_mm256_cvtepu8_epi32(q_bytes_b_hi));
                    let w3 = _mm256_fmsub_ps(vdl_b, q3, vml_b);
                    let i3 = _mm256_loadu_ps(inp_ptr_b.add(8));
                    block_acc = _mm256_fmadd_ps(w3, i3, block_acc);

                    w_off += 16;
                }
            }

            row_sum += hsum_f32_avx(block_acc);
        } else if remaining > 0 {
            // Tail path: partial block — scalar fallback to avoid out-of-bounds reads.
            let mut partial_sum = 0.0f32;
            let mut is = 0usize;
            let mut qs_off = 0usize;
            let mut in_off = input_offset;

            for _group in 0..2 {
                for shift in (0u32..8).step_by(2) {
                    // Sub-block A: qs[qs_off..qs_off+16]
                    let sc_byte = scales[is];
                    let dl = d * (sc_byte & 0x0F) as f32;
                    let ml = dmin * (sc_byte >> 4) as f32;
                    is += 1;

                    for l in 0..16 {
                        let idx = in_off + l;
                        if idx < n_cols {
                            // SAFETY: qs_off + l < 64; shift in {0,2,4,6}.
                            let q = (*qs.get_unchecked(qs_off + l) >> shift) & 3;
                            partial_sum += (dl * q as f32 - ml) * input[idx];
                        }
                    }
                    in_off += 16;

                    // Sub-block B: qs[qs_off+16..qs_off+32]
                    let sc_byte = scales[is];
                    let dl = d * (sc_byte & 0x0F) as f32;
                    let ml = dmin * (sc_byte >> 4) as f32;
                    is += 1;

                    for l in 0..16 {
                        let idx = in_off + l;
                        if idx < n_cols {
                            // SAFETY: qs_off + 16 + l < 64.
                            let q = (*qs.get_unchecked(qs_off + 16 + l) >> shift) & 3;
                            partial_sum += (dl * q as f32 - ml) * input[idx];
                        }
                    }
                    in_off += 16;
                }
                qs_off += 32;
            }

            row_sum += partial_sum;
        }
        // remaining == 0: block fully out of bounds, skip.
    }

    row_sum
}

// ---------------------------------------------------------------------------
// Tests (CI only — not executed on aarch64 Darwin build machines)
// ---------------------------------------------------------------------------

#[cfg(all(test, target_arch = "x86_64", feature = "simd-avx2"))]
mod tests {
    use super::*;
    use crate::reference::q2_k::Q2KRef;

    fn make_q2k_block(d: f32, dmin: f32, scales: &[u8; 16], qs: &[u8; 64]) -> Vec<u8> {
        let mut block = Vec::with_capacity(BLOCK_BYTES);
        block.extend_from_slice(scales);
        block.extend_from_slice(qs);
        block.extend_from_slice(&half::f16::from_f32(d).to_bits().to_le_bytes());
        block.extend_from_slice(&half::f16::from_f32(dmin).to_bits().to_le_bytes());
        block
    }

    fn make_tensor(block: Vec<u8>, n_cols: usize) -> QuantTensor {
        QuantTensor::new(block, vec![1, n_cols], oxillama_gguf::GgufTensorType::Q2K)
    }

    #[test]
    fn test_dequant_matches_reference_zeros() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        let block = make_q2k_block(0.0, 0.0, &[0; 16], &[0; 64]);
        let mut out_avx2 = vec![0.0f32; 256];
        let mut out_ref = vec![0.0f32; 256];

        Q2_KAvx2
            .dequant_block(&block, &mut out_avx2)
            .expect("avx2 dequant");
        Q2KRef
            .dequant_block(&block, &mut out_ref)
            .expect("ref dequant");

        for (i, (&a, &r)) in out_avx2.iter().zip(out_ref.iter()).enumerate() {
            assert!(
                (a - r).abs() < 1e-5,
                "dequant mismatch [zeros] at index {i}: avx2={a}, ref={r}"
            );
        }
    }

    #[test]
    fn test_dequant_matches_reference_uniform() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        // All scales = 0x01 (scale=1, min=0), all qs = 0xFF (all 2-bit = 3)
        let block = make_q2k_block(1.0, 0.0, &[0x01; 16], &[0xFF; 64]);
        let mut out_avx2 = vec![0.0f32; 256];
        let mut out_ref = vec![0.0f32; 256];

        Q2_KAvx2
            .dequant_block(&block, &mut out_avx2)
            .expect("avx2 dequant");
        Q2KRef
            .dequant_block(&block, &mut out_ref)
            .expect("ref dequant");

        for (i, (&a, &r)) in out_avx2.iter().zip(out_ref.iter()).enumerate() {
            assert!(
                (a - r).abs() < 1e-3,
                "dequant mismatch [uniform] at index {i}: avx2={a}, ref={r}"
            );
        }
    }

    #[test]
    fn test_dequant_matches_reference_with_min() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        // d=2.0, dmin=1.0, scales=0x11 (scale=1, min=1), qs=0x00 (all q=0)
        // Weight = 2.0 * 1 * 0 - 1.0 * 1 = -1.0
        let block = make_q2k_block(2.0, 1.0, &[0x11; 16], &[0x00; 64]);
        let mut out_avx2 = vec![0.0f32; 256];
        let mut out_ref = vec![0.0f32; 256];

        Q2_KAvx2
            .dequant_block(&block, &mut out_avx2)
            .expect("avx2 dequant");
        Q2KRef
            .dequant_block(&block, &mut out_ref)
            .expect("ref dequant");

        for (i, (&a, &r)) in out_avx2.iter().zip(out_ref.iter()).enumerate() {
            assert!(
                (a - r).abs() < 1e-3,
                "dequant mismatch [with_min] at index {i}: avx2={a}, ref={r}"
            );
        }
    }

    #[test]
    fn test_dequant_matches_reference_varied() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        let mut scales = [0u8; 16];
        let mut qs = [0u8; 64];
        for (i, s) in scales.iter_mut().enumerate() {
            *s = (0x21 + i as u8) & 0xFF;
        }
        for (i, q) in qs.iter_mut().enumerate() {
            *q = ((i * 3 + 7) & 0xFF) as u8;
        }

        let block = make_q2k_block(0.5, 0.25, &scales, &qs);
        let mut out_avx2 = vec![0.0f32; 256];
        let mut out_ref = vec![0.0f32; 256];

        Q2_KAvx2
            .dequant_block(&block, &mut out_avx2)
            .expect("avx2 dequant");
        Q2KRef
            .dequant_block(&block, &mut out_ref)
            .expect("ref dequant");

        for (i, (&a, &r)) in out_avx2.iter().zip(out_ref.iter()).enumerate() {
            assert!(
                (a - r).abs() < 1e-3,
                "dequant mismatch [varied] at index {i}: avx2={a}, ref={r}"
            );
        }
    }

    #[test]
    fn test_gemv_matches_reference() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        let mut scales = [0u8; 16];
        let mut qs = [0u8; 64];
        for (i, s) in scales.iter_mut().enumerate() {
            *s = (0x21 + i as u8) & 0xFF;
        }
        for (i, q) in qs.iter_mut().enumerate() {
            *q = ((i * 3 + 7) & 0xFF) as u8;
        }
        let block = make_q2k_block(0.5, 0.25, &scales, &qs);
        let tensor_avx2 = make_tensor(block.clone(), 256);
        let tensor_ref = make_tensor(block, 256);

        let input: Vec<f32> = (0..256).map(|i| (i as f32) * 0.01 - 1.28).collect();
        let mut out_avx2 = vec![0.0f32; 1];
        let mut out_ref = vec![0.0f32; 1];

        Q2_KAvx2
            .gemv(&tensor_avx2, &input, &mut out_avx2)
            .expect("avx2 gemv");
        Q2KRef
            .gemv(&tensor_ref, &input, &mut out_ref)
            .expect("ref gemv");

        assert!(
            (out_avx2[0] - out_ref[0]).abs() < 0.1,
            "gemv mismatch: avx2={}, ref={}",
            out_avx2[0],
            out_ref[0]
        );
    }

    #[test]
    fn test_gemv_partial_block() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        // 200 columns — partial block.
        let scales = [0x11u8; 16];
        let qs = [0xAAu8; 64];

        let block = make_q2k_block(1.0, 0.5, &scales, &qs);
        let tensor_avx2 = make_tensor(block.clone(), 200);
        let tensor_ref = make_tensor(block, 200);

        let input = vec![1.0f32; 200];
        let mut out_avx2 = vec![0.0f32; 1];
        let mut out_ref = vec![0.0f32; 1];

        Q2_KAvx2
            .gemv(&tensor_avx2, &input, &mut out_avx2)
            .expect("avx2 gemv partial");
        Q2KRef
            .gemv(&tensor_ref, &input, &mut out_ref)
            .expect("ref gemv partial");

        assert!(
            (out_avx2[0] - out_ref[0]).abs() < 0.1,
            "partial gemv mismatch: avx2={}, ref={}",
            out_avx2[0],
            out_ref[0]
        );
    }

    #[test]
    fn test_gemv_varied_data() {
        if !std::arch::is_x86_feature_detected!("avx2") {
            return;
        }
        let mut scales = [0u8; 16];
        for (i, s) in scales.iter_mut().enumerate() {
            *s = ((i * 17 + 3) & 0xFF) as u8;
        }
        let mut qs = [0u8; 64];
        for (i, q) in qs.iter_mut().enumerate() {
            *q = ((i * 5 + 11) & 0xFF) as u8;
        }

        let block = make_q2k_block(0.75, 0.3, &scales, &qs);
        let tensor_avx2 = make_tensor(block.clone(), 256);
        let tensor_ref = make_tensor(block, 256);

        let input: Vec<f32> = (0..256).map(|i| (i as f32 * 0.005) - 0.64).collect();
        let mut out_avx2 = vec![0.0f32; 1];
        let mut out_ref = vec![0.0f32; 1];

        Q2_KAvx2
            .gemv(&tensor_avx2, &input, &mut out_avx2)
            .expect("avx2 gemv varied");
        Q2KRef
            .gemv(&tensor_ref, &input, &mut out_ref)
            .expect("ref gemv varied");

        assert!(
            (out_avx2[0] - out_ref[0]).abs() < 0.1,
            "varied gemv mismatch: avx2={}, ref={}",
            out_avx2[0],
            out_ref[0]
        );
    }

    #[test]
    fn test_buffer_too_small_block() {
        let block = vec![0u8; 10]; // too small
        let mut output = vec![0.0f32; 256];
        assert!(Q2_KAvx2.dequant_block(&block, &mut output).is_err());
    }

    #[test]
    fn test_buffer_too_small_output() {
        let block = vec![0u8; BLOCK_BYTES];
        let mut output = vec![0.0f32; 10]; // too small
        assert!(Q2_KAvx2.dequant_block(&block, &mut output).is_err());
    }
}