Update tests to use main reference
diff --git a/Test/Images/Small/astc_reference-main-avx2_fast_results.csv b/Test/Images/Small/astc_reference-main-avx2_fast_results.csv
index 480076c..3a47297 100644
--- a/Test/Images/Small/astc_reference-main-avx2_fast_results.csv
+++ b/Test/Images/Small/astc_reference-main-avx2_fast_results.csv
@@ -1,110 +1,110 @@
 Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
-Small,4x4,hdr-rgb-00.hdr,31.4975,0.1226,0.0253,2.5913
-Small,4x4,ldr-rgb-00.png,38.0904,0.0226,0.0143,4.5978
-Small,4x4,ldr-rgb-01.png,39.8001,0.0200,0.0121,5.4242
-Small,4x4,ldr-rgb-02.png,35.0327,0.0273,0.0194,3.3783
-Small,4x4,ldr-rgb-03.png,45.9660,0.0124,0.0048,13.7942
-Small,4x4,ldr-rgb-04.png,41.9046,0.0167,0.0086,7.6408
-Small,4x4,ldr-rgb-05.png,37.1767,0.0268,0.0187,3.5048
-Small,4x4,ldr-rgb-06.png,35.2077,0.0259,0.0177,3.7033
-Small,4x4,ldr-rgb-07.png,37.9946,0.0279,0.0195,3.3533
-Small,4x4,ldr-rgb-08.png,43.6044,0.0151,0.0073,9.0009
-Small,4x4,ldr-rgb-09.png,41.8518,0.0169,0.0089,7.3314
-Small,4x4,ldr-rgb-10.png,44.3436,0.0083,0.0026,6.2501
-Small,4x4,ldr-rgba-00.png,35.5159,0.0277,0.0191,3.4310
-Small,4x4,ldr-rgba-01.png,38.7948,0.0202,0.0119,5.4970
-Small,4x4,ldr-rgba-02.png,34.8314,0.0250,0.0168,3.8947
-Small,4x4,ldr-xy-00.png,37.4602,0.0153,0.0073,8.9226
-Small,4x4,ldr-xy-01.png,43.8681,0.0166,0.0089,7.3967
-Small,4x4,ldr-xy-02.png,47.3852,0.0138,0.0058,11.3642
-Small,4x4,ldrs-rgba-00.png,35.5232,0.0277,0.0192,3.4158
-Small,4x4,ldrs-rgba-01.png,38.8139,0.0201,0.0120,5.4582
-Small,4x4,ldrs-rgba-02.png,34.8369,0.0249,0.0166,3.9427
-Small,5x5,hdr-rgb-00.hdr,25.7106,0.1264,0.0289,2.2704
-Small,5x5,ldr-rgb-00.png,34.2754,0.0232,0.0143,4.5942
-Small,5x5,ldr-rgb-01.png,36.1748,0.0189,0.0102,6.4168
-Small,5x5,ldr-rgb-02.png,31.0231,0.0250,0.0164,4.0019
-Small,5x5,ldr-rgb-03.png,42.5699,0.0125,0.0041,15.7921
-Small,5x5,ldr-rgb-04.png,37.2518,0.0175,0.0087,7.5423
-Small,5x5,ldr-rgb-05.png,33.1162,0.0282,0.0194,3.3789
-Small,5x5,ldr-rgb-06.png,31.0304,0.0249,0.0159,4.1233
-Small,5x5,ldr-rgb-07.png,34.5142,0.0250,0.0159,4.1308
-Small,5x5,ldr-rgb-08.png,39.8113,0.0148,0.0063,10.4855
-Small,5x5,ldr-rgb-09.png,37.2919,0.0176,0.0089,7.3373
-Small,5x5,ldr-rgb-10.png,40.1485,0.0090,0.0026,6.2450
-Small,5x5,ldr-rgba-00.png,32.0068,0.0298,0.0206,3.1880
-Small,5x5,ldr-rgba-01.png,35.1482,0.0210,0.0120,5.4509
-Small,5x5,ldr-rgba-02.png,31.1093,0.0268,0.0179,3.6709
-Small,5x5,ldr-xy-00.png,36.5938,0.0154,0.0067,9.7147
-Small,5x5,ldr-xy-01.png,39.9608,0.0164,0.0080,8.2043
-Small,5x5,ldr-xy-02.png,43.3434,0.0147,0.0058,11.2817
-Small,5x5,ldrs-rgba-00.png,32.0093,0.0300,0.0207,3.1600
-Small,5x5,ldrs-rgba-01.png,35.1560,0.0210,0.0120,5.4396
-Small,5x5,ldrs-rgba-02.png,31.1100,0.0269,0.0180,3.6454
-Small,6x6,hdr-rgb-00.hdr,23.9641,0.1303,0.0327,2.0061
-Small,6x6,ldr-rgb-00.png,31.6280,0.0292,0.0192,3.4123
-Small,6x6,ldr-rgb-01.png,32.9107,0.0245,0.0148,4.4320
-Small,6x6,ldr-rgb-02.png,27.4313,0.0327,0.0229,2.8582
-Small,6x6,ldr-rgb-03.png,40.5430,0.0143,0.0048,13.6193
-Small,6x6,ldr-rgb-04.png,33.9243,0.0215,0.0116,5.6400
-Small,6x6,ldr-rgb-05.png,29.9754,0.0368,0.0270,2.4305
-Small,6x6,ldr-rgb-06.png,27.4773,0.0328,0.0229,2.8608
-Small,6x6,ldr-rgb-07.png,33.2080,0.0285,0.0184,3.5709
-Small,6x6,ldr-rgb-08.png,37.8024,0.0168,0.0072,9.1516
-Small,6x6,ldr-rgb-09.png,33.4950,0.0221,0.0124,5.3019
-Small,6x6,ldr-rgb-10.png,36.6619,0.0104,0.0030,5.3738
-Small,6x6,ldr-rgba-00.png,29.4060,0.0355,0.0252,2.6030
-Small,6x6,ldr-rgba-01.png,32.0746,0.0244,0.0143,4.5750
-Small,6x6,ldr-rgba-02.png,27.8365,0.0321,0.0220,2.9754
-Small,6x6,ldr-xy-00.png,35.5944,0.0170,0.0073,9.0183
-Small,6x6,ldr-xy-01.png,37.0477,0.0187,0.0092,7.1436
-Small,6x6,ldr-xy-02.png,41.7356,0.0148,0.0050,13.1464
-Small,6x6,ldrs-rgba-00.png,29.4063,0.0358,0.0254,2.5782
-Small,6x6,ldrs-rgba-01.png,32.0804,0.0244,0.0145,4.5232
-Small,6x6,ldrs-rgba-02.png,27.8362,0.0322,0.0222,2.9488
-Small,8x8,hdr-rgb-00.hdr,21.3024,0.1424,0.0394,1.6653
-Small,8x8,ldr-rgb-00.png,27.9849,0.0373,0.0229,2.8615
-Small,8x8,ldr-rgb-01.png,28.7558,0.0325,0.0185,3.5446
-Small,8x8,ldr-rgb-02.png,23.0846,0.0440,0.0299,2.1938
-Small,8x8,ldr-rgb-03.png,37.2835,0.0191,0.0052,12.5498
-Small,8x8,ldr-rgb-04.png,29.3432,0.0305,0.0160,4.0863
-Small,8x8,ldr-rgb-05.png,25.8126,0.0477,0.0334,1.9600
-Small,8x8,ldr-rgb-06.png,23.1440,0.0439,0.0295,2.2235
-Small,8x8,ldr-rgb-07.png,29.8731,0.0303,0.0156,4.1889
-Small,8x8,ldr-rgb-08.png,34.3107,0.0226,0.0086,7.6363
-Small,8x8,ldr-rgb-09.png,28.6989,0.0312,0.0170,3.8528
-Small,8x8,ldr-rgb-10.png,32.0218,0.0155,0.0037,4.4427
-Small,8x8,ldr-rgba-00.png,24.9502,0.0438,0.0291,2.2531
-Small,8x8,ldr-rgba-01.png,28.2387,0.0320,0.0177,3.6980
-Small,8x8,ldr-rgba-02.png,23.9210,0.0434,0.0289,2.2676
-Small,8x8,ldr-xy-00.png,33.1405,0.0235,0.0094,6.9690
-Small,8x8,ldr-xy-01.png,34.1679,0.0235,0.0097,6.7341
-Small,8x8,ldr-xy-02.png,39.9044,0.0175,0.0034,19.4700
-Small,8x8,ldrs-rgba-00.png,24.9497,0.0439,0.0293,2.2386
-Small,8x8,ldrs-rgba-01.png,28.2412,0.0323,0.0179,3.6578
-Small,8x8,ldrs-rgba-02.png,23.9215,0.0435,0.0291,2.2489
-Small,12x12,hdr-rgb-00.hdr,18.6524,0.1613,0.0509,1.2887
-Small,12x12,ldr-rgb-00.png,23.7294,0.0380,0.0164,3.9947
-Small,12x12,ldr-rgb-01.png,24.7900,0.0335,0.0120,5.4746
-Small,12x12,ldr-rgb-02.png,19.2486,0.0564,0.0347,1.8878
-Small,12x12,ldr-rgb-03.png,33.2612,0.0250,0.0037,17.6125
-Small,12x12,ldr-rgb-04.png,24.5777,0.0342,0.0124,5.2728
-Small,12x12,ldr-rgb-05.png,21.4909,0.0494,0.0276,2.3736
-Small,12x12,ldr-rgb-06.png,19.2112,0.0582,0.0363,1.8037
-Small,12x12,ldr-rgb-07.png,25.3778,0.0324,0.0102,6.4176
-Small,12x12,ldr-rgb-08.png,30.0827,0.0276,0.0060,10.9300
-Small,12x12,ldr-rgb-09.png,23.7732,0.0393,0.0177,3.7033
-Small,12x12,ldr-rgb-10.png,27.3265,0.0231,0.0038,4.3304
-Small,12x12,ldr-rgba-00.png,21.1697,0.0484,0.0262,2.5010
-Small,12x12,ldr-rgba-01.png,24.4976,0.0354,0.0137,4.7763
-Small,12x12,ldr-rgba-02.png,20.2072,0.0585,0.0369,1.7755
-Small,12x12,ldr-xy-00.png,28.8225,0.0306,0.0089,7.3644
-Small,12x12,ldr-xy-01.png,31.1639,0.0296,0.0082,8.0266
-Small,12x12,ldr-xy-02.png,38.1381,0.0238,0.0022,29.2330
-Small,12x12,ldrs-rgba-00.png,21.1701,0.0487,0.0264,2.4779
-Small,12x12,ldrs-rgba-01.png,24.4991,0.0358,0.0139,4.7030
-Small,12x12,ldrs-rgba-02.png,20.2075,0.0584,0.0367,1.7849
-Small,3x3x3,ldr-l-00-3.dds,50.7904,0.0241,0.0148,17.7198
-Small,3x3x3,ldr-l-01-3.dds,53.8713,0.0130,0.0059,11.5871
-Small,6x6x6,ldr-l-00-3.dds,32.5329,0.0713,0.0431,6.0778
-Small,6x6x6,ldr-l-01-3.dds,40.7310,0.0438,0.0182,3.7866
+Small,4x4,hdr-rgb-00.hdr,31.4801,0.1226,0.0258,2.5378
+Small,4x4,ldr-rgb-00.png,38.0904,0.0217,0.0139,4.7165
+Small,4x4,ldr-rgb-01.png,39.8002,0.0194,0.0120,5.4427
+Small,4x4,ldr-rgb-02.png,35.0327,0.0267,0.0193,3.3981
+Small,4x4,ldr-rgb-03.png,45.9660,0.0117,0.0046,14.2994
+Small,4x4,ldr-rgb-04.png,41.9046,0.0159,0.0084,7.7918
+Small,4x4,ldr-rgb-05.png,37.1767,0.0258,0.0183,3.5849
+Small,4x4,ldr-rgb-06.png,35.2077,0.0251,0.0178,3.6913
+Small,4x4,ldr-rgb-07.png,37.9946,0.0271,0.0192,3.4076
+Small,4x4,ldr-rgb-08.png,43.6044,0.0143,0.0070,9.3502
+Small,4x4,ldr-rgb-09.png,41.8518,0.0162,0.0086,7.5853
+Small,4x4,ldr-rgb-10.png,44.3436,0.0075,0.0024,6.7201
+Small,4x4,ldr-rgba-00.png,35.5159,0.0267,0.0190,3.4536
+Small,4x4,ldr-rgba-01.png,38.7948,0.0193,0.0116,5.6623
+Small,4x4,ldr-rgba-02.png,34.8314,0.0243,0.0169,3.8770
+Small,4x4,ldr-xy-00.png,37.3677,0.0187,0.0091,7.2056
+Small,4x4,ldr-xy-01.png,43.8578,0.0193,0.0102,6.4524
+Small,4x4,ldr-xy-02.png,48.2127,0.0156,0.0061,10.7404
+Small,4x4,ldrs-rgba-00.png,35.5232,0.0270,0.0194,3.3863
+Small,4x4,ldrs-rgba-01.png,38.8139,0.0196,0.0121,5.4352
+Small,4x4,ldrs-rgba-02.png,34.8369,0.0244,0.0168,3.8947
+Small,5x5,hdr-rgb-00.hdr,25.7150,0.1242,0.0282,2.3234
+Small,5x5,ldr-rgb-00.png,34.2754,0.0227,0.0145,4.5282
+Small,5x5,ldr-rgb-01.png,36.1752,0.0180,0.0100,6.5715
+Small,5x5,ldr-rgb-02.png,31.0230,0.0243,0.0163,4.0241
+Small,5x5,ldr-rgb-03.png,42.5699,0.0116,0.0039,16.8049
+Small,5x5,ldr-rgb-04.png,37.2518,0.0165,0.0083,7.8762
+Small,5x5,ldr-rgb-05.png,33.1162,0.0272,0.0193,3.4013
+Small,5x5,ldr-rgb-06.png,31.0304,0.0243,0.0162,4.0551
+Small,5x5,ldr-rgb-07.png,34.5142,0.0242,0.0159,4.1301
+Small,5x5,ldr-rgb-08.png,39.8113,0.0141,0.0060,10.9868
+Small,5x5,ldr-rgb-09.png,37.2923,0.0169,0.0089,7.3793
+Small,5x5,ldr-rgb-10.png,40.1485,0.0081,0.0024,6.8594
+Small,5x5,ldr-rgba-00.png,32.0068,0.0289,0.0204,3.2200
+Small,5x5,ldr-rgba-01.png,35.1483,0.0203,0.0122,5.3683
+Small,5x5,ldr-rgba-02.png,31.1092,0.0263,0.0180,3.6415
+Small,5x5,ldr-xy-00.png,36.6731,0.0175,0.0072,9.0845
+Small,5x5,ldr-xy-01.png,39.4701,0.0189,0.0088,7.4398
+Small,5x5,ldr-xy-02.png,43.9474,0.0163,0.0062,10.5281
+Small,5x5,ldrs-rgba-00.png,32.0093,0.0293,0.0208,3.1499
+Small,5x5,ldrs-rgba-01.png,35.1561,0.0207,0.0125,5.2400
+Small,5x5,ldrs-rgba-02.png,31.1099,0.0265,0.0182,3.5940
+Small,6x6,hdr-rgb-00.hdr,23.9693,0.1286,0.0316,2.0721
+Small,6x6,ldr-rgb-00.png,31.6280,0.0282,0.0191,3.4239
+Small,6x6,ldr-rgb-01.png,32.9082,0.0235,0.0145,4.5063
+Small,6x6,ldr-rgb-02.png,27.4315,0.0315,0.0225,2.9115
+Small,6x6,ldr-rgb-03.png,40.5430,0.0132,0.0046,14.3375
+Small,6x6,ldr-rgb-04.png,33.9242,0.0206,0.0114,5.7508
+Small,6x6,ldr-rgb-05.png,29.9746,0.0357,0.0267,2.4576
+Small,6x6,ldr-rgb-06.png,27.4768,0.0315,0.0224,2.9197
+Small,6x6,ldr-rgb-07.png,33.2085,0.0278,0.0182,3.6058
+Small,6x6,ldr-rgb-08.png,37.8024,0.0159,0.0068,9.6222
+Small,6x6,ldr-rgb-09.png,33.4958,0.0209,0.0119,5.5147
+Small,6x6,ldr-rgb-10.png,36.6619,0.0097,0.0029,5.6113
+Small,6x6,ldr-rgba-00.png,29.4061,0.0346,0.0250,2.6263
+Small,6x6,ldr-rgba-01.png,32.0747,0.0236,0.0143,4.5772
+Small,6x6,ldr-rgba-02.png,27.8369,0.0309,0.0216,3.0395
+Small,6x6,ldr-xy-00.png,35.6780,0.0190,0.0079,8.2822
+Small,6x6,ldr-xy-01.png,36.9997,0.0220,0.0113,5.8044
+Small,6x6,ldr-xy-02.png,41.8793,0.0169,0.0057,11.4233
+Small,6x6,ldrs-rgba-00.png,29.4065,0.0350,0.0256,2.5564
+Small,6x6,ldrs-rgba-01.png,32.0806,0.0237,0.0147,4.4652
+Small,6x6,ldrs-rgba-02.png,27.8366,0.0313,0.0220,2.9834
+Small,8x8,hdr-rgb-00.hdr,21.3121,0.1404,0.0391,1.6753
+Small,8x8,ldr-rgb-00.png,27.9849,0.0358,0.0229,2.8581
+Small,8x8,ldr-rgb-01.png,28.7567,0.0314,0.0187,3.5040
+Small,8x8,ldr-rgb-02.png,23.0846,0.0425,0.0297,2.2064
+Small,8x8,ldr-rgb-03.png,37.2835,0.0175,0.0048,13.6362
+Small,8x8,ldr-rgb-04.png,29.3432,0.0291,0.0159,4.1122
+Small,8x8,ldr-rgb-05.png,25.8126,0.0461,0.0331,1.9792
+Small,8x8,ldr-rgb-06.png,23.1440,0.0421,0.0290,2.2623
+Small,8x8,ldr-rgb-07.png,29.8731,0.0291,0.0159,4.1156
+Small,8x8,ldr-rgb-08.png,34.3107,0.0211,0.0081,8.1198
+Small,8x8,ldr-rgb-09.png,28.6989,0.0297,0.0168,3.9026
+Small,8x8,ldr-rgb-10.png,32.0218,0.0143,0.0035,4.6380
+Small,8x8,ldr-rgba-00.png,24.9502,0.0426,0.0293,2.2344
+Small,8x8,ldr-rgba-01.png,28.2387,0.0307,0.0174,3.7703
+Small,8x8,ldr-rgba-02.png,23.9210,0.0418,0.0288,2.2767
+Small,8x8,ldr-xy-00.png,33.0501,0.0252,0.0102,6.3970
+Small,8x8,ldr-xy-01.png,34.1032,0.0260,0.0112,5.8541
+Small,8x8,ldr-xy-02.png,39.9066,0.0190,0.0040,16.5539
+Small,8x8,ldrs-rgba-00.png,24.9497,0.0427,0.0294,2.2259
+Small,8x8,ldrs-rgba-01.png,28.2412,0.0312,0.0183,3.5865
+Small,8x8,ldrs-rgba-02.png,23.9215,0.0426,0.0294,2.2256
+Small,12x12,hdr-rgb-00.hdr,18.6636,0.1597,0.0520,1.2602
+Small,12x12,ldr-rgb-00.png,23.7294,0.0365,0.0167,3.9215
+Small,12x12,ldr-rgb-01.png,24.7900,0.0313,0.0117,5.6109
+Small,12x12,ldr-rgb-02.png,19.2492,0.0543,0.0348,1.8813
+Small,12x12,ldr-rgb-03.png,33.2612,0.0230,0.0034,19.1353
+Small,12x12,ldr-rgb-04.png,24.5777,0.0320,0.0120,5.4458
+Small,12x12,ldr-rgb-05.png,21.4909,0.0475,0.0280,2.3445
+Small,12x12,ldr-rgb-06.png,19.2111,0.0565,0.0367,1.7834
+Small,12x12,ldr-rgb-07.png,25.3778,0.0302,0.0100,6.5767
+Small,12x12,ldr-rgb-08.png,30.0827,0.0254,0.0058,11.3310
+Small,12x12,ldr-rgb-09.png,23.7750,0.0373,0.0173,3.7924
+Small,12x12,ldr-rgb-10.png,27.3265,0.0213,0.0039,4.1205
+Small,12x12,ldr-rgba-00.png,21.1697,0.0467,0.0262,2.4984
+Small,12x12,ldr-rgba-01.png,24.4976,0.0334,0.0134,4.9079
+Small,12x12,ldr-rgba-02.png,20.2077,0.0562,0.0365,1.7933
+Small,12x12,ldr-xy-00.png,28.9886,0.0310,0.0092,7.1173
+Small,12x12,ldr-xy-01.png,30.7004,0.0294,0.0082,7.9507
+Small,12x12,ldr-xy-02.png,38.1291,0.0237,0.0021,30.8817
+Small,12x12,ldrs-rgba-00.png,21.1701,0.0467,0.0265,2.4708
+Small,12x12,ldrs-rgba-01.png,24.4991,0.0338,0.0137,4.7701
+Small,12x12,ldrs-rgba-02.png,20.2081,0.0564,0.0365,1.7955
+Small,3x3x3,ldr-l-00-3.dds,50.7904,0.0230,0.0143,18.3472
+Small,3x3x3,ldr-l-01-3.dds,53.8713,0.0122,0.0059,11.7134
+Small,6x6x6,ldr-l-00-3.dds,32.5329,0.0686,0.0427,6.1457
+Small,6x6x6,ldr-l-01-3.dds,40.7310,0.0408,0.0175,3.9395
diff --git a/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv b/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
index 7b60f92..3d35c92 100644
--- a/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
+++ b/Test/Images/Small/astc_reference-main-avx2_fastest_results.csv
@@ -1,110 +1,110 @@
 Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
