diff --git a/Docs/ChangeLog-4x.md b/Docs/ChangeLog-4x.md
index fe973ba3..8405dcc1 100644
--- a/Docs/ChangeLog-4x.md
+++ b/Docs/ChangeLog-4x.md
@@ -16,6 +16,7 @@ The 4.9.0 release is a minor maintenance release.
 * **General:**
   * **Bug fix:** Fixed incorrect return type in "None" vector library
     reference implementation.
+  * **Bug fix:** Fixed sincos table index under/overflow.
   * **Feature:** Added backend for Arm SVE fixed-width 256-bit builds.
   * **Feature:** Optimized NEON mask `any()` and `all()` functions.
   * **Feature:** Migrated build and test to GitHub Actions pipelines.
diff --git a/Source/astcenc_weight_align.cpp b/Source/astcenc_weight_align.cpp
index 7233915a..c0bed070 100644
--- a/Source/astcenc_weight_align.cpp
+++ b/Source/astcenc_weight_align.cpp
@@ -104,14 +104,17 @@ static void compute_angular_offsets(
 	// Precompute isample; arrays are always allocated 64 elements long
 	for (unsigned int i = 0; i < weight_count; i += ASTCENC_SIMD_WIDTH)
 	{
-		// Add 2^23 and interpreting bits extracts round-to-nearest int
-		vfloat sample = loada(dec_weight_ideal_value + i) * (SINCOS_STEPS - 1.0f) + vfloat(12582912.0f);
-		vint isample = float_as_int(sample) & vint((SINCOS_STEPS - 1));
+		// Ideal weight can be outside [0, 1] range, so clamp to fit table
+		vfloat ideal_weight = clampzo(loada(dec_weight_ideal_value + i));
+
+		// Convert a weight to a sincos table index
+		vfloat sample = ideal_weight * (SINCOS_STEPS - 1.0f);
+		vint isample = float_to_int_rtn(sample);
 		storea(isample, isamplev + i);
 	}
 
 	// Arrays are multiple of SIMD width (ANGULAR_STEPS), safe to overshoot max
-	vfloat mult = vfloat(1.0f / (2.0f * astc::PI));
+	vfloat mult(1.0f / (2.0f * astc::PI));
 
 	for (unsigned int i = 0; i < max_angular_steps; i += ASTCENC_SIMD_WIDTH)
 	{
diff --git a/Test/Images/Small/astc_reference-main-avx2_fast_results.csv b/Test/Images/Small/astc_reference-main-avx2_fast_results.csv
new file mode 100644
index 00000000..a214a355
--- /dev/null
+++ b/Test/Images/Small/astc_reference-main-avx2_fast_results.csv
@@ -0,0 +1,150 @@
+Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
+Small,4x4,hdr-rgb-00.hdr,33.7281,0.1430,0.0123,5.3291
+Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0066,0.0011,0.2317
+Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0061,0.0010,0.2623
+Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0010,0.2515
+Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0064,0.0010,0.2522
+Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0064,0.0011,0.2384
+Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0068,0.0010,0.2490
+Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0064,0.0011,0.2321
+Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0065,0.0010,0.2510
+Small,4x4,ldr-rgb-00.png,38.2700,0.0211,0.0079,8.2653
+Small,4x4,ldr-rgb-01.png,39.9568,0.0201,0.0068,9.7075
+Small,4x4,ldr-rgb-02.png,35.1963,0.0242,0.0109,6.0319
+Small,4x4,ldr-rgb-03.png,46.0468,0.0154,0.0027,24.5734
+Small,4x4,ldr-rgb-04.png,42.0037,0.0181,0.0047,13.7998
+Small,4x4,ldr-rgb-05.png,37.3577,0.0246,0.0104,6.2750
+Small,4x4,ldr-rgb-06.png,35.3918,0.0235,0.0097,6.7326
+Small,4x4,ldr-rgb-07.png,38.1915,0.0248,0.0111,5.9116
+Small,4x4,ldr-rgb-08.png,43.9030,0.0171,0.0039,16.7701
+Small,4x4,ldr-rgb-09.png,41.9060,0.0181,0.0048,13.6762
+Small,4x4,ldr-rgb-10.png,44.4833,0.0126,0.0013,12.1951
+Small,4x4,ldr-rgba-00.png,35.6074,0.0238,0.0107,6.1129
+Small,4x4,ldr-rgba-01.png,38.8915,0.0196,0.0064,10.2162
+Small,4x4,ldr-rgba-02.png,34.9103,0.0226,0.0089,7.3603
+Small,4x4,ldr-xy-00.png,37.6559,0.0192,0.0045,14.6711
+Small,4x4,ldr-xy-01.png,44.2121,0.0199,0.0052,12.5092
+Small,4x4,ldr-xy-02.png,48.3456,0.0180,0.0033,20.0905
+Small,4x4,ldrs-rgba-00.png,35.6094,0.0244,0.0107,6.1020
+Small,4x4,ldrs-rgba-01.png,38.8931,0.0196,0.0064,10.3190
+Small,4x4,ldrs-rgba-02.png,34.8940,0.0221,0.0089,7.3495
+Small,5x5,hdr-rgb-00.hdr,29.5408,0.1404,0.0116,5.6570
+Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0065,0.0010,0.2678
+Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0066,0.0010,0.2602
+Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0067,0.0011,0.2240
+Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0068,0.0010,0.2498
+Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0066,0.0010,0.2557
+Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0067,0.0010,0.2464
+Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0067,0.0010,0.2558
+Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0070,0.0011,0.2424
+Small,5x5,ldr-rgb-00.png,34.4428,0.0212,0.0076,8.6266
+Small,5x5,ldr-rgb-01.png,36.2681,0.0188,0.0052,12.5693
+Small,5x5,ldr-rgb-02.png,31.1084,0.0220,0.0080,8.1433
+Small,5x5,ldr-rgb-03.png,42.8306,0.0156,0.0021,31.7704
+Small,5x5,ldr-rgb-04.png,37.2853,0.0181,0.0043,15.1148
+Small,5x5,ldr-rgb-05.png,33.2825,0.0242,0.0103,6.3437
+Small,5x5,ldr-rgb-06.png,31.1484,0.0217,0.0080,8.2168
+Small,5x5,ldr-rgb-07.png,35.0995,0.0218,0.0084,7.8011
+Small,5x5,ldr-rgb-08.png,40.2476,0.0166,0.0032,20.1953
+Small,5x5,ldr-rgb-09.png,37.2955,0.0178,0.0044,14.9244
+Small,5x5,ldr-rgb-10.png,40.2090,0.0132,0.0012,13.2162
+Small,5x5,ldr-rgba-00.png,32.1528,0.0243,0.0108,6.0598
+Small,5x5,ldr-rgba-01.png,35.2203,0.0192,0.0058,11.3501
+Small,5x5,ldr-rgba-02.png,31.1534,0.0215,0.0082,7.9495
+Small,5x5,ldr-xy-00.png,36.7449,0.0184,0.0035,18.7412
+Small,5x5,ldr-xy-01.png,39.8543,0.0201,0.0044,15.0379
+Small,5x5,ldr-xy-02.png,43.9848,0.0183,0.0031,21.4380
+Small,5x5,ldrs-rgba-00.png,32.1509,0.0245,0.0109,6.0263
+Small,5x5,ldrs-rgba-01.png,35.2197,0.0193,0.0058,11.2218
+Small,5x5,ldrs-rgba-02.png,31.1463,0.0219,0.0086,7.6634
+Small,6x6,hdr-rgb-00.hdr,27.0804,0.1416,0.0112,5.8472
+Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0069,0.0010,0.2495
+Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0070,0.0011,0.2311
+Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0069,0.0010,0.2471
+Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0072,0.0010,0.2488
+Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0069,0.0010,0.2552
+Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0067,0.0010,0.2455
+Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0067,0.0010,0.2623
+Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0070,0.0010,0.2550
+Small,6x6,ldr-rgb-00.png,31.7206,0.0228,0.0089,7.3281
+Small,6x6,ldr-rgb-01.png,32.9366,0.0206,0.0060,10.9300
+Small,6x6,ldr-rgb-02.png,27.4940,0.0227,0.0087,7.5406
+Small,6x6,ldr-rgb-03.png,40.6226,0.0156,0.0021,30.4946
+Small,6x6,ldr-rgb-04.png,33.9446,0.0188,0.0050,13.1125
+Small,6x6,ldr-rgb-05.png,30.0005,0.0263,0.0117,5.5880
+Small,6x6,ldr-rgb-06.png,27.5678,0.0228,0.0089,7.3993
+Small,6x6,ldr-rgb-07.png,32.9834,0.0222,0.0082,7.9504
+Small,6x6,ldr-rgb-08.png,37.8944,0.0171,0.0032,20.2907
+Small,6x6,ldr-rgb-09.png,33.4981,0.0192,0.0051,12.7423
+Small,6x6,ldr-rgb-10.png,36.7079,0.0131,0.0014,11.4554
+Small,6x6,ldr-rgba-00.png,29.6014,0.0256,0.0123,5.3398
+Small,6x6,ldr-rgba-01.png,32.1034,0.0197,0.0065,10.0251
+Small,6x6,ldr-rgba-02.png,27.8517,0.0232,0.0094,6.9904
+Small,6x6,ldr-xy-00.png,35.8913,0.0188,0.0036,18.2147
+Small,6x6,ldr-xy-01.png,37.1368,0.0204,0.0051,12.8604
+Small,6x6,ldr-xy-02.png,41.9613,0.0183,0.0028,23.1906
+Small,6x6,ldrs-rgba-00.png,29.6022,0.0255,0.0123,5.3126
+Small,6x6,ldrs-rgba-01.png,32.0949,0.0197,0.0066,9.9223
+Small,6x6,ldrs-rgba-02.png,27.8391,0.0230,0.0093,7.0683
+Small,8x8,hdr-rgb-00.hdr,23.7860,0.1464,0.0137,4.7798
+Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0067,0.0009,0.2762
+Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0070,0.0012,0.2207
+Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0070,0.0010,0.2552
+Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0069,0.0012,0.2173
+Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0070,0.0010,0.2459
+Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0067,0.0011,0.2415
+Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0069,0.0010,0.2438
+Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0069,0.0010,0.2535
+Small,8x8,ldr-rgb-00.png,28.0746,0.0237,0.0100,6.5589
+Small,8x8,ldr-rgb-01.png,28.7937,0.0222,0.0077,8.5289
+Small,8x8,ldr-rgb-02.png,23.1086,0.0262,0.0119,5.5249
+Small,8x8,ldr-rgb-03.png,37.3624,0.0159,0.0023,28.5587
+Small,8x8,ldr-rgb-04.png,29.3811,0.0215,0.0070,9.3448
+Small,8x8,ldr-rgb-05.png,25.8265,0.0283,0.0139,4.7247
+Small,8x8,ldr-rgb-06.png,23.1833,0.0261,0.0122,5.3775
+Small,8x8,ldr-rgb-07.png,29.8952,0.0218,0.0079,8.3274
+Small,8x8,ldr-rgb-08.png,34.5261,0.0173,0.0035,18.6017
+Small,8x8,ldr-rgb-09.png,28.6875,0.0210,0.0067,9.7641
+Small,8x8,ldr-rgb-10.png,32.0105,0.0140,0.0015,10.5415
+Small,8x8,ldr-rgba-00.png,25.7145,0.0267,0.0136,4.8206
+Small,8x8,ldr-rgba-01.png,28.3047,0.0231,0.0091,7.1963
+Small,8x8,ldr-rgba-02.png,23.9459,0.0269,0.0130,5.0343
+Small,8x8,ldr-xy-00.png,33.2938,0.0208,0.0046,14.3248
+Small,8x8,ldr-xy-01.png,34.3730,0.0219,0.0057,11.4834
+Small,8x8,ldr-xy-02.png,39.8922,0.0178,0.0020,33.3145
+Small,8x8,ldrs-rgba-00.png,25.7105,0.0272,0.0135,4.8470
+Small,8x8,ldrs-rgba-01.png,28.2986,0.0231,0.0091,7.2199
+Small,8x8,ldrs-rgba-02.png,23.9396,0.0266,0.0131,5.0027
+Small,12x12,hdr-rgb-00.hdr,20.5382,0.1550,0.0201,3.2555
+Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0085,0.0010,0.2464
+Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0084,0.0011,0.2413
+Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0085,0.0011,0.2272
+Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0087,0.0013,0.2017
+Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0082,0.0011,0.2436
+Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0088,0.0012,0.2164
+Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0093,0.0012,0.2080
+Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0082,0.0011,0.2415
+Small,12x12,ldr-rgb-00.png,23.7948,0.0236,0.0085,7.7348
+Small,12x12,ldr-rgb-01.png,24.7851,0.0219,0.0061,10.7086
+Small,12x12,ldr-rgb-02.png,19.2303,0.0302,0.0138,4.7493
+Small,12x12,ldr-rgb-03.png,33.2866,0.0174,0.0017,39.5508
+Small,12x12,ldr-rgb-04.png,24.5840,0.0230,0.0059,11.0682
+Small,12x12,ldr-rgb-05.png,21.4892,0.0280,0.0122,5.3802
+Small,12x12,ldr-rgb-06.png,19.2330,0.0297,0.0143,4.5734
+Small,12x12,ldr-rgb-07.png,25.4183,0.0209,0.0058,11.3170
+Small,12x12,ldr-rgb-08.png,30.2497,0.0181,0.0027,24.2269
+Small,12x12,ldr-rgb-09.png,23.7480,0.0225,0.0076,8.6461
+Small,12x12,ldr-rgb-10.png,27.3233,0.0167,0.0021,7.8452
+Small,12x12,ldr-rgba-00.png,21.5940,0.0297,0.0139,4.7020
+Small,12x12,ldr-rgba-01.png,24.5318,0.0231,0.0077,8.5080
+Small,12x12,ldr-rgba-02.png,20.1834,0.0318,0.0163,4.0103
+Small,12x12,ldr-xy-00.png,29.2789,0.0239,0.0046,14.1420
+Small,12x12,ldr-xy-01.png,30.5408,0.0222,0.0041,15.8294
+Small,12x12,ldr-xy-02.png,37.9893,0.0204,0.0013,51.5139
+Small,12x12,ldrs-rgba-00.png,21.5954,0.0294,0.0140,4.6929
+Small,12x12,ldrs-rgba-01.png,24.5289,0.0241,0.0077,8.5033
+Small,12x12,ldrs-rgba-02.png,20.1810,0.0336,0.0162,4.0542
+Small,3x3x3,ldr-l-00-3.dds,50.2792,0.0176,0.0077,34.1771
+Small,3x3x3,ldr-l-01-3.dds,51.8778,0.0099,0.0033,20.8975
+Small,6x6x6,ldr-l-00-3.dds,32.5382,0.0472,0.0353,7.4355
+Small,6x6x6,ldr-l-01-3.dds,40.8480,0.0227,0.0137,5.0212
diff --git a/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
new file mode 100644
index 00000000..72901463
--- /dev/null
+++ b/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
@@ -0,0 +1,150 @@
+Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
+Small,4x4,hdr-rgb-00.hdr,33.3455,0.1369,0.0074,8.8791
+Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0057,0.0010,0.2655
+Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0063,0.0011,0.2392
+Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0061,0.0010,0.2512
+Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0059,0.0010,0.2509
+Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0062,0.0010,0.2658
+Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0059,0.0010,0.2684
+Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0059,0.0010,0.2527
+Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0060,0.0010,0.2464
+Small,4x4,ldr-rgb-00.png,37.2582,0.0171,0.0045,14.5277
+Small,4x4,ldr-rgb-01.png,39.5673,0.0172,0.0041,16.0232
+Small,4x4,ldr-rgb-02.png,34.8275,0.0193,0.0059,11.1530
+Small,4x4,ldr-rgb-03.png,45.4522,0.0148,0.0019,34.9896
+Small,4x4,ldr-rgb-04.png,41.7305,0.0172,0.0032,20.3840
+Small,4x4,ldr-rgb-05.png,36.8931,0.0198,0.0062,10.6319
+Small,4x4,ldr-rgb-06.png,35.0002,0.0189,0.0055,11.8273
+Small,4x4,ldr-rgb-07.png,37.4127,0.0186,0.0059,11.0535
+Small,4x4,ldr-rgb-08.png,43.0312,0.0157,0.0026,24.7593
+Small,4x4,ldr-rgb-09.png,41.7130,0.0165,0.0032,20.3147
+Small,4x4,ldr-rgb-10.png,43.9511,0.0122,0.0010,15.4820
+Small,4x4,ldr-rgba-00.png,34.7402,0.0186,0.0060,10.9811
+Small,4x4,ldr-rgba-01.png,38.6972,0.0172,0.0045,14.4901
+Small,4x4,ldr-rgba-02.png,34.6012,0.0192,0.0062,10.5092
+Small,4x4,ldr-xy-00.png,37.6162,0.0180,0.0033,19.9086
+Small,4x4,ldr-xy-01.png,43.9365,0.0180,0.0037,17.5093
+Small,4x4,ldr-xy-02.png,48.3672,0.0169,0.0028,23.0120
+Small,4x4,ldrs-rgba-00.png,34.7410,0.0190,0.0059,11.0371
+Small,4x4,ldrs-rgba-01.png,38.6987,0.0172,0.0046,14.3031
+Small,4x4,ldrs-rgba-02.png,34.5841,0.0190,0.0063,10.4109
+Small,5x5,hdr-rgb-00.hdr,28.8643,0.1374,0.0070,9.3569
+Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0064,0.0011,0.2390
+Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0065,0.0010,0.2518
+Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0063,0.0010,0.2528
+Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0010,0.2493
+Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0060,0.0010,0.2667
+Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0062,0.0010,0.2522
+Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0058,0.0011,0.2436
+Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0062,0.0010,0.2653
+Small,5x5,ldr-rgb-00.png,33.7309,0.0156,0.0044,14.7903
+Small,5x5,ldr-rgb-01.png,36.0941,0.0169,0.0039,16.9031
+Small,5x5,ldr-rgb-02.png,31.0119,0.0193,0.0058,11.3016
+Small,5x5,ldr-rgb-03.png,42.4377,0.0151,0.0017,39.1731
+Small,5x5,ldr-rgb-04.png,37.0451,0.0166,0.0034,19.2411
+Small,5x5,ldr-rgb-05.png,32.9781,0.0199,0.0065,10.1293
+Small,5x5,ldr-rgb-06.png,31.0536,0.0191,0.0057,11.5480
+Small,5x5,ldr-rgb-07.png,34.4657,0.0192,0.0053,12.3396
+Small,5x5,ldr-rgb-08.png,39.6318,0.0156,0.0024,27.7123
+Small,5x5,ldr-rgb-09.png,37.0745,0.0166,0.0033,19.8597
+Small,5x5,ldr-rgb-10.png,39.9327,0.0123,0.0010,16.1264
+Small,5x5,ldr-rgba-00.png,31.1179,0.0181,0.0061,10.7897
+Small,5x5,ldr-rgba-01.png,35.0621,0.0170,0.0044,15.0585
+Small,5x5,ldr-rgba-02.png,31.0579,0.0191,0.0062,10.5755
+Small,5x5,ldr-xy-00.png,36.6252,0.0173,0.0028,23.4158
+Small,5x5,ldr-xy-01.png,39.2899,0.0177,0.0032,20.4279
+Small,5x5,ldr-xy-02.png,43.8853,0.0177,0.0028,23.0351
+Small,5x5,ldrs-rgba-00.png,31.1140,0.0190,0.0061,10.8322
+Small,5x5,ldrs-rgba-01.png,35.0617,0.0174,0.0043,15.1665
+Small,5x5,ldrs-rgba-02.png,31.0429,0.0195,0.0063,10.3599
+Small,6x6,hdr-rgb-00.hdr,26.7571,0.1386,0.0061,10.6961
+Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0061,0.0010,0.2518
+Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0065,0.0010,0.2527
+Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0065,0.0010,0.2478
+Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0063,0.0010,0.2440
+Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0063,0.0010,0.2486
+Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0066,0.0010,0.2464
+Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0064,0.0010,0.2647
+Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0062,0.0010,0.2645
+Small,6x6,ldr-rgb-00.png,31.3524,0.0179,0.0050,13.1628
+Small,6x6,ldr-rgb-01.png,32.8547,0.0179,0.0042,15.7577
+Small,6x6,ldr-rgb-02.png,27.4165,0.0194,0.0063,10.3599
+Small,6x6,ldr-rgb-03.png,40.3501,0.0145,0.0017,37.7476
+Small,6x6,ldr-rgb-04.png,33.7683,0.0170,0.0038,17.3841
+Small,6x6,ldr-rgb-05.png,29.7573,0.0203,0.0070,9.3132
+Small,6x6,ldr-rgb-06.png,27.4890,0.0196,0.0063,10.4093
+Small,6x6,ldr-rgb-07.png,32.3734,0.0193,0.0051,12.8226
+Small,6x6,ldr-rgb-08.png,37.5098,0.0153,0.0023,28.4936
+Small,6x6,ldr-rgb-09.png,33.3229,0.0179,0.0038,17.2923
+Small,6x6,ldr-rgb-10.png,36.5829,0.0125,0.0011,14.5255
+Small,6x6,ldr-rgba-00.png,28.8653,0.0196,0.0062,10.5208
+Small,6x6,ldr-rgba-01.png,32.0118,0.0185,0.0048,13.6905
+Small,6x6,ldr-rgba-02.png,27.7975,0.0195,0.0063,10.4723
+Small,6x6,ldr-xy-00.png,35.6703,0.0173,0.0028,23.5482
+Small,6x6,ldr-xy-01.png,36.5669,0.0184,0.0036,18.4556
+Small,6x6,ldr-xy-02.png,41.8230,0.0168,0.0024,27.4302
+Small,6x6,ldrs-rgba-00.png,28.8588,0.0191,0.0063,10.4042
+Small,6x6,ldrs-rgba-01.png,32.0060,0.0178,0.0046,14.1180
+Small,6x6,ldrs-rgba-02.png,27.7847,0.0197,0.0064,10.1988
+Small,8x8,hdr-rgb-00.hdr,23.6223,0.1411,0.0093,7.0834
+Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0068,0.0010,0.2580
+Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0068,0.0010,0.2580
+Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0070,0.0011,0.2431
+Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0068,0.0010,0.2534
+Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0067,0.0010,0.2642
+Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0068,0.0011,0.2424
+Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0065,0.0010,0.2530
+Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0067,0.0010,0.2440
+Small,8x8,ldr-rgb-00.png,27.7275,0.0205,0.0069,9.4681
+Small,8x8,ldr-rgb-01.png,28.7129,0.0202,0.0058,11.2392
+Small,8x8,ldr-rgb-02.png,23.0425,0.0230,0.0086,7.5948
+Small,8x8,ldr-rgb-03.png,37.0898,0.0156,0.0019,35.3632
+Small,8x8,ldr-rgb-04.png,29.1776,0.0192,0.0055,11.8789
+Small,8x8,ldr-rgb-05.png,25.6293,0.0239,0.0099,6.6285
+Small,8x8,ldr-rgb-06.png,23.0989,0.0226,0.0089,7.3250
+Small,8x8,ldr-rgb-07.png,29.5159,0.0199,0.0058,11.3165
+Small,8x8,ldr-rgb-08.png,34.0104,0.0159,0.0027,24.7126
+Small,8x8,ldr-rgb-09.png,28.4945,0.0197,0.0052,12.5693
+Small,8x8,ldr-rgb-10.png,31.9035,0.0136,0.0013,12.2697
+Small,8x8,ldr-rgba-00.png,25.3547,0.0225,0.0092,7.1560
+Small,8x8,ldr-rgba-01.png,28.2032,0.0206,0.0066,9.8685
+Small,8x8,ldr-rgba-02.png,23.8879,0.0230,0.0090,7.2432
+Small,8x8,ldr-xy-00.png,33.2442,0.0191,0.0037,17.4859
+Small,8x8,ldr-xy-01.png,34.2088,0.0200,0.0042,15.5035
+Small,8x8,ldr-xy-02.png,39.7685,0.0178,0.0018,36.4898
+Small,8x8,ldrs-rgba-00.png,25.3518,0.0228,0.0092,7.1297
+Small,8x8,ldrs-rgba-01.png,28.1928,0.0201,0.0065,10.0669
+Small,8x8,ldrs-rgba-02.png,23.8821,0.0226,0.0091,7.2008
+Small,12x12,hdr-rgb-00.hdr,20.4606,0.1472,0.0141,4.6496
+Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0080,0.0011,0.2431
+Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0083,0.0010,0.2540
+Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0080,0.0011,0.2290
+Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0084,0.0010,0.2495
+Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0082,0.0011,0.2315
+Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0086,0.0011,0.2272
+Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0086,0.0009,0.2949
+Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0076,0.0011,0.2334
+Small,12x12,ldr-rgb-00.png,23.7264,0.0212,0.0062,10.6167
+Small,12x12,ldr-rgb-01.png,24.7407,0.0207,0.0046,14.3562
+Small,12x12,ldr-rgb-02.png,19.1965,0.0249,0.0098,6.6923
+Small,12x12,ldr-rgb-03.png,33.1663,0.0158,0.0015,44.1004
+Small,12x12,ldr-rgb-04.png,24.3920,0.0194,0.0045,14.5538
+Small,12x12,ldr-rgb-05.png,21.3893,0.0245,0.0089,7.3471
+Small,12x12,ldr-rgb-06.png,19.1765,0.0255,0.0102,6.4212
+Small,12x12,ldr-rgb-07.png,25.3504,0.0203,0.0043,15.2973
+Small,12x12,ldr-rgb-08.png,30.1545,0.0175,0.0021,31.3394
+Small,12x12,ldr-rgb-09.png,23.5954,0.0213,0.0057,11.4815
+Small,12x12,ldr-rgb-10.png,27.2800,0.0144,0.0016,10.0342
+Small,12x12,ldr-rgba-00.png,21.3728,0.0246,0.0097,6.7514
+Small,12x12,ldr-rgba-01.png,24.4832,0.0223,0.0055,11.8339
+Small,12x12,ldr-rgba-02.png,20.1479,0.0277,0.0121,5.4074
+Small,12x12,ldr-xy-00.png,28.9003,0.0216,0.0036,18.2959
+Small,12x12,ldr-xy-01.png,29.7608,0.0222,0.0033,19.8167
+Small,12x12,ldr-xy-02.png,37.9676,0.0205,0.0011,60.1220
+Small,12x12,ldrs-rgba-00.png,21.3686,0.0263,0.0098,6.6690
+Small,12x12,ldrs-rgba-01.png,24.4810,0.0205,0.0056,11.7827
+Small,12x12,ldrs-rgba-02.png,20.1455,0.0285,0.0117,5.6010
+Small,3x3x3,ldr-l-00-3.dds,50.1595,0.0173,0.0076,34.6893
+Small,3x3x3,ldr-l-01-3.dds,51.8572,0.0098,0.0033,21.0069
+Small,6x6x6,ldr-l-00-3.dds,32.5210,0.0475,0.0353,7.4346
+Small,6x6x6,ldr-l-01-3.dds,40.8480,0.0224,0.0137,5.0139
diff --git a/Test/Images/Small/astc_reference-main-avx2_medium_results.csv b/Test/Images/Small/astc_reference-main-avx2_medium_results.csv
new file mode 100644
index 00000000..fd0f8fd5
--- /dev/null
+++ b/Test/Images/Small/astc_reference-main-avx2_medium_results.csv
@@ -0,0 +1,150 @@
+Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
+Small,4x4,hdr-rgb-00.hdr,34.1456,0.1493,0.0184,3.5600
+Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0066,0.0011,0.2411
+Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0069,0.0011,0.2377
+Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0068,0.0010,0.2604
+Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0069,0.0010,0.2535
+Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0070,0.0013,0.2029
+Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0066,0.0010,0.2645
+Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0066,0.0010,0.2466
+Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0066,0.0010,0.2552
+Small,4x4,ldr-rgb-00.png,38.8513,0.0340,0.0205,3.2044
+Small,4x4,ldr-rgb-01.png,40.2580,0.0312,0.0175,3.7494
+Small,4x4,ldr-rgb-02.png,35.3269,0.0312,0.0173,3.7806
+Small,4x4,ldr-rgb-03.png,47.3369,0.0252,0.0114,5.7282
+Small,4x4,ldr-rgb-04.png,42.2423,0.0285,0.0139,4.7084
+Small,4x4,ldr-rgb-05.png,37.8450,0.0341,0.0192,3.4128
+Small,4x4,ldr-rgb-06.png,35.5074,0.0292,0.0153,4.2927
+Small,4x4,ldr-rgb-07.png,39.3473,0.0386,0.0250,2.6251
+Small,4x4,ldr-rgb-08.png,45.3043,0.0266,0.0132,4.9717
+Small,4x4,ldr-rgb-09.png,42.1529,0.0283,0.0150,4.3790
+Small,4x4,ldr-rgb-10.png,44.9880,0.0131,0.0023,6.9291
+Small,4x4,ldr-rgba-00.png,36.2682,0.0362,0.0226,2.8979
+Small,4x4,ldr-rgba-01.png,38.9989,0.0260,0.0131,5.0084
+Small,4x4,ldr-rgba-02.png,34.9755,0.0283,0.0144,4.5553
+Small,4x4,ldr-xy-00.png,37.8046,0.0266,0.0122,5.3643
+Small,4x4,ldr-xy-01.png,45.2627,0.0332,0.0183,3.5779
+Small,4x4,ldr-xy-02.png,51.3219,0.0370,0.0223,2.9362
+Small,4x4,ldrs-rgba-00.png,36.2670,0.0357,0.0226,2.9010
+Small,4x4,ldrs-rgba-01.png,38.9998,0.0266,0.0131,4.9940
+Small,4x4,ldrs-rgba-02.png,34.9622,0.0280,0.0142,4.6237
+Small,5x5,hdr-rgb-00.hdr,29.8960,0.1511,0.0189,3.4747
+Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0065,0.0010,0.2647
+Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0070,0.0010,0.2550
+Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0068,0.0011,0.2429
+Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0061,0.0010,0.2571
+Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0068,0.0010,0.2500
+Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0065,0.0010,0.2647
+Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0066,0.0010,0.2560
+Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0071,0.0010,0.2570
+Small,5x5,ldr-rgb-00.png,35.1560,0.0327,0.0195,3.3541
+Small,5x5,ldr-rgb-01.png,36.4651,0.0276,0.0142,4.6015
+Small,5x5,ldr-rgb-02.png,31.1519,0.0284,0.0144,4.5552
+Small,5x5,ldr-rgb-03.png,44.1065,0.0197,0.0062,10.4943
+Small,5x5,ldr-rgb-04.png,37.6960,0.0269,0.0130,5.0591
+Small,5x5,ldr-rgb-05.png,33.5625,0.0344,0.0208,3.1520
+Small,5x5,ldr-rgb-06.png,31.1954,0.0276,0.0139,4.7121
+Small,5x5,ldr-rgb-07.png,36.2028,0.0372,0.0239,2.7412
+Small,5x5,ldr-rgb-08.png,41.7251,0.0239,0.0102,6.4429
+Small,5x5,ldr-rgb-09.png,37.5911,0.0266,0.0122,5.3775
+Small,5x5,ldr-rgb-10.png,40.6060,0.0144,0.0024,6.7201
+Small,5x5,ldr-rgba-00.png,32.8029,0.0378,0.0235,2.7830
+Small,5x5,ldr-rgba-01.png,35.3460,0.0268,0.0137,4.7984
+Small,5x5,ldr-rgba-02.png,31.1673,0.0288,0.0150,4.3598
+Small,5x5,ldr-xy-00.png,37.0976,0.0262,0.0111,5.8824
+Small,5x5,ldr-xy-01.png,40.7362,0.0312,0.0158,4.1389
+Small,5x5,ldr-xy-02.png,49.2303,0.0274,0.0123,5.3382
+Small,5x5,ldrs-rgba-00.png,32.8008,0.0373,0.0237,2.7680
+Small,5x5,ldrs-rgba-01.png,35.3451,0.0268,0.0135,4.8516
+Small,5x5,ldrs-rgba-02.png,31.1597,0.0289,0.0154,4.2584
+Small,6x6,hdr-rgb-00.hdr,27.5178,0.1500,0.0194,3.3773
+Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0066,0.0010,0.2507
+Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0068,0.0011,0.2240
+Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0069,0.0010,0.2602
+Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0067,0.0010,0.2476
+Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0069,0.0011,0.2417
+Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0070,0.0011,0.2366
+Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0072,0.0012,0.2135
+Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0069,0.0010,0.2510
+Small,6x6,ldr-rgb-00.png,32.4055,0.0335,0.0203,3.2338
+Small,6x6,ldr-rgb-01.png,33.1088,0.0283,0.0140,4.6765
+Small,6x6,ldr-rgb-02.png,27.5242,0.0291,0.0149,4.3890
+Small,6x6,ldr-rgb-03.png,41.7669,0.0184,0.0049,13.3832
+Small,6x6,ldr-rgb-04.png,34.2170,0.0264,0.0121,5.4359
+Small,6x6,ldr-rgb-05.png,30.1610,0.0346,0.0210,3.1282
+Small,6x6,ldr-rgb-06.png,27.5989,0.0293,0.0144,4.5562
+Small,6x6,ldr-rgb-07.png,33.9304,0.0363,0.0226,2.8988
+Small,6x6,ldr-rgb-08.png,39.2751,0.0213,0.0078,8.4539
+Small,6x6,ldr-rgb-09.png,33.6804,0.0260,0.0116,5.6633
+Small,6x6,ldr-rgb-10.png,37.0384,0.0142,0.0024,6.7648
+Small,6x6,ldr-rgba-00.png,30.2356,0.0399,0.0261,2.5156
+Small,6x6,ldr-rgba-01.png,32.2252,0.0273,0.0138,4.7435
+Small,6x6,ldr-rgba-02.png,27.8666,0.0296,0.0162,4.0562
+Small,6x6,ldr-xy-00.png,36.2425,0.0258,0.0093,7.0529
+Small,6x6,ldr-xy-01.png,38.0098,0.0270,0.0115,5.6781
+Small,6x6,ldr-xy-02.png,46.1924,0.0243,0.0082,7.9689
+Small,6x6,ldrs-rgba-00.png,30.2304,0.0406,0.0264,2.4823
+Small,6x6,ldrs-rgba-01.png,32.2181,0.0272,0.0137,4.7900
+Small,6x6,ldrs-rgba-02.png,27.8512,0.0301,0.0163,4.0088
+Small,8x8,hdr-rgb-00.hdr,24.1376,0.1587,0.0250,2.6215
+Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0082,0.0014,0.1874
+Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0079,0.0011,0.2333
+Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0082,0.0010,0.2650
+Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0075,0.0010,0.2618
+Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0079,0.0010,0.2495
+Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0080,0.0012,0.2195
+Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0079,0.0010,0.2540
+Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0079,0.0011,0.2313
+Small,8x8,ldr-rgb-00.png,28.7714,0.0415,0.0277,2.3668
+Small,8x8,ldr-rgb-01.png,28.9669,0.0325,0.0180,3.6508
+Small,8x8,ldr-rgb-02.png,23.1676,0.0339,0.0194,3.3733
+Small,8x8,ldr-rgb-03.png,38.5942,0.0201,0.0057,11.5036
+Small,8x8,ldr-rgb-04.png,29.6864,0.0328,0.0174,3.7570
+Small,8x8,ldr-rgb-05.png,25.9572,0.0414,0.0266,2.4642
+Small,8x8,ldr-rgb-06.png,23.2220,0.0352,0.0197,3.3189
+Small,8x8,ldr-rgb-07.png,30.7945,0.0420,0.0275,2.3803
+Small,8x8,ldr-rgb-08.png,35.9533,0.0242,0.0095,6.8949
+Small,8x8,ldr-rgb-09.png,29.0250,0.0310,0.0158,4.1566
+Small,8x8,ldr-rgb-10.png,32.2021,0.0159,0.0032,5.0978
+Small,8x8,ldr-rgba-00.png,26.4617,0.0476,0.0337,1.9468
+Small,8x8,ldr-rgba-01.png,28.3979,0.0320,0.0178,3.6742
+Small,8x8,ldr-rgba-02.png,23.9546,0.0364,0.0215,3.0468
+Small,8x8,ldr-xy-00.png,34.0327,0.0291,0.0128,5.1056
+Small,8x8,ldr-xy-01.png,34.9901,0.0300,0.0130,5.0506
+Small,8x8,ldr-xy-02.png,41.7418,0.0261,0.0084,7.8206
+Small,8x8,ldrs-rgba-00.png,26.4585,0.0479,0.0337,1.9454
+Small,8x8,ldrs-rgba-01.png,28.3890,0.0321,0.0179,3.6578
+Small,8x8,ldrs-rgba-02.png,23.9483,0.0362,0.0213,3.0803
+Small,12x12,hdr-rgb-00.hdr,20.7711,0.1748,0.0368,1.7825
+Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0115,0.0014,0.1885
+Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0118,0.0012,0.2063
+Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0115,0.0014,0.1867
+Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0108,0.0010,0.2464
+Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0109,0.0011,0.2399
+Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0112,0.0013,0.1942
+Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0112,0.0015,0.1739
+Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0119,0.0012,0.2050
+Small,12x12,ldr-rgb-00.png,24.7065,0.0486,0.0328,2.0001
+Small,12x12,ldr-rgb-01.png,25.0522,0.0400,0.0235,2.7894
+Small,12x12,ldr-rgb-02.png,19.2748,0.0447,0.0281,2.3354
+Small,12x12,ldr-rgb-03.png,35.0223,0.0235,0.0062,10.6492
+Small,12x12,ldr-rgb-04.png,24.9003,0.0389,0.0216,3.0384
+Small,12x12,ldr-rgb-05.png,21.6546,0.0513,0.0345,1.9002
+Small,12x12,ldr-rgb-06.png,19.2632,0.0456,0.0289,2.2649
+Small,12x12,ldr-rgb-07.png,26.7793,0.0455,0.0294,2.2253
+Small,12x12,ldr-rgb-08.png,31.7409,0.0268,0.0103,6.3443
+Small,12x12,ldr-rgb-09.png,24.1684,0.0392,0.0206,3.1841
+Small,12x12,ldr-rgb-10.png,28.0441,0.0242,0.0066,2.4515
+Small,12x12,ldr-rgba-00.png,22.2726,0.0543,0.0382,1.7151
+Small,12x12,ldr-rgba-01.png,24.6716,0.0387,0.0222,2.9484
+Small,12x12,ldr-rgba-02.png,20.1919,0.0475,0.0313,2.0920
+Small,12x12,ldr-xy-00.png,30.2042,0.0332,0.0146,4.4781
+Small,12x12,ldr-xy-01.png,31.9775,0.0367,0.0157,4.1817
+Small,12x12,ldr-xy-02.png,38.5097,0.0254,0.0035,18.5540
+Small,12x12,ldrs-rgba-00.png,22.2700,0.0548,0.0385,1.7033
+Small,12x12,ldrs-rgba-01.png,24.6720,0.0379,0.0221,2.9630
+Small,12x12,ldrs-rgba-02.png,20.1895,0.0469,0.0310,2.1170
+Small,3x3x3,ldr-l-00-3.dds,51.2292,0.0204,0.0107,24.4651
+Small,3x3x3,ldr-l-01-3.dds,52.5354,0.0104,0.0036,19.3207
+Small,6x6x6,ldr-l-00-3.dds,32.9609,0.0558,0.0428,6.1319
+Small,6x6x6,ldr-l-01-3.dds,40.9534,0.0241,0.0137,5.0451
diff --git a/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
new file mode 100644
index 00000000..2ffef5dd
--- /dev/null
+++ b/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
@@ -0,0 +1,150 @@
+Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
+Small,4x4,hdr-rgb-00.hdr,34.4181,0.1667,0.0357,1.8344
+Small,4x4,hdr-rgb-r16.ktx,999.0000,0.0066,0.0010,0.2576
+Small,4x4,hdr-rgb-r32.ktx,999.0000,0.0067,0.0010,0.2519
+Small,4x4,hdr-rgb-rg16.ktx,999.0000,0.0067,0.0009,0.2738
+Small,4x4,hdr-rgb-rg32.ktx,999.0000,0.0067,0.0010,0.2642
+Small,4x4,hdr-rgb-rgb16.ktx,999.0000,0.0071,0.0012,0.2181
+Small,4x4,hdr-rgb-rgb32.ktx,999.0000,0.0068,0.0010,0.2498
+Small,4x4,hdr-rgba-rgba16.ktx,999.0000,0.0068,0.0010,0.2550
+Small,4x4,hdr-rgba-rgba32.ktx,999.0000,0.0067,0.0010,0.2580
+Small,4x4,ldr-rgb-00.png,39.1728,0.0543,0.0413,1.5861
+Small,4x4,ldr-rgb-01.png,40.4449,0.0532,0.0393,1.6657
+Small,4x4,ldr-rgb-02.png,35.5045,0.0503,0.0364,1.8023
+Small,4x4,ldr-rgb-03.png,47.8117,0.0506,0.0372,1.7638
+Small,4x4,ldr-rgb-04.png,42.3894,0.0465,0.0328,1.9954
+Small,4x4,ldr-rgb-05.png,38.0197,0.0537,0.0400,1.6376
+Small,4x4,ldr-rgb-06.png,35.6707,0.0457,0.0318,2.0579
+Small,4x4,ldr-rgb-07.png,39.9565,0.0626,0.0491,1.3344
+Small,4x4,ldr-rgb-08.png,45.9978,0.0486,0.0350,1.8700
+Small,4x4,ldr-rgb-09.png,42.3000,0.0496,0.0359,1.8258
+Small,4x4,ldr-rgb-10.png,45.1911,0.0169,0.0047,3.4455
+Small,4x4,ldr-rgba-00.png,36.7550,0.0567,0.0434,1.5107
+Small,4x4,ldr-rgba-01.png,39.1428,0.0435,0.0300,2.1844
+Small,4x4,ldr-rgba-02.png,35.0643,0.0425,0.0295,2.2250
+Small,4x4,ldr-xy-00.png,37.7684,0.0497,0.0353,1.8583
+Small,4x4,ldr-xy-01.png,45.5023,0.0543,0.0398,1.6454
+Small,4x4,ldr-xy-02.png,51.3360,0.0690,0.0545,1.2026
+Small,4x4,ldrs-rgba-00.png,36.7558,0.0567,0.0433,1.5136
+Small,4x4,ldrs-rgba-01.png,39.1418,0.0435,0.0300,2.1830
+Small,4x4,ldrs-rgba-02.png,35.0521,0.0429,0.0296,2.2115
+Small,5x5,hdr-rgb-00.hdr,30.3023,0.1705,0.0379,1.7275
+Small,5x5,hdr-rgb-r16.ktx,999.0000,0.0073,0.0011,0.2313
+Small,5x5,hdr-rgb-r32.ktx,999.0000,0.0074,0.0010,0.2459
+Small,5x5,hdr-rgb-rg16.ktx,999.0000,0.0076,0.0010,0.2672
+Small,5x5,hdr-rgb-rg32.ktx,999.0000,0.0073,0.0010,0.2450
+Small,5x5,hdr-rgb-rgb16.ktx,999.0000,0.0073,0.0010,0.2602
+Small,5x5,hdr-rgb-rgb32.ktx,999.0000,0.0075,0.0010,0.2495
+Small,5x5,hdr-rgba-rgba16.ktx,999.0000,0.0073,0.0010,0.2540
+Small,5x5,hdr-rgba-rgba32.ktx,999.0000,0.0074,0.0012,0.2205
+Small,5x5,ldr-rgb-00.png,35.4087,0.0585,0.0450,1.4556
+Small,5x5,ldr-rgb-01.png,36.5693,0.0533,0.0389,1.6827
+Small,5x5,ldr-rgb-02.png,31.2265,0.0476,0.0332,1.9714
+Small,5x5,ldr-rgb-03.png,44.6467,0.0539,0.0399,1.6423
+Small,5x5,ldr-rgb-04.png,37.8494,0.0490,0.0349,1.8788
+Small,5x5,ldr-rgb-05.png,33.7109,0.0592,0.0448,1.4632
+Small,5x5,ldr-rgb-06.png,31.2594,0.0453,0.0308,2.1266
+Small,5x5,ldr-rgb-07.png,36.7772,0.0696,0.0555,1.1808
+Small,5x5,ldr-rgb-08.png,42.4862,0.0524,0.0386,1.6961
+Small,5x5,ldr-rgb-09.png,37.7207,0.0530,0.0390,1.6808
+Small,5x5,ldr-rgb-10.png,40.7712,0.0177,0.0052,3.0975
+Small,5x5,ldr-rgba-00.png,33.1370,0.0635,0.0496,1.3210
+Small,5x5,ldr-rgba-01.png,35.4402,0.0460,0.0324,2.0210
+Small,5x5,ldr-rgba-02.png,31.2042,0.0451,0.0313,2.0910
+Small,5x5,ldr-xy-00.png,37.2094,0.0550,0.0400,1.6375
+Small,5x5,ldr-xy-01.png,41.5252,0.0634,0.0483,1.3569
+Small,5x5,ldr-xy-02.png,49.4271,0.0738,0.0586,1.1189
+Small,5x5,ldrs-rgba-00.png,33.1344,0.0631,0.0493,1.3296
+Small,5x5,ldrs-rgba-01.png,35.4371,0.0463,0.0325,2.0159
+Small,5x5,ldrs-rgba-02.png,31.2008,0.0450,0.0312,2.1006
+Small,6x6,hdr-rgb-00.hdr,27.7108,0.1704,0.0399,1.6422
+Small,6x6,hdr-rgb-r16.ktx,999.0000,0.0076,0.0013,0.2035
+Small,6x6,hdr-rgb-r32.ktx,999.0000,0.0076,0.0011,0.2399
+Small,6x6,hdr-rgb-rg16.ktx,999.0000,0.0078,0.0009,0.2732
+Small,6x6,hdr-rgb-rg32.ktx,999.0000,0.0075,0.0010,0.2469
+Small,6x6,hdr-rgb-rgb16.ktx,999.0000,0.0076,0.0010,0.2507
+Small,6x6,hdr-rgb-rgb32.ktx,999.0000,0.0076,0.0011,0.2375
+Small,6x6,hdr-rgba-rgba16.ktx,999.0000,0.0074,0.0011,0.2342
+Small,6x6,hdr-rgba-rgba32.ktx,999.0000,0.0077,0.0010,0.2512
+Small,6x6,ldr-rgb-00.png,32.6620,0.0623,0.0485,1.3523
+Small,6x6,ldr-rgb-01.png,33.2164,0.0551,0.0409,1.6033
+Small,6x6,ldr-rgb-02.png,27.5725,0.0488,0.0345,1.9017
+Small,6x6,ldr-rgb-03.png,42.5991,0.0479,0.0336,1.9484
+Small,6x6,ldr-rgb-04.png,34.3577,0.0495,0.0353,1.8547
+Small,6x6,ldr-rgb-05.png,30.3096,0.0602,0.0460,1.4257
+Small,6x6,ldr-rgb-06.png,27.6511,0.0472,0.0328,2.0005
+Small,6x6,ldr-rgb-07.png,34.4830,0.0722,0.0579,1.1313
+Small,6x6,ldr-rgb-08.png,40.0915,0.0468,0.0327,2.0013
+Small,6x6,ldr-rgb-09.png,33.8253,0.0532,0.0390,1.6806
+Small,6x6,ldr-rgb-10.png,37.2042,0.0184,0.0060,2.7284
+Small,6x6,ldr-rgba-00.png,30.5236,0.0677,0.0537,1.2197
+Small,6x6,ldr-rgba-01.png,32.2957,0.0500,0.0361,1.8175
+Small,6x6,ldr-rgba-02.png,27.9010,0.0470,0.0332,1.9764
+Small,6x6,ldr-xy-00.png,36.3195,0.0484,0.0333,1.9694
+Small,6x6,ldr-xy-01.png,38.0890,0.0618,0.0467,1.4038
+Small,6x6,ldr-xy-02.png,47.6556,0.0762,0.0611,1.0720
+Small,6x6,ldrs-rgba-00.png,30.5201,0.0680,0.0541,1.2111
+Small,6x6,ldrs-rgba-01.png,32.2889,0.0499,0.0361,1.8131
+Small,6x6,ldrs-rgba-02.png,27.8878,0.0474,0.0332,1.9752
+Small,8x8,hdr-rgb-00.hdr,24.3507,0.1856,0.0518,1.2662
+Small,8x8,hdr-rgb-r16.ktx,999.0000,0.0101,0.0012,0.2121
+Small,8x8,hdr-rgb-r32.ktx,999.0000,0.0102,0.0011,0.2294
+Small,8x8,hdr-rgb-rg16.ktx,999.0000,0.0092,0.0013,0.1941
+Small,8x8,hdr-rgb-rg32.ktx,999.0000,0.0101,0.0012,0.2058
+Small,8x8,hdr-rgb-rgb16.ktx,999.0000,0.0097,0.0011,0.2228
+Small,8x8,hdr-rgb-rgb32.ktx,999.0000,0.0103,0.0011,0.2357
+Small,8x8,hdr-rgba-rgba16.ktx,999.0000,0.0092,0.0011,0.2255
+Small,8x8,hdr-rgba-rgba32.ktx,999.0000,0.0102,0.0013,0.1980
+Small,8x8,ldr-rgb-00.png,28.9964,0.0766,0.0615,1.0653
+Small,8x8,ldr-rgb-01.png,29.0587,0.0660,0.0505,1.2972
+Small,8x8,ldr-rgb-02.png,23.2109,0.0615,0.0459,1.4265
+Small,8x8,ldr-rgb-03.png,39.4631,0.0350,0.0197,3.3252
+Small,8x8,ldr-rgb-04.png,29.8053,0.0592,0.0439,1.4921
+Small,8x8,ldr-rgb-05.png,26.0720,0.0711,0.0557,1.1768
+Small,8x8,ldr-rgb-06.png,23.2757,0.0603,0.0448,1.4629
+Small,8x8,ldr-rgb-07.png,31.2666,0.0833,0.0680,0.9637
+Small,8x8,ldr-rgb-08.png,36.6034,0.0468,0.0319,2.0526
+Small,8x8,ldr-rgb-09.png,29.1793,0.0531,0.0380,1.7268
+Small,8x8,ldr-rgb-10.png,32.3590,0.0221,0.0078,2.0865
+Small,8x8,ldr-rgba-00.png,26.7577,0.0839,0.0689,0.9509
+Small,8x8,ldr-rgba-01.png,28.4704,0.0627,0.0477,1.3727
+Small,8x8,ldr-rgba-02.png,23.9802,0.0586,0.0435,1.5049
+Small,8x8,ldr-xy-00.png,34.2040,0.0535,0.0371,1.7679
+Small,8x8,ldr-xy-01.png,35.2494,0.0553,0.0389,1.6845
+Small,8x8,ldr-xy-02.png,44.6459,0.0666,0.0503,1.3034
+Small,8x8,ldrs-rgba-00.png,26.7543,0.0835,0.0688,0.9529
+Small,8x8,ldrs-rgba-01.png,28.4623,0.0625,0.0476,1.3778
+Small,8x8,ldrs-rgba-02.png,23.9736,0.0589,0.0437,1.5006
+Small,12x12,hdr-rgb-00.hdr,21.0175,0.2194,0.0785,0.8352
+Small,12x12,hdr-rgb-r16.ktx,999.0000,0.0135,0.0011,0.2357
+Small,12x12,hdr-rgb-r32.ktx,999.0000,0.0138,0.0016,0.1569
+Small,12x12,hdr-rgb-rg16.ktx,999.0000,0.0129,0.0014,0.1832
+Small,12x12,hdr-rgb-rg32.ktx,999.0000,0.0139,0.0014,0.1846
+Small,12x12,hdr-rgb-rgb16.ktx,999.0000,0.0136,0.0014,0.1836
+Small,12x12,hdr-rgb-rgb32.ktx,999.0000,0.0132,0.0015,0.1682
+Small,12x12,hdr-rgba-rgba16.ktx,999.0000,0.0138,0.0017,0.1524
+Small,12x12,hdr-rgba-rgba32.ktx,999.0000,0.0128,0.0013,0.1992
+Small,12x12,ldr-rgb-00.png,25.0738,0.0994,0.0825,0.7943
+Small,12x12,ldr-rgb-01.png,25.1477,0.0834,0.0654,1.0017
+Small,12x12,ldr-rgb-02.png,19.2950,0.0909,0.0728,0.9008
+Small,12x12,ldr-rgb-03.png,36.2051,0.0386,0.0210,3.1147
+Small,12x12,ldr-rgb-04.png,25.0000,0.0766,0.0587,1.1163
+Small,12x12,ldr-rgb-05.png,21.7395,0.0916,0.0735,0.8917
+Small,12x12,ldr-rgb-06.png,19.3020,0.0873,0.0696,0.9421
+Small,12x12,ldr-rgb-07.png,27.1599,0.1024,0.0845,0.7755
+Small,12x12,ldr-rgb-08.png,32.5575,0.0464,0.0288,2.2752
+Small,12x12,ldr-rgb-09.png,24.3246,0.0722,0.0543,1.2064
+Small,12x12,ldr-rgb-10.png,28.2270,0.0299,0.0134,1.2116
+Small,12x12,ldr-rgba-00.png,22.7316,0.1060,0.0881,0.7442
+Small,12x12,ldr-rgba-01.png,24.7496,0.0856,0.0681,0.9627
+Small,12x12,ldr-rgba-02.png,20.2177,0.0869,0.0694,0.9437
+Small,12x12,ldr-xy-00.png,30.4621,0.0689,0.0499,1.3136
+Small,12x12,ldr-xy-01.png,32.2515,0.0554,0.0368,1.7793
+Small,12x12,ldr-xy-02.png,40.3186,0.0417,0.0232,2.8207
+Small,12x12,ldrs-rgba-00.png,22.7268,0.1050,0.0875,0.7486
+Small,12x12,ldrs-rgba-01.png,24.7447,0.0846,0.0674,0.9730
+Small,12x12,ldrs-rgba-02.png,20.2148,0.0868,0.0693,0.9452
+Small,3x3x3,ldr-l-00-3.dds,52.1052,0.0450,0.0349,7.5124
+Small,3x3x3,ldr-l-01-3.dds,54.5179,0.0233,0.0163,4.2379
+Small,6x6x6,ldr-l-00-3.dds,33.2856,0.0778,0.0623,4.2083
+Small,6x6x6,ldr-l-01-3.dds,41.6471,0.0273,0.0140,4.9103
diff --git a/Test/astc_test_image.py b/Test/astc_test_image.py
index 6afeac5e..da1478d7 100644
--- a/Test/astc_test_image.py
+++ b/Test/astc_test_image.py
@@ -318,7 +318,7 @@ def parse_command_line():
     parser.add_argument("--encoder", dest="encoders", default="avx2",
                         choices=coders, help="test encoder variant")
 
-    parser.add_argument("--reference", dest="reference", default="ref-4.8-avx2",
+    parser.add_argument("--reference", dest="reference", default="ref-main-avx2",
                         choices=refcoders, help="reference encoder variant")
 
     astcProfile = ["ldr", "ldrs", "hdr", "all"]