-Small,4x4,hdr-rgb-00.hdr,30.9147,0.1146,0.0184,3.5674
-Small,4x4,ldr-rgb-00.png,36.6938,0.0161,0.0079,8.2643
-Small,4x4,ldr-rgb-01.png,39.3406,0.0155,0.0076,8.5771
-Small,4x4,ldr-rgb-02.png,34.6215,0.0189,0.0110,5.9681
-Small,4x4,ldr-rgb-03.png,45.0796,0.0113,0.0036,18.3313
-Small,4x4,ldr-rgb-04.png,41.6025,0.0140,0.0060,10.9408
-Small,4x4,ldr-rgb-05.png,36.3772,0.0189,0.0108,6.0502
-Small,4x4,ldr-rgb-06.png,34.6871,0.0187,0.0106,6.1791
-Small,4x4,ldr-rgb-07.png,36.6076,0.0185,0.0100,6.5385
-Small,4x4,ldr-rgb-08.png,42.1072,0.0127,0.0047,13.8554
-Small,4x4,ldr-rgb-09.png,41.6247,0.0140,0.0061,10.7614
-Small,4x4,ldr-rgb-10.png,43.8009,0.0078,0.0021,7.6575
-Small,4x4,ldr-rgba-00.png,34.2380,0.0186,0.0101,6.5048
-Small,4x4,ldr-rgba-01.png,38.4758,0.0168,0.0087,7.5468
-Small,4x4,ldr-rgba-02.png,34.5086,0.0203,0.0121,5.4028
-Small,4x4,ldr-xy-00.png,37.2989,0.0134,0.0054,12.0672
-Small,4x4,ldr-xy-01.png,43.1910,0.0139,0.0061,10.6857
-Small,4x4,ldr-xy-02.png,47.3836,0.0127,0.0046,14.3502
-Small,4x4,ldrs-rgba-00.png,34.2413,0.0186,0.0102,6.4429
-Small,4x4,ldrs-rgba-01.png,38.4921,0.0170,0.0088,7.4177
-Small,4x4,ldrs-rgba-02.png,34.5121,0.0204,0.0122,5.3767
-Small,5x5,hdr-rgb-00.hdr,25.0360,0.1179,0.0202,3.2463
-Small,5x5,ldr-rgb-00.png,33.4498,0.0172,0.0083,7.8683
-Small,5x5,ldr-rgb-01.png,35.9953,0.0159,0.0074,8.8610
-Small,5x5,ldr-rgb-02.png,30.8821,0.0201,0.0115,5.7171
-Small,5x5,ldr-rgb-03.png,42.2089,0.0119,0.0034,18.9964
-Small,5x5,ldr-rgb-04.png,36.9254,0.0156,0.0068,9.6662
-Small,5x5,ldr-rgb-05.png,32.5878,0.0209,0.0122,5.3732
-Small,5x5,ldr-rgb-06.png,30.8755,0.0202,0.0113,5.8120
-Small,5x5,ldr-rgb-07.png,33.8868,0.0192,0.0102,6.4415
-Small,5x5,ldr-rgb-08.png,39.1027,0.0131,0.0045,14.5315
-Small,5x5,ldr-rgb-09.png,36.9985,0.0151,0.0065,10.0298
-Small,5x5,ldr-rgb-10.png,39.7657,0.0086,0.0022,7.3751
-Small,5x5,ldr-rgba-00.png,30.6398,0.0214,0.0123,5.3447
-Small,5x5,ldr-rgba-01.png,34.9961,0.0181,0.0092,7.0964
-Small,5x5,ldr-rgba-02.png,31.0034,0.0224,0.0135,4.8459
-Small,5x5,ldr-xy-00.png,36.3709,0.0136,0.0050,13.0422
-Small,5x5,ldr-xy-01.png,39.0832,0.0141,0.0056,11.6159
-Small,5x5,ldr-xy-02.png,43.2130,0.0135,0.0047,14.0244
-Small,5x5,ldrs-rgba-00.png,30.6423,0.0204,0.0113,5.7940
-Small,5x5,ldrs-rgba-01.png,35.0029,0.0179,0.0090,7.2671
-Small,5x5,ldrs-rgba-02.png,31.0046,0.0226,0.0136,4.8338
-Small,6x6,hdr-rgb-00.hdr,23.2254,0.1191,0.0215,3.0422
-Small,6x6,ldr-rgb-00.png,31.1281,0.0196,0.0100,6.5391
-Small,6x6,ldr-rgb-01.png,32.8111,0.0183,0.0091,7.2344
-Small,6x6,ldr-rgb-02.png,27.3448,0.0232,0.0139,4.7054
-Small,6x6,ldr-rgb-03.png,40.2487,0.0126,0.0035,18.7617
-Small,6x6,ldr-rgb-04.png,33.7490,0.0174,0.0079,8.3072
-Small,6x6,ldr-rgb-05.png,29.5575,0.0240,0.0147,4.4606
-Small,6x6,ldr-rgb-06.png,27.3891,0.0234,0.0140,4.6861
-Small,6x6,ldr-rgb-07.png,32.1692,0.0208,0.0112,5.8457
-Small,6x6,ldr-rgb-08.png,37.0701,0.0140,0.0048,13.6994
-Small,6x6,ldr-rgb-09.png,33.3167,0.0171,0.0078,8.3968
-Small,6x6,ldr-rgb-10.png,36.5014,0.0094,0.0025,6.4868
-Small,6x6,ldr-rgba-00.png,28.1925,0.0226,0.0128,5.1385
-Small,6x6,ldr-rgba-01.png,31.9799,0.0192,0.0097,6.7313
-Small,6x6,ldr-rgba-02.png,27.7656,0.0238,0.0143,4.5894
-Small,6x6,ldr-xy-00.png,35.4115,0.0147,0.0053,12.2839
-Small,6x6,ldr-xy-01.png,36.2778,0.0154,0.0063,10.3814
-Small,6x6,ldr-xy-02.png,41.6240,0.0134,0.0040,16.2698
-Small,6x6,ldrs-rgba-00.png,28.1941,0.0226,0.0127,5.1437
-Small,6x6,ldrs-rgba-01.png,31.9869,0.0192,0.0098,6.6934
-Small,6x6,ldrs-rgba-02.png,27.7642,0.0239,0.0144,4.5442
-Small,8x8,hdr-rgb-00.hdr,21.1594,0.1313,0.0290,2.2590
-Small,8x8,ldr-rgb-00.png,27.5822,0.0280,0.0143,4.5926
-Small,8x8,ldr-rgb-01.png,28.6701,0.0265,0.0131,5.0042
-Small,8x8,ldr-rgb-02.png,23.0159,0.0342,0.0207,3.1669
-Small,8x8,ldr-rgb-03.png,37.0512,0.0175,0.0044,14.8880
-Small,8x8,ldr-rgb-04.png,29.1157,0.0253,0.0117,5.5966
-Small,8x8,ldr-rgb-05.png,25.5532,0.0347,0.0210,3.1155
-Small,8x8,ldr-rgb-06.png,23.0482,0.0344,0.0208,3.1446
-Small,8x8,ldr-rgb-07.png,29.6000,0.0253,0.0115,5.6795
-Small,8x8,ldr-rgb-08.png,33.9070,0.0194,0.0060,10.8360
-Small,8x8,ldr-rgb-09.png,28.4838,0.0249,0.0115,5.6859
-Small,8x8,ldr-rgb-10.png,31.9020,0.0145,0.0034,4.8466
-Small,8x8,ldr-rgba-00.png,24.4867,0.0323,0.0183,3.5720
-Small,8x8,ldr-rgba-01.png,28.1329,0.0264,0.0129,5.0985
-Small,8x8,ldr-rgba-02.png,23.8668,0.0348,0.0210,3.1184
-Small,8x8,ldr-xy-00.png,33.0098,0.0206,0.0071,9.1709
-Small,8x8,ldr-xy-01.png,33.9350,0.0206,0.0074,8.9081
-Small,8x8,ldr-xy-02.png,39.8287,0.0168,0.0032,20.5501
-Small,8x8,ldrs-rgba-00.png,24.4866,0.0322,0.0183,3.5877
-Small,8x8,ldrs-rgba-01.png,28.1351,0.0266,0.0130,5.0584
-Small,8x8,ldrs-rgba-02.png,23.8664,0.0348,0.0210,3.1197
-Small,12x12,hdr-rgb-00.hdr,18.5818,0.1432,0.0350,1.8720
-Small,12x12,ldr-rgb-00.png,23.6269,0.0308,0.0115,5.7172
-Small,12x12,ldr-rgb-01.png,24.7328,0.0276,0.0088,7.4882
-Small,12x12,ldr-rgb-02.png,19.2124,0.0429,0.0239,2.7454
-Small,12x12,ldr-rgb-03.png,33.1483,0.0217,0.0031,20.9239
-Small,12x12,ldr-rgb-04.png,24.4225,0.0277,0.0088,7.4736
-Small,12x12,ldr-rgb-05.png,21.3932,0.0373,0.0183,3.5812
-Small,12x12,ldr-rgb-06.png,19.1615,0.0442,0.0250,2.6181
-Small,12x12,ldr-rgb-07.png,25.2980,0.0273,0.0078,8.3978
-Small,12x12,ldr-rgb-08.png,29.9138,0.0235,0.0047,13.9433
-Small,12x12,ldr-rgb-09.png,23.6613,0.0314,0.0125,5.2484
-Small,12x12,ldr-rgb-10.png,27.2791,0.0195,0.0027,5.9176
-Small,12x12,ldr-rgba-00.png,21.0528,0.0371,0.0177,3.6942
-Small,12x12,ldr-rgba-01.png,24.4407,0.0294,0.0103,6.3752
-Small,12x12,ldr-rgba-02.png,20.1734,0.0448,0.0256,2.5624
-Small,12x12,ldr-xy-00.png,28.8521,0.0257,0.0069,9.5160
-Small,12x12,ldr-xy-01.png,29.9915,0.0253,0.0065,10.1132
-Small,12x12,ldr-xy-02.png,38.1333,0.0211,0.0023,28.5676
-Small,12x12,ldrs-rgba-00.png,21.0534,0.0375,0.0181,3.6282
-Small,12x12,ldrs-rgba-01.png,24.4416,0.0293,0.0102,6.4007
-Small,12x12,ldrs-rgba-02.png,20.1732,0.0450,0.0257,2.5514
-Small,3x3x3,ldr-l-00-3.dds,50.6609,0.0228,0.0135,19.3477
-Small,3x3x3,ldr-l-01-3.dds,53.8054,0.0127,0.0057,12.1064
-Small,6x6x6,ldr-l-00-3.dds,32.5176,0.0707,0.0425,6.1631
-Small,6x6x6,ldr-l-01-3.dds,40.7290,0.0438,0.0182,3.7960
+Small,4x4,hdr-rgb-00.hdr,30.9256,0.1125,0.0182,3.6028
+Small,4x4,ldr-rgb-00.png,36.6938,0.0153,0.0077,8.4915
+Small,4x4,ldr-rgb-01.png,39.3406,0.0148,0.0075,8.6849
+Small,4x4,ldr-rgb-02.png,34.6215,0.0183,0.0110,5.9713
+Small,4x4,ldr-rgb-03.png,45.0796,0.0105,0.0035,18.9898
+Small,4x4,ldr-rgb-04.png,41.6025,0.0134,0.0059,11.1666
+Small,4x4,ldr-rgb-05.png,36.3772,0.0182,0.0106,6.1680
+Small,4x4,ldr-rgb-06.png,34.6871,0.0180,0.0104,6.2924
+Small,4x4,ldr-rgb-07.png,36.6076,0.0178,0.0100,6.5524
+Small,4x4,ldr-rgb-08.png,42.1072,0.0119,0.0046,14.1697
+Small,4x4,ldr-rgb-09.png,41.6247,0.0134,0.0059,11.0402
+Small,4x4,ldr-rgb-10.png,43.8009,0.0070,0.0019,8.6603
+Small,4x4,ldr-rgba-00.png,34.2380,0.0180,0.0102,6.4195
+Small,4x4,ldr-rgba-01.png,38.4758,0.0163,0.0088,7.4813
+Small,4x4,ldr-rgba-02.png,34.5086,0.0194,0.0120,5.4796
+Small,4x4,ldr-xy-00.png,37.2230,0.0156,0.0059,11.0477
+Small,4x4,ldr-xy-01.png,42.7933,0.0159,0.0067,9.8505
+Small,4x4,ldr-xy-02.png,48.2109,0.0143,0.0048,13.7336
+Small,4x4,ldrs-rgba-00.png,34.2413,0.0179,0.0099,6.6210
+Small,4x4,ldrs-rgba-01.png,38.4921,0.0162,0.0087,7.5555
+Small,4x4,ldrs-rgba-02.png,34.5121,0.0199,0.0125,5.2353
+Small,5x5,hdr-rgb-00.hdr,25.0433,0.1142,0.0202,3.2403
+Small,5x5,ldr-rgb-00.png,33.4498,0.0164,0.0084,7.8150
+Small,5x5,ldr-rgb-01.png,35.9953,0.0152,0.0072,9.1647
+Small,5x5,ldr-rgb-02.png,30.8818,0.0191,0.0112,5.8587
+Small,5x5,ldr-rgb-03.png,42.2089,0.0109,0.0032,20.5839
+Small,5x5,ldr-rgb-04.png,36.9254,0.0148,0.0066,9.9691
+Small,5x5,ldr-rgb-05.png,32.5878,0.0204,0.0123,5.3226
+Small,5x5,ldr-rgb-06.png,30.8754,0.0194,0.0111,5.8825
+Small,5x5,ldr-rgb-07.png,33.8868,0.0185,0.0100,6.5366
+Small,5x5,ldr-rgb-08.png,39.1027,0.0122,0.0043,15.4054
+Small,5x5,ldr-rgb-09.png,36.9986,0.0143,0.0063,10.3645
+Small,5x5,ldr-rgb-10.png,39.7657,0.0079,0.0020,7.9421
+Small,5x5,ldr-rgba-00.png,30.6398,0.0195,0.0110,5.9812
+Small,5x5,ldr-rgba-01.png,34.9962,0.0173,0.0092,7.1258
+Small,5x5,ldr-rgba-02.png,31.0031,0.0219,0.0135,4.8718
+Small,5x5,ldr-xy-00.png,36.4200,0.0157,0.0055,11.9809
+Small,5x5,ldr-xy-01.png,38.7023,0.0156,0.0059,11.0238
+Small,5x5,ldr-xy-02.png,43.7310,0.0152,0.0051,12.9672
+Small,5x5,ldrs-rgba-00.png,30.6423,0.0196,0.0110,5.9325
+Small,5x5,ldrs-rgba-01.png,35.0029,0.0170,0.0089,7.3936
+Small,5x5,ldrs-rgba-02.png,31.0043,0.0218,0.0135,4.8380
+Small,6x6,hdr-rgb-00.hdr,23.2571,0.1171,0.0209,3.1342
+Small,6x6,ldr-rgb-00.png,31.1285,0.0185,0.0097,6.7864
+Small,6x6,ldr-rgb-01.png,32.8102,0.0171,0.0087,7.5311
+Small,6x6,ldr-rgb-02.png,27.3453,0.0224,0.0138,4.7480
+Small,6x6,ldr-rgb-03.png,40.2487,0.0116,0.0033,19.8296
+Small,6x6,ldr-rgb-04.png,33.7491,0.0164,0.0077,8.4771
+Small,6x6,ldr-rgb-05.png,29.5567,0.0231,0.0145,4.5312
+Small,6x6,ldr-rgb-06.png,27.3887,0.0227,0.0138,4.7431
+Small,6x6,ldr-rgb-07.png,32.1704,0.0200,0.0110,5.9454
+Small,6x6,ldr-rgb-08.png,37.0701,0.0130,0.0045,14.4543
+Small,6x6,ldr-rgb-09.png,33.3175,0.0164,0.0077,8.4849
+Small,6x6,ldr-rgb-10.png,36.5014,0.0084,0.0022,7.5257
+Small,6x6,ldr-rgba-00.png,28.1929,0.0215,0.0124,5.2971
+Small,6x6,ldr-rgba-01.png,31.9802,0.0184,0.0095,6.9256
+Small,6x6,ldr-rgba-02.png,27.7658,0.0229,0.0141,4.6601
+Small,6x6,ldr-xy-00.png,35.5996,0.0163,0.0056,11.6051
+Small,6x6,ldr-xy-01.png,35.8404,0.0172,0.0068,9.6747
+Small,6x6,ldr-xy-02.png,41.7468,0.0150,0.0045,14.6453
+Small,6x6,ldrs-rgba-00.png,28.1946,0.0220,0.0131,5.0104
+Small,6x6,ldrs-rgba-01.png,31.9873,0.0184,0.0095,6.8637
+Small,6x6,ldrs-rgba-02.png,27.7644,0.0229,0.0141,4.6509
+Small,8x8,hdr-rgb-00.hdr,21.1661,0.1279,0.0286,2.2928
+Small,8x8,ldr-rgb-00.png,27.5822,0.0268,0.0143,4.5792
+Small,8x8,ldr-rgb-01.png,28.6709,0.0250,0.0128,5.1144
+Small,8x8,ldr-rgb-02.png,23.0159,0.0329,0.0204,3.2148
+Small,8x8,ldr-rgb-03.png,37.0512,0.0162,0.0041,15.8148
+Small,8x8,ldr-rgb-04.png,29.1157,0.0239,0.0114,5.7418
+Small,8x8,ldr-rgb-05.png,25.5532,0.0334,0.0209,3.1293
+Small,8x8,ldr-rgb-06.png,23.0482,0.0329,0.0204,3.2203
+Small,8x8,ldr-rgb-07.png,29.6000,0.0240,0.0112,5.8577
+Small,8x8,ldr-rgb-08.png,33.9070,0.0178,0.0057,11.5398
+Small,8x8,ldr-rgb-09.png,28.4838,0.0238,0.0117,5.5918
+Small,8x8,ldr-rgb-10.png,31.9020,0.0131,0.0029,5.5519
+Small,8x8,ldr-rgba-00.png,24.4867,0.0310,0.0182,3.6064
+Small,8x8,ldr-rgba-01.png,28.1329,0.0252,0.0126,5.2145
+Small,8x8,ldr-rgba-02.png,23.8668,0.0333,0.0210,3.1276
+Small,8x8,ldr-xy-00.png,33.1336,0.0221,0.0076,8.6505
+Small,8x8,ldr-xy-01.png,33.8000,0.0228,0.0087,7.5739
+Small,8x8,ldr-xy-02.png,39.8128,0.0180,0.0036,18.3313
+Small,8x8,ldrs-rgba-00.png,24.4866,0.0312,0.0187,3.5095
+Small,8x8,ldrs-rgba-01.png,28.1351,0.0253,0.0128,5.1112
+Small,8x8,ldrs-rgba-02.png,23.8664,0.0335,0.0210,3.1248
+Small,12x12,hdr-rgb-00.hdr,18.5871,0.1405,0.0352,1.8619
+Small,12x12,ldr-rgb-00.png,23.6269,0.0288,0.0116,5.6702
+Small,12x12,ldr-rgb-01.png,24.7328,0.0259,0.0087,7.5009
+Small,12x12,ldr-rgb-02.png,19.2129,0.0416,0.0239,2.7405
+Small,12x12,ldr-rgb-03.png,33.1483,0.0199,0.0029,22.7473
+Small,12x12,ldr-rgb-04.png,24.4225,0.0263,0.0090,7.2583
+Small,12x12,ldr-rgb-05.png,21.3937,0.0359,0.0183,3.5750
+Small,12x12,ldr-rgb-06.png,19.1624,0.0429,0.0256,2.5567
+Small,12x12,ldr-rgb-07.png,25.2980,0.0253,0.0076,8.6007
+Small,12x12,ldr-rgb-08.png,29.9138,0.0217,0.0045,14.7206
+Small,12x12,ldr-rgb-09.png,23.6639,0.0293,0.0118,5.5314
+Small,12x12,ldr-rgb-10.png,27.2791,0.0178,0.0027,5.9741
+Small,12x12,ldr-rgba-00.png,21.0528,0.0356,0.0177,3.7077
+Small,12x12,ldr-rgba-01.png,24.4407,0.0277,0.0101,6.4958
+Small,12x12,ldr-rgba-02.png,20.1732,0.0434,0.0262,2.5020
+Small,12x12,ldr-xy-00.png,28.7111,0.0268,0.0072,9.1300
+Small,12x12,ldr-xy-01.png,29.8021,0.0255,0.0063,10.4358
+Small,12x12,ldr-xy-02.png,38.1145,0.0213,0.0022,30.1567
+Small,12x12,ldrs-rgba-00.png,21.0534,0.0358,0.0184,3.5530
+Small,12x12,ldrs-rgba-01.png,24.4416,0.0278,0.0101,6.5145
+Small,12x12,ldrs-rgba-02.png,20.1731,0.0430,0.0254,2.5852
+Small,3x3x3,ldr-l-00-3.dds,50.6609,0.0220,0.0132,19.8443
+Small,3x3x3,ldr-l-01-3.dds,53.8054,0.0118,0.0055,12.4989
+Small,6x6x6,ldr-l-00-3.dds,32.5176,0.0681,0.0426,6.1574
+Small,6x6x6,ldr-l-01-3.dds,40.7290,0.0412,0.0175,3.9399
diff --git a/Test/Images/Small/astc_reference-main-avx2_medium_results.csv b/Test/Images/Small/astc_reference-main-avx2_medium_results.csv
index bcfe88f..5260276 100644
--- a/Test/Images/Small/astc_reference-main-avx2_medium_results.csv
+++ b/Test/Images/Small/astc_reference-main-avx2_medium_results.csv
@@ -1,110 +1,110 @@
 Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
-Small,4x4,hdr-rgb-00.hdr,32.4363,0.1367,0.0407,1.6100
-Small,4x4,ldr-rgb-00.png,38.6985,0.0472,0.0388,1.6901
-Small,4x4,ldr-rgb-01.png,40.1183,0.0432,0.0351,1.8691
-Small,4x4,ldr-rgb-02.png,35.2059,0.0434,0.0351,1.8655
-Small,4x4,ldr-rgb-03.png,47.0764,0.0276,0.0198,3.3091
-Small,4x4,ldr-rgb-04.png,42.1384,0.0366,0.0283,2.3170
-Small,4x4,ldr-rgb-05.png,37.7480,0.0487,0.0404,1.6236
-Small,4x4,ldr-rgb-06.png,35.3504,0.0392,0.0307,2.1338
-Small,4x4,ldr-rgb-07.png,38.8920,0.0553,0.0468,1.4013
-Small,4x4,ldr-rgb-08.png,44.8397,0.0312,0.0230,2.8443
-Small,4x4,ldr-rgb-09.png,42.0738,0.0373,0.0291,2.2485
-Small,4x4,ldr-rgb-10.png,44.8740,0.0109,0.0051,3.1943
-Small,4x4,ldr-rgba-00.png,36.2304,0.0521,0.0433,1.5119
-Small,4x4,ldr-rgba-01.png,38.8996,0.0343,0.0258,2.5360
-Small,4x4,ldr-rgba-02.png,34.9204,0.0372,0.0288,2.2783
-Small,4x4,ldr-xy-00.png,37.7076,0.0296,0.0214,3.0601
-Small,4x4,ldr-xy-01.png,45.2966,0.0411,0.0333,1.9709
-Small,4x4,ldr-xy-02.png,50.8924,0.0430,0.0347,1.8881
-Small,4x4,ldrs-rgba-00.png,36.2375,0.0525,0.0438,1.4956
-Small,4x4,ldrs-rgba-01.png,38.9148,0.0347,0.0263,2.4888
-Small,4x4,ldrs-rgba-02.png,34.9261,0.0374,0.0290,2.2624
-Small,5x5,hdr-rgb-00.hdr,26.6577,0.1452,0.0459,1.4269
-Small,5x5,ldr-rgb-00.png,35.0601,0.0526,0.0431,1.5194
-Small,5x5,ldr-rgb-01.png,36.3948,0.0432,0.0341,1.9239
-Small,5x5,ldr-rgb-02.png,31.0693,0.0447,0.0355,1.8442
-Small,5x5,ldr-rgb-03.png,43.8060,0.0214,0.0124,5.2860
-Small,5x5,ldr-rgb-04.png,37.6714,0.0395,0.0301,2.1753
-Small,5x5,ldr-rgb-05.png,33.5067,0.0593,0.0500,1.3116
-Small,5x5,ldr-rgb-06.png,31.0848,0.0420,0.0325,2.0138
-Small,5x5,ldr-rgb-07.png,35.7129,0.0598,0.0501,1.3072
-Small,5x5,ldr-rgb-08.png,41.3215,0.0295,0.0203,3.2206
-Small,5x5,ldr-rgb-09.png,37.5963,0.0383,0.0290,2.2612
-Small,5x5,ldr-rgb-10.png,40.5078,0.0130,0.0059,2.7349
-Small,5x5,ldr-rgba-00.png,32.7508,0.0641,0.0541,1.2115
-Small,5x5,ldr-rgba-01.png,35.2808,0.0392,0.0297,2.2096
-Small,5x5,ldr-rgba-02.png,31.1278,0.0445,0.0349,1.8772
-Small,5x5,ldr-xy-00.png,37.1322,0.0306,0.0211,3.0991
-Small,5x5,ldr-xy-01.png,41.0485,0.0376,0.0287,2.2852
-Small,5x5,ldr-xy-02.png,48.8030,0.0277,0.0183,3.5734
-Small,5x5,ldrs-rgba-00.png,32.7532,0.0642,0.0544,1.2049
-Small,5x5,ldrs-rgba-01.png,35.2888,0.0395,0.0301,2.1793
-Small,5x5,ldrs-rgba-02.png,31.1282,0.0446,0.0351,1.8674
-Small,6x6,hdr-rgb-00.hdr,24.7326,0.1497,0.0510,1.2857
-Small,6x6,ldr-rgb-00.png,32.3946,0.0585,0.0478,1.3718
-Small,6x6,ldr-rgb-01.png,33.1010,0.0492,0.0387,1.6935
-Small,6x6,ldr-rgb-02.png,27.4617,0.0550,0.0445,1.4742
-Small,6x6,ldr-rgb-03.png,41.7312,0.0207,0.0104,6.2768
-Small,6x6,ldr-rgb-04.png,34.2211,0.0441,0.0334,1.9605
-Small,6x6,ldr-rgb-05.png,30.1623,0.0674,0.0567,1.1567
-Small,6x6,ldr-rgb-06.png,27.5187,0.0538,0.0432,1.5162
-Small,6x6,ldr-rgb-07.png,34.1039,0.0651,0.0541,1.2113
-Small,6x6,ldr-rgb-08.png,39.2052,0.0283,0.0179,3.6513
-Small,6x6,ldr-rgb-09.png,33.6998,0.0435,0.0330,1.9867
-Small,6x6,ldr-rgb-10.png,36.9385,0.0148,0.0067,2.4441
-Small,6x6,ldr-rgba-00.png,30.2074,0.0714,0.0603,1.0860
-Small,6x6,ldr-rgba-01.png,32.1925,0.0420,0.0312,2.1037
-Small,6x6,ldr-rgba-02.png,27.8499,0.0504,0.0397,1.6499
-Small,6x6,ldr-xy-00.png,36.1092,0.0290,0.0185,3.5370
-Small,6x6,ldr-xy-01.png,37.9987,0.0324,0.0221,2.9601
-Small,6x6,ldr-xy-02.png,45.2177,0.0257,0.0151,4.3330
-Small,6x6,ldrs-rgba-00.png,30.2085,0.0716,0.0607,1.0803
-Small,6x6,ldrs-rgba-01.png,32.1983,0.0420,0.0314,2.0878
-Small,6x6,ldrs-rgba-02.png,27.8499,0.0507,0.0400,1.6400
-Small,8x8,hdr-rgb-00.hdr,21.5539,0.1645,0.0610,1.0740
-Small,8x8,ldr-rgb-00.png,28.7378,0.0766,0.0610,1.0741
-Small,8x8,ldr-rgb-01.png,28.9290,0.0628,0.0476,1.3768
-Small,8x8,ldr-rgb-02.png,23.1458,0.0718,0.0564,1.1622
-Small,8x8,ldr-rgb-03.png,38.5923,0.0270,0.0121,5.4369
-Small,8x8,ldr-rgb-04.png,29.6540,0.0585,0.0430,1.5249
-Small,8x8,ldr-rgb-05.png,25.9366,0.0800,0.0645,1.0160
-Small,8x8,ldr-rgb-06.png,23.1913,0.0707,0.0552,1.1882
-Small,8x8,ldr-rgb-07.png,30.8126,0.0734,0.0576,1.1380
-Small,8x8,ldr-rgb-08.png,35.8673,0.0357,0.0204,3.2108
-Small,8x8,ldr-rgb-09.png,29.0427,0.0559,0.0406,1.6156
-Small,8x8,ldr-rgb-10.png,32.1979,0.0216,0.0087,1.8604
-Small,8x8,ldr-rgba-00.png,26.1494,0.0855,0.0696,0.9410
-Small,8x8,ldr-rgba-01.png,28.3397,0.0527,0.0371,1.7670
-Small,8x8,ldr-rgba-02.png,23.9327,0.0699,0.0542,1.2088
-Small,8x8,ldr-xy-00.png,34.1468,0.0415,0.0261,2.5118
-Small,8x8,ldr-xy-01.png,35.0297,0.0404,0.0253,2.5916
-Small,8x8,ldr-xy-02.png,41.0514,0.0300,0.0145,4.5145
-Small,8x8,ldrs-rgba-00.png,26.1504,0.0857,0.0697,0.9409
-Small,8x8,ldrs-rgba-01.png,28.3428,0.0529,0.0374,1.7518
-Small,8x8,ldrs-rgba-02.png,23.9331,0.0705,0.0549,1.1934
-Small,12x12,hdr-rgb-00.hdr,18.8034,0.1921,0.0799,0.8204
-Small,12x12,ldr-rgb-00.png,24.6021,0.0885,0.0637,1.0296
-Small,12x12,ldr-rgb-01.png,25.0675,0.0858,0.0613,1.0693
-Small,12x12,ldr-rgb-02.png,19.2870,0.1053,0.0806,0.8126
-Small,12x12,ldr-rgb-03.png,34.9344,0.0371,0.0130,5.0572
-Small,12x12,ldr-rgb-04.png,24.9393,0.0764,0.0519,1.2630
-Small,12x12,ldr-rgb-05.png,21.6359,0.1055,0.0809,0.8105
-Small,12x12,ldr-rgb-06.png,19.2379,0.0999,0.0751,0.8730
-Small,12x12,ldr-rgb-07.png,26.6710,0.0792,0.0542,1.2084
-Small,12x12,ldr-rgb-08.png,31.3688,0.0451,0.0206,3.1817
-Small,12x12,ldr-rgb-09.png,24.2172,0.0759,0.0517,1.2676
-Small,12x12,ldr-rgb-10.png,28.0060,0.0382,0.0164,0.9890
-Small,12x12,ldr-rgba-00.png,21.7822,0.0940,0.0689,0.9508
-Small,12x12,ldr-rgba-01.png,24.6207,0.0678,0.0430,1.5242
-Small,12x12,ldr-rgba-02.png,20.2123,0.1015,0.0765,0.8568
-Small,12x12,ldr-xy-00.png,29.7520,0.0511,0.0265,2.4762
-Small,12x12,ldr-xy-01.png,32.2132,0.0469,0.0225,2.9108
-Small,12x12,ldr-xy-02.png,38.5608,0.0305,0.0059,11.1323
-Small,12x12,ldrs-rgba-00.png,21.7821,0.0942,0.0690,0.9494
-Small,12x12,ldrs-rgba-01.png,24.6226,0.0675,0.0427,1.5359
-Small,12x12,ldrs-rgba-02.png,20.2125,0.1014,0.0767,0.8550
-Small,3x3x3,ldr-l-00-3.dds,51.9633,0.0317,0.0225,11.6690
-Small,3x3x3,ldr-l-01-3.dds,54.3643,0.0136,0.0066,10.4476
-Small,6x6x6,ldr-l-00-3.dds,32.9606,0.0857,0.0575,4.5559
-Small,6x6x6,ldr-l-01-3.dds,40.8516,0.0440,0.0184,3.7467
+Small,4x4,hdr-rgb-00.hdr,32.4348,0.1346,0.0388,1.6908
+Small,4x4,ldr-rgb-00.png,38.6985,0.0461,0.0382,1.7166
+Small,4x4,ldr-rgb-01.png,40.1183,0.0441,0.0365,1.7940
+Small,4x4,ldr-rgb-02.png,35.2059,0.0441,0.0366,1.7913
+Small,4x4,ldr-rgb-03.png,47.0764,0.0277,0.0203,3.2255
+Small,4x4,ldr-rgb-04.png,42.1384,0.0356,0.0279,2.3472
+Small,4x4,ldr-rgb-05.png,37.7480,0.0474,0.0398,1.6478
+Small,4x4,ldr-rgb-06.png,35.3504,0.0390,0.0310,2.1147
+Small,4x4,ldr-rgb-07.png,38.8920,0.0544,0.0464,1.4136
+Small,4x4,ldr-rgb-08.png,44.8397,0.0305,0.0229,2.8628
+Small,4x4,ldr-rgb-09.png,42.0738,0.0365,0.0289,2.2638
+Small,4x4,ldr-rgb-10.png,44.8740,0.0101,0.0047,3.4434
+Small,4x4,ldr-rgba-00.png,36.2304,0.0510,0.0430,1.5249
+Small,4x4,ldr-rgba-01.png,38.8996,0.0335,0.0256,2.5622
+Small,4x4,ldr-rgba-02.png,34.9204,0.0362,0.0283,2.3136
+Small,4x4,ldr-xy-00.png,37.6115,0.0362,0.0265,2.4698
+Small,4x4,ldr-xy-01.png,44.7088,0.0472,0.0382,1.7178
+Small,4x4,ldr-xy-02.png,50.8950,0.0552,0.0453,1.4452
+Small,4x4,ldrs-rgba-00.png,36.2375,0.0521,0.0438,1.4965
+Small,4x4,ldrs-rgba-01.png,38.9148,0.0341,0.0263,2.4959
+Small,4x4,ldrs-rgba-02.png,34.9261,0.0363,0.0284,2.3065
+Small,5x5,hdr-rgb-00.hdr,26.6507,0.1430,0.0465,1.4104
+Small,5x5,ldr-rgb-00.png,35.0601,0.0515,0.0427,1.5334
+Small,5x5,ldr-rgb-01.png,36.3948,0.0424,0.0338,1.9372
+Small,5x5,ldr-rgb-02.png,31.0692,0.0436,0.0351,1.8648
+Small,5x5,ldr-rgb-03.png,43.8060,0.0204,0.0122,5.3818
+Small,5x5,ldr-rgb-04.png,37.6714,0.0385,0.0298,2.1992
+Small,5x5,ldr-rgb-05.png,33.5067,0.0582,0.0495,1.3235
+Small,5x5,ldr-rgb-06.png,31.0849,0.0412,0.0324,2.0231
+Small,5x5,ldr-rgb-07.png,35.7129,0.0586,0.0497,1.3194
+Small,5x5,ldr-rgb-08.png,41.3215,0.0289,0.0203,3.2284
+Small,5x5,ldr-rgb-09.png,37.5962,0.0373,0.0287,2.2813
+Small,5x5,ldr-rgb-10.png,40.5078,0.0120,0.0056,2.9060
+Small,5x5,ldr-rgba-00.png,32.7508,0.0629,0.0538,1.2185
+Small,5x5,ldr-rgba-01.png,35.2808,0.0381,0.0294,2.2276
+Small,5x5,ldr-rgba-02.png,31.1277,0.0434,0.0345,1.9002
+Small,5x5,ldr-xy-00.png,37.0387,0.0341,0.0237,2.7673
+Small,5x5,ldr-xy-01.png,40.3190,0.0447,0.0344,1.9047
+Small,5x5,ldr-xy-02.png,49.0279,0.0352,0.0245,2.6781
+Small,5x5,ldrs-rgba-00.png,32.7532,0.0631,0.0541,1.2124
+Small,5x5,ldrs-rgba-01.png,35.2889,0.0382,0.0295,2.2240
+Small,5x5,ldrs-rgba-02.png,31.1281,0.0436,0.0349,1.8772
+Small,6x6,hdr-rgb-00.hdr,24.7388,0.1480,0.0503,1.3037
+Small,6x6,ldr-rgb-00.png,32.3948,0.0572,0.0472,1.3892
+Small,6x6,ldr-rgb-01.png,33.1016,0.0477,0.0382,1.7164
+Small,6x6,ldr-rgb-02.png,27.4630,0.0540,0.0444,1.4766
+Small,6x6,ldr-rgb-03.png,41.7312,0.0195,0.0101,6.4945
+Small,6x6,ldr-rgb-04.png,34.2209,0.0430,0.0332,1.9745
+Small,6x6,ldr-rgb-05.png,30.1623,0.0663,0.0565,1.1606
+Small,6x6,ldr-rgb-06.png,27.5200,0.0528,0.0430,1.5243
+Small,6x6,ldr-rgb-07.png,34.1039,0.0637,0.0536,1.2225
+Small,6x6,ldr-rgb-08.png,39.2052,0.0276,0.0182,3.6066
+Small,6x6,ldr-rgb-09.png,33.7008,0.0420,0.0324,2.0232
+Small,6x6,ldr-rgb-10.png,36.9385,0.0137,0.0063,2.5755
+Small,6x6,ldr-rgba-00.png,30.2075,0.0700,0.0597,1.0981
+Small,6x6,ldr-rgba-01.png,32.1924,0.0407,0.0307,2.1366
+Small,6x6,ldr-rgba-02.png,27.8504,0.0490,0.0392,1.6735
+Small,6x6,ldr-xy-00.png,36.0420,0.0325,0.0207,3.1718
+Small,6x6,ldr-xy-01.png,37.5902,0.0370,0.0255,2.5668
+Small,6x6,ldr-xy-02.png,45.9866,0.0293,0.0176,3.7283
+Small,6x6,ldrs-rgba-00.png,30.2087,0.0702,0.0600,1.0915
+Small,6x6,ldrs-rgba-01.png,32.1983,0.0408,0.0308,2.1312
+Small,6x6,ldrs-rgba-02.png,27.8504,0.0490,0.0392,1.6721
+Small,8x8,hdr-rgb-00.hdr,21.5514,0.1626,0.0604,1.0858
+Small,8x8,ldr-rgb-00.png,28.7378,0.0749,0.0606,1.0811
+Small,8x8,ldr-rgb-01.png,28.9290,0.0609,0.0469,1.3971
+Small,8x8,ldr-rgb-02.png,23.1458,0.0698,0.0560,1.1712
+Small,8x8,ldr-rgb-03.png,38.5923,0.0255,0.0116,5.6317
+Small,8x8,ldr-rgb-04.png,29.6540,0.0570,0.0427,1.5341
+Small,8x8,ldr-rgb-05.png,25.9366,0.0781,0.0640,1.0248
+Small,8x8,ldr-rgb-06.png,23.1913,0.0694,0.0551,1.1896
+Small,8x8,ldr-rgb-07.png,30.8126,0.0724,0.0579,1.1313
+Small,8x8,ldr-rgb-08.png,35.8673,0.0344,0.0202,3.2490
+Small,8x8,ldr-rgb-09.png,29.0431,0.0540,0.0400,1.6366
+Small,8x8,ldr-rgb-10.png,32.1979,0.0207,0.0085,1.9100
+Small,8x8,ldr-rgba-00.png,26.1494,0.0838,0.0692,0.9475
+Small,8x8,ldr-rgba-01.png,28.3397,0.0505,0.0363,1.8068
+Small,8x8,ldr-rgba-02.png,23.9327,0.0680,0.0537,1.2208
+Small,8x8,ldr-xy-00.png,33.9859,0.0456,0.0294,2.2311
+Small,8x8,ldr-xy-01.png,34.7191,0.0432,0.0274,2.3914
+Small,8x8,ldr-xy-02.png,41.6941,0.0334,0.0170,3.8598
+Small,8x8,ldrs-rgba-00.png,26.1504,0.0841,0.0694,0.9438
+Small,8x8,ldrs-rgba-01.png,28.3428,0.0511,0.0369,1.7781
+Small,8x8,ldrs-rgba-02.png,23.9331,0.0686,0.0544,1.2051
+Small,12x12,hdr-rgb-00.hdr,18.8112,0.1892,0.0789,0.8304
+Small,12x12,ldr-rgb-00.png,24.6026,0.0856,0.0629,1.0424
+Small,12x12,ldr-rgb-01.png,25.0675,0.0826,0.0603,1.0867
+Small,12x12,ldr-rgb-02.png,19.2867,0.1018,0.0795,0.8246
+Small,12x12,ldr-rgb-03.png,34.9324,0.0345,0.0123,5.3334
+Small,12x12,ldr-rgb-04.png,24.9396,0.0739,0.0514,1.2755
+Small,12x12,ldr-rgb-05.png,21.6355,0.1025,0.0800,0.8188
+Small,12x12,ldr-rgb-06.png,19.2384,0.0970,0.0744,0.8807
+Small,12x12,ldr-rgb-07.png,26.6712,0.0769,0.0539,1.2165
+Small,12x12,ldr-rgb-08.png,31.3688,0.0423,0.0199,3.2972
+Small,12x12,ldr-rgb-09.png,24.2186,0.0733,0.0512,1.2796
+Small,12x12,ldr-rgb-10.png,28.0060,0.0361,0.0160,1.0166
+Small,12x12,ldr-rgba-00.png,21.7824,0.0916,0.0687,0.9541
+Small,12x12,ldr-rgba-01.png,24.6195,0.0649,0.0423,1.5499
+Small,12x12,ldr-rgba-02.png,20.2128,0.0978,0.0752,0.8717
+Small,12x12,ldr-xy-00.png,29.6851,0.0560,0.0316,2.0714
+Small,12x12,ldr-xy-01.png,31.6726,0.0551,0.0310,2.1139
+Small,12x12,ldr-xy-02.png,38.5322,0.0321,0.0079,8.3443
+Small,12x12,ldrs-rgba-00.png,21.7824,0.0916,0.0687,0.9540
+Small,12x12,ldrs-rgba-01.png,24.6214,0.0648,0.0423,1.5505
+Small,12x12,ldrs-rgba-02.png,20.2131,0.0982,0.0756,0.8670
+Small,3x3x3,ldr-l-00-3.dds,51.9633,0.0308,0.0221,11.8671
+Small,3x3x3,ldr-l-01-3.dds,54.3643,0.0129,0.0065,10.6293
+Small,6x6x6,ldr-l-00-3.dds,32.9606,0.0827,0.0568,4.6139
+Small,6x6x6,ldr-l-01-3.dds,40.8516,0.0418,0.0183,3.7624
diff --git a/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv b/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
index 52d236f..e448e32 100644
--- a/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
+++ b/Test/Images/Small/astc_reference-main-avx2_thorough_results.csv
@@ -1,110 +1,110 @@
 Image Set,Block Size,Name,PSNR,Total Time,Coding Time,Coding Rate
-Small,4x4,hdr-rgb-00.hdr,32.5557,0.1727,0.0765,0.8566
-Small,4x4,ldr-rgb-00.png,39.1080,0.0908,0.0823,0.7966
-Small,4x4,ldr-rgb-01.png,40.3320,0.0894,0.0811,0.8078
-Small,4x4,ldr-rgb-02.png,35.3607,0.0817,0.0734,0.8932
-Small,4x4,ldr-rgb-03.png,47.6667,0.0842,0.0762,0.8596
-Small,4x4,ldr-rgb-04.png,42.3048,0.0814,0.0730,0.8977
-Small,4x4,ldr-rgb-05.png,37.9487,0.0950,0.0866,0.7564
-Small,4x4,ldr-rgb-06.png,35.4842,0.0755,0.0669,0.9794
-Small,4x4,ldr-rgb-07.png,39.7534,0.1027,0.0937,0.6993
-Small,4x4,ldr-rgb-08.png,45.6979,0.0796,0.0713,0.9186
-Small,4x4,ldr-rgb-09.png,42.2292,0.0857,0.0773,0.8480
-Small,4x4,ldr-rgb-10.png,44.9858,0.0163,0.0103,1.5796
-Small,4x4,ldr-rgba-00.png,36.7410,0.0945,0.0857,0.7649
-Small,4x4,ldr-rgba-01.png,39.0312,0.0809,0.0724,0.9053
-Small,4x4,ldr-rgba-02.png,34.9861,0.0772,0.0687,0.9541
-Small,4x4,ldr-xy-00.png,37.7264,0.0925,0.0842,0.7785
-Small,4x4,ldr-xy-01.png,45.6067,0.1003,0.0922,0.7107
-Small,4x4,ldr-xy-02.png,50.9896,0.1229,0.1145,0.5725
-Small,4x4,ldrs-rgba-00.png,36.7485,0.0951,0.0862,0.7599
-Small,4x4,ldrs-rgba-01.png,39.0531,0.0815,0.0730,0.8981
-Small,4x4,ldrs-rgba-02.png,34.9909,0.0772,0.0686,0.9553
-Small,5x5,hdr-rgb-00.hdr,27.4605,0.1799,0.0830,0.7893
-Small,5x5,ldr-rgb-00.png,35.3302,0.1042,0.0946,0.6927
-Small,5x5,ldr-rgb-01.png,36.5029,0.0990,0.0898,0.7300
-Small,5x5,ldr-rgb-02.png,31.1210,0.0929,0.0835,0.7847
-Small,5x5,ldr-rgb-03.png,44.4794,0.0919,0.0829,0.7907
-Small,5x5,ldr-rgb-04.png,37.8285,0.0920,0.0825,0.7940
-Small,5x5,ldr-rgb-05.png,33.6601,0.1074,0.0980,0.6686
-Small,5x5,ldr-rgb-06.png,31.1230,0.0887,0.0792,0.8273
-Small,5x5,ldr-rgb-07.png,36.6472,0.1180,0.1083,0.6053
-Small,5x5,ldr-rgb-08.png,42.2544,0.0879,0.0787,0.8326
-Small,5x5,ldr-rgb-09.png,37.6965,0.0977,0.0885,0.7408
-Small,5x5,ldr-rgb-10.png,40.7181,0.0199,0.0127,1.2793
-Small,5x5,ldr-rgba-00.png,33.1222,0.1103,0.1005,0.6520
-Small,5x5,ldr-rgba-01.png,35.3522,0.0930,0.0834,0.7855
-Small,5x5,ldr-rgba-02.png,31.1618,0.0918,0.0821,0.7985
-Small,5x5,ldr-xy-00.png,37.2660,0.0872,0.0779,0.8412
-Small,5x5,ldr-xy-01.png,41.7032,0.1129,0.1036,0.6324
-Small,5x5,ldr-xy-02.png,49.2302,0.1306,0.1209,0.5421
-Small,5x5,ldrs-rgba-00.png,33.1252,0.1115,0.1017,0.6445
-Small,5x5,ldrs-rgba-01.png,35.3599,0.0935,0.0840,0.7803
-Small,5x5,ldrs-rgba-02.png,31.1624,0.0923,0.0827,0.7923
-Small,6x6,hdr-rgb-00.hdr,24.8303,0.1897,0.0901,0.7276
-Small,6x6,ldr-rgb-00.png,32.6528,0.1192,0.1081,0.6061
-Small,6x6,ldr-rgb-01.png,33.1780,0.1142,0.1035,0.6330
-Small,6x6,ldr-rgb-02.png,27.4974,0.1112,0.1007,0.6511
-Small,6x6,ldr-rgb-03.png,42.5366,0.0769,0.0666,0.9845
-Small,6x6,ldr-rgb-04.png,34.3452,0.1090,0.0982,0.6677
-Small,6x6,ldr-rgb-05.png,30.2860,0.1247,0.1139,0.5753
-Small,6x6,ldr-rgb-06.png,27.5559,0.1082,0.0973,0.6736
-Small,6x6,ldr-rgb-07.png,34.4287,0.1297,0.1185,0.5531
-Small,6x6,ldr-rgb-08.png,39.9093,0.0754,0.0648,1.0119
-Small,6x6,ldr-rgb-09.png,33.8256,0.1061,0.0955,0.6861
-Small,6x6,ldr-rgb-10.png,37.1203,0.0246,0.0161,1.0091
-Small,6x6,ldr-rgba-00.png,30.4892,0.1264,0.1150,0.5701
-Small,6x6,ldr-rgba-01.png,32.2511,0.1062,0.0952,0.6886
-Small,6x6,ldr-rgba-02.png,27.8849,0.1083,0.0974,0.6727
-Small,6x6,ldr-xy-00.png,36.3699,0.0706,0.0600,1.0927
-Small,6x6,ldr-xy-01.png,38.4260,0.0998,0.0891,0.7355
-Small,6x6,ldr-xy-02.png,47.4512,0.1284,0.1175,0.5578
-Small,6x6,ldrs-rgba-00.png,30.4903,0.1267,0.1155,0.5675
-Small,6x6,ldrs-rgba-01.png,32.2575,0.1063,0.0955,0.6864
-Small,6x6,ldrs-rgba-02.png,27.8841,0.1088,0.0978,0.6702
-Small,8x8,hdr-rgb-00.hdr,21.7767,0.2075,0.1060,0.6181
-Small,8x8,ldr-rgb-00.png,28.9664,0.1460,0.1299,0.5044
-Small,8x8,ldr-rgb-01.png,29.0055,0.1360,0.1205,0.5437
-Small,8x8,ldr-rgb-02.png,23.1782,0.1403,0.1246,0.5259
-Small,8x8,ldr-rgb-03.png,39.4493,0.0507,0.0352,1.8596
-Small,8x8,ldr-rgb-04.png,29.7729,0.1255,0.1097,0.5977
-Small,8x8,ldr-rgb-05.png,26.0315,0.1440,0.1281,0.5116
-Small,8x8,ldr-rgb-06.png,23.2332,0.1387,0.1226,0.5344
-Small,8x8,ldr-rgb-07.png,31.1596,0.1431,0.1270,0.5162
-Small,8x8,ldr-rgb-08.png,36.5135,0.0727,0.0569,1.1511
-Small,8x8,ldr-rgb-09.png,29.1942,0.1078,0.0920,0.7123
-Small,8x8,ldr-rgb-10.png,32.3486,0.0329,0.0195,0.8347
-Small,8x8,ldr-rgba-00.png,26.5009,0.1497,0.1334,0.4914
-Small,8x8,ldr-rgba-01.png,28.3965,0.1195,0.1032,0.6350
-Small,8x8,ldr-rgba-02.png,23.9603,0.1283,0.1122,0.5839
-Small,8x8,ldr-xy-00.png,34.2681,0.0804,0.0648,1.0118
-Small,8x8,ldr-xy-01.png,35.5234,0.0761,0.0605,1.0840
-Small,8x8,ldr-xy-02.png,44.4233,0.0860,0.0701,0.9352
-Small,8x8,ldrs-rgba-00.png,26.5026,0.1505,0.1344,0.4877
-Small,8x8,ldrs-rgba-01.png,28.3995,0.1195,0.1036,0.6324
-Small,8x8,ldrs-rgba-02.png,23.9598,0.1287,0.1125,0.5823
-Small,12x12,hdr-rgb-00.hdr,18.9066,0.2471,0.1343,0.4879
-Small,12x12,ldr-rgb-00.png,24.9677,0.1783,0.1525,0.4299
-Small,12x12,ldr-rgb-01.png,25.1726,0.1609,0.1354,0.4839
-Small,12x12,ldr-rgb-02.png,19.3144,0.1880,0.1624,0.4035
-Small,12x12,ldr-rgb-03.png,36.1670,0.0589,0.0337,1.9462
-Small,12x12,ldr-rgb-04.png,25.0349,0.1580,0.1324,0.4951
-Small,12x12,ldr-rgb-05.png,21.7306,0.1804,0.1549,0.4232
-Small,12x12,ldr-rgb-06.png,19.2767,0.1816,0.1559,0.4204
-Small,12x12,ldr-rgb-07.png,27.0738,0.1609,0.1350,0.4856
-Small,12x12,ldr-rgb-08.png,32.2423,0.0780,0.0525,1.2474
-Small,12x12,ldr-rgb-09.png,24.4468,0.1523,0.1267,0.5171
-Small,12x12,ldr-rgb-10.png,28.1777,0.0530,0.0301,0.5397
-Small,12x12,ldr-rgba-00.png,22.2804,0.1766,0.1509,0.4343
-Small,12x12,ldr-rgba-01.png,24.7161,0.1271,0.1013,0.6473
-Small,12x12,ldr-rgba-02.png,20.2326,0.1622,0.1365,0.4801
-Small,12x12,ldr-xy-00.png,30.5033,0.1044,0.0789,0.8309
-Small,12x12,ldr-xy-01.png,32.4454,0.0794,0.0540,1.2141
-Small,12x12,ldr-xy-02.png,39.8717,0.0570,0.0313,2.0935
-Small,12x12,ldrs-rgba-00.png,22.2804,0.1771,0.1509,0.4344
-Small,12x12,ldrs-rgba-01.png,24.7179,0.1273,0.1015,0.6458
-Small,12x12,ldrs-rgba-02.png,20.2328,0.1624,0.1364,0.4804
-Small,3x3x3,ldr-l-00-3.dds,52.4282,0.0623,0.0530,4.9451
-Small,3x3x3,ldr-l-01-3.dds,55.4466,0.0280,0.0211,3.2701
-Small,6x6x6,ldr-l-00-3.dds,33.2662,0.1180,0.0899,2.9150
-Small,6x6x6,ldr-l-01-3.dds,41.5787,0.0459,0.0201,3.4264
+Small,4x4,hdr-rgb-00.hdr,32.5528,0.1708,0.0760,0.8618
+Small,4x4,ldr-rgb-00.png,39.1080,0.0921,0.0841,0.7788
+Small,4x4,ldr-rgb-01.png,40.3320,0.0907,0.0830,0.7897
+Small,4x4,ldr-rgb-02.png,35.3607,0.0805,0.0729,0.8992
+Small,4x4,ldr-rgb-03.png,47.6667,0.0835,0.0761,0.8611
+Small,4x4,ldr-rgb-04.png,42.3048,0.0803,0.0725,0.9036
+Small,4x4,ldr-rgb-05.png,37.9487,0.0940,0.0862,0.7605
+Small,4x4,ldr-rgb-06.png,35.4842,0.0746,0.0667,0.9825
+Small,4x4,ldr-rgb-07.png,39.7534,0.1008,0.0927,0.7068
+Small,4x4,ldr-rgb-08.png,45.6979,0.0786,0.0710,0.9226
+Small,4x4,ldr-rgb-09.png,42.2292,0.0842,0.0766,0.8558
+Small,4x4,ldr-rgb-10.png,44.9858,0.0156,0.0102,1.6015
+Small,4x4,ldr-rgba-00.png,36.7410,0.0931,0.0849,0.7716
+Small,4x4,ldr-rgba-01.png,39.0312,0.0798,0.0718,0.9130
+Small,4x4,ldr-rgba-02.png,34.9861,0.0753,0.0675,0.9712
+Small,4x4,ldr-xy-00.png,37.6610,0.1007,0.0910,0.7200
+Small,4x4,ldr-xy-01.png,44.9262,0.1043,0.0950,0.6898
+Small,4x4,ldr-xy-02.png,50.9725,0.1247,0.1149,0.5706
+Small,4x4,ldrs-rgba-00.png,36.7485,0.0932,0.0851,0.7704
+Small,4x4,ldrs-rgba-01.png,39.0531,0.0805,0.0725,0.9041
+Small,4x4,ldrs-rgba-02.png,34.9909,0.0758,0.0680,0.9639
+Small,5x5,hdr-rgb-00.hdr,27.4704,0.1781,0.0817,0.8018
+Small,5x5,ldr-rgb-00.png,35.3302,0.1025,0.0936,0.7005
+Small,5x5,ldr-rgb-01.png,36.5029,0.0975,0.0890,0.7367
+Small,5x5,ldr-rgb-02.png,31.1210,0.0919,0.0831,0.7885
+Small,5x5,ldr-rgb-03.png,44.4794,0.0912,0.0829,0.7905
+Small,5x5,ldr-rgb-04.png,37.8285,0.0911,0.0821,0.7985
+Small,5x5,ldr-rgb-05.png,33.6601,0.1060,0.0974,0.6730
+Small,5x5,ldr-rgb-06.png,31.1230,0.0874,0.0786,0.8333
+Small,5x5,ldr-rgb-07.png,36.6472,0.1163,0.1071,0.6119
+Small,5x5,ldr-rgb-08.png,42.2544,0.0872,0.0786,0.8343
+Small,5x5,ldr-rgb-09.png,37.6965,0.0967,0.0881,0.7439
+Small,5x5,ldr-rgb-10.png,40.7181,0.0190,0.0127,1.2797
+Small,5x5,ldr-rgba-00.png,33.1222,0.1089,0.0998,0.6565
+Small,5x5,ldr-rgba-01.png,35.3522,0.0916,0.0828,0.7918
+Small,5x5,ldr-rgba-02.png,31.1618,0.0903,0.0815,0.8042
+Small,5x5,ldr-xy-00.png,37.1024,0.0979,0.0871,0.7523
+Small,5x5,ldr-xy-01.png,41.0349,0.1193,0.1090,0.6015
+Small,5x5,ldr-xy-02.png,49.2182,0.1322,0.1215,0.5394
+Small,5x5,ldrs-rgba-00.png,33.1252,0.1102,0.1010,0.6489
+Small,5x5,ldrs-rgba-01.png,35.3599,0.0920,0.0832,0.7874
+Small,5x5,ldrs-rgba-02.png,31.1624,0.0906,0.0816,0.8028
+Small,6x6,hdr-rgb-00.hdr,24.8413,0.1855,0.0893,0.7343
+Small,6x6,ldr-rgb-00.png,32.6529,0.1186,0.1085,0.6042
+Small,6x6,ldr-rgb-01.png,33.1791,0.1127,0.1027,0.6381
+Small,6x6,ldr-rgb-02.png,27.4976,0.1097,0.1000,0.6557
+Small,6x6,ldr-rgb-03.png,42.5366,0.0760,0.0666,0.9845
+Small,6x6,ldr-rgb-04.png,34.3450,0.1081,0.0980,0.6690
+Small,6x6,ldr-rgb-05.png,30.2857,0.1228,0.1127,0.5813
+Small,6x6,ldr-rgb-06.png,27.5562,0.1070,0.0970,0.6754
+Small,6x6,ldr-rgb-07.png,34.4288,0.1280,0.1176,0.5571
+Small,6x6,ldr-rgb-08.png,39.9093,0.0743,0.0645,1.0160
+Small,6x6,ldr-rgb-09.png,33.8264,0.1053,0.0953,0.6876
+Small,6x6,ldr-rgb-10.png,37.1203,0.0234,0.0157,1.0334
+Small,6x6,ldr-rgba-00.png,30.4893,0.1241,0.1138,0.5758
+Small,6x6,ldr-rgba-01.png,32.2510,0.1044,0.0942,0.6960
+Small,6x6,ldr-rgba-02.png,27.8850,0.1073,0.0973,0.6738
+Small,6x6,ldr-xy-00.png,36.1615,0.0783,0.0665,0.9862
+Small,6x6,ldr-xy-01.png,37.9286,0.1106,0.0991,0.6614
+Small,6x6,ldr-xy-02.png,47.3977,0.1376,0.1257,0.5213
+Small,6x6,ldrs-rgba-00.png,30.4904,0.1249,0.1146,0.5717
+Small,6x6,ldrs-rgba-01.png,32.2574,0.1049,0.0947,0.6922
+Small,6x6,ldrs-rgba-02.png,27.8842,0.1077,0.0976,0.6717
+Small,8x8,hdr-rgb-00.hdr,21.7833,0.2056,0.1055,0.6214
+Small,8x8,ldr-rgb-00.png,28.9664,0.1439,0.1292,0.5074
+Small,8x8,ldr-rgb-01.png,29.0055,0.1344,0.1199,0.5465
+Small,8x8,ldr-rgb-02.png,23.1782,0.1382,0.1237,0.5298
+Small,8x8,ldr-rgb-03.png,39.4493,0.0488,0.0347,1.8910
+Small,8x8,ldr-rgb-04.png,29.7729,0.1244,0.1098,0.5969
+Small,8x8,ldr-rgb-05.png,26.0315,0.1420,0.1274,0.5144
+Small,8x8,ldr-rgb-06.png,23.2332,0.1356,0.1209,0.5422
+Small,8x8,ldr-rgb-07.png,31.1596,0.1404,0.1256,0.5217
+Small,8x8,ldr-rgb-08.png,36.5135,0.0703,0.0561,1.1673
+Small,8x8,ldr-rgb-09.png,29.1942,0.1061,0.0918,0.7138
+Small,8x8,ldr-rgb-10.png,32.3486,0.0309,0.0186,0.8738
+Small,8x8,ldr-rgba-00.png,26.5009,0.1471,0.1322,0.4959
+Small,8x8,ldr-rgba-01.png,28.3965,0.1282,0.1137,0.5764
+Small,8x8,ldr-rgba-02.png,23.9603,0.1442,0.1294,0.5064
+Small,8x8,ldr-xy-00.png,34.0791,0.0953,0.0787,0.8328
+Small,8x8,ldr-xy-01.png,34.9260,0.0972,0.0809,0.8104
+Small,8x8,ldr-xy-02.png,44.4817,0.1127,0.0962,0.6813
+Small,8x8,ldrs-rgba-00.png,26.5026,0.1492,0.1341,0.4888
+Small,8x8,ldrs-rgba-01.png,28.3995,0.1175,0.1028,0.6376
+Small,8x8,ldrs-rgba-02.png,23.9598,0.1267,0.1120,0.5850
+Small,12x12,hdr-rgb-00.hdr,18.9081,0.2456,0.1347,0.4864
+Small,12x12,ldr-rgb-00.png,24.9670,0.1745,0.1512,0.4333
+Small,12x12,ldr-rgb-01.png,25.1725,0.1579,0.1347,0.4866
+Small,12x12,ldr-rgb-02.png,19.3142,0.1842,0.1611,0.4068
+Small,12x12,ldr-rgb-03.png,36.1690,0.0559,0.0329,1.9891
+Small,12x12,ldr-rgb-04.png,25.0348,0.1558,0.1324,0.4951
+Small,12x12,ldr-rgb-05.png,21.7300,0.1773,0.1538,0.4261
+Small,12x12,ldr-rgb-06.png,19.2768,0.1789,0.1555,0.4216
+Small,12x12,ldr-rgb-07.png,27.0734,0.1585,0.1347,0.4865
+Small,12x12,ldr-rgb-08.png,32.2423,0.0748,0.0515,1.2728
+Small,12x12,ldr-rgb-09.png,24.4517,0.1476,0.1243,0.5273
+Small,12x12,ldr-rgb-10.png,28.1777,0.0502,0.0289,0.5623
+Small,12x12,ldr-rgba-00.png,22.2801,0.1731,0.1494,0.4387
+Small,12x12,ldr-rgba-01.png,24.7162,0.1237,0.1001,0.6547
+Small,12x12,ldr-rgba-02.png,20.2326,0.1576,0.1340,0.4891
+Small,12x12,ldr-xy-00.png,30.3073,0.1094,0.0839,0.7808
+Small,12x12,ldr-xy-01.png,32.1323,0.0827,0.0580,1.1306
+Small,12x12,ldr-xy-02.png,40.2419,0.0656,0.0403,1.6253
+Small,12x12,ldrs-rgba-00.png,22.2801,0.1730,0.1494,0.4386
+Small,12x12,ldrs-rgba-01.png,24.7180,0.1230,0.0996,0.6583
+Small,12x12,ldrs-rgba-02.png,20.2327,0.1587,0.1352,0.4849
+Small,3x3x3,ldr-l-00-3.dds,52.4282,0.0615,0.0528,4.9619
+Small,3x3x3,ldr-l-01-3.dds,55.4466,0.0273,0.0209,3.3008
+Small,6x6x6,ldr-l-00-3.dds,33.2662,0.1147,0.0890,2.9450
+Small,6x6x6,ldr-l-01-3.dds,41.5787,0.0433,0.0202,3.4126
diff --git a/Test/astc_test_image.py b/Test/astc_test_image.py
index 130a377..f90945c 100644
--- a/Test/astc_test_image.py
+++ b/Test/astc_test_image.py
@@ -310,7 +310,7 @@
     parser.add_argument("--encoder", dest="encoders", default="avx2",
                         choices=coders, help="test encoder variant")
 
-    parser.add_argument("--reference", dest="reference", default="ref-3.3-avx2",
+    parser.add_argument("--reference", dest="reference", default="ref-main-avx2",
                         choices=refcoders, help="reference encoder variant")
 
     astcProfile = ["ldr", "ldrs", "hdr", "all"]