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
|
[PATCH] Make AVX symbols to be strictly visible (fix build with gcc8)
Backport of upstream commit f018e1da10196c1f03ed8834d5db64ef67f3cc71
https://github.com/pkuvcl/xavs2/issues/17
https://github.com/pkuvcl/xavs2/commit/f018e1da10196c1f03ed8834d5db64ef67f3cc71
diff --git a/source/common/vec/intrinsic_cg_scan_avx.c b/source/common/vec/intrinsic_cg_scan_avx.c
index ec9a109..c8425a8 100644
--- a/source/common/vec/intrinsic_cg_scan_avx.c
+++ b/source/common/vec/intrinsic_cg_scan_avx.c
@@ -35,15 +35,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../common.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../common.h"
+#include "intrinsic.h"
+
#if ARCH_X86_64
/* ---------------------------------------------------------------------------
*/
diff --git a/source/common/vec/intrinsic_dct.c b/source/common/vec/intrinsic_dct.c
index 2251593..15cc90b 100644
--- a/source/common/vec/intrinsic_dct.c
+++ b/source/common/vec/intrinsic_dct.c
@@ -34,16 +34,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "../avs2_defs.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "../avs2_defs.h"
+#include "intrinsic.h"
void *xavs2_fast_memzero_mmx(void *dst, size_t n);
diff --git a/source/common/vec/intrinsic_dct_avx.c b/source/common/vec/intrinsic_dct_avx.c
index 7332097..77381d9 100644
--- a/source/common/vec/intrinsic_dct_avx.c
+++ b/source/common/vec/intrinsic_dct_avx.c
@@ -36,15 +36,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "intrinsic.h"
-#include "../avs2_defs.h"
-
#include <xmmintrin.h> // SSE
#include <pmmintrin.h> // SSE3
#include <tmmintrin.h> // SSSE3
#include <immintrin.h> // AVX and AVX2
+#include "../basic_types.h"
+#include "intrinsic.h"
+#include "../avs2_defs.h"
+
/* disable warnings */
#ifdef _MSC_VER
#pragma warning(disable:4127) // warning C4127: 条件表达式是常量
diff --git a/source/common/vec/intrinsic_deblock_avx2.c b/source/common/vec/intrinsic_deblock_avx2.c
index fd39f98..6d29f75 100644
--- a/source/common/vec/intrinsic_deblock_avx2.c
+++ b/source/common/vec/intrinsic_deblock_avx2.c
@@ -34,16 +34,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-
-#include "../basic_types.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "intrinsic.h"
+
void deblock_edge_ver_avx2(pel_t *SrcPtr, int stride, int Alpha, int Beta, uint8_t *flt_flag)
{
pel_t *pTmp = SrcPtr - 4;
diff --git a/source/common/vec/intrinsic_idct_avx2.c b/source/common/vec/intrinsic_idct_avx2.c
index 3b769d9..5e1473d 100644
--- a/source/common/vec/intrinsic_idct_avx2.c
+++ b/source/common/vec/intrinsic_idct_avx2.c
@@ -36,16 +36,16 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "../avs2_defs.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "../avs2_defs.h"
+#include "intrinsic.h"
+
/* disable warnings */
#pragma warning(disable:4127) // warning C4127: 条件表达式是常量
diff --git a/source/common/vec/intrinsic_inter_pred.c b/source/common/vec/intrinsic_inter_pred.c
index 422f6a3..f786aad 100644
--- a/source/common/vec/intrinsic_inter_pred.c
+++ b/source/common/vec/intrinsic_inter_pred.c
@@ -34,16 +34,16 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "intrinsic.h"
-#include "avs2_defs.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "intrinsic.h"
+#include "avs2_defs.h"
+
/* ---------------------------------------------------------------------------
*/
void intpl_chroma_block_hor_sse128(pel_t *dst, int i_dst, pel_t *src, int i_src, int width, int height, const int8_t *coeff)
diff --git a/source/common/vec/intrinsic_inter_pred_avx2.c b/source/common/vec/intrinsic_inter_pred_avx2.c
index eb159ef..7e62ad1 100644
--- a/source/common/vec/intrinsic_inter_pred_avx2.c
+++ b/source/common/vec/intrinsic_inter_pred_avx2.c
@@ -34,14 +34,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+
+#include "../basic_types.h"
+#include "intrinsic.h"
+
#pragma warning(disable:4127) // warning C4127: 条件表达式是常量
/* ---------------------------------------------------------------------------
diff --git a/source/common/vec/intrinsic_intra-pred_avx2.c b/source/common/vec/intrinsic_intra-pred_avx2.c
index 3542511..d1c9b24 100644
--- a/source/common/vec/intrinsic_intra-pred_avx2.c
+++ b/source/common/vec/intrinsic_intra-pred_avx2.c
@@ -34,16 +34,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "avs2_defs.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "avs2_defs.h"
+#include "intrinsic.h"
#ifndef _MSC_VER
#define __int64 int64_t
diff --git a/source/common/vec/intrinsic_pixel_avx.c b/source/common/vec/intrinsic_pixel_avx.c
index ab9ddb7..a88f6d6 100644
--- a/source/common/vec/intrinsic_pixel_avx.c
+++ b/source/common/vec/intrinsic_pixel_avx.c
@@ -34,10 +34,6 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../basic_types.h"
-#include "../avs2_defs.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
@@ -45,6 +41,10 @@
#include <immintrin.h>
#include <string.h>
+#include "../basic_types.h"
+#include "../avs2_defs.h"
+#include "intrinsic.h"
+
/* ---------------------------------------------------------------------------
*/
void *xavs2_memzero_aligned_c_avx(void *dst, size_t n)
diff --git a/source/common/vec/intrinsic_quant_avx2.c b/source/common/vec/intrinsic_quant_avx2.c
index 263ead9..562b4e2 100644
--- a/source/common/vec/intrinsic_quant_avx2.c
+++ b/source/common/vec/intrinsic_quant_avx2.c
@@ -35,16 +35,15 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-
-#include "../basic_types.h"
-#include "intrinsic.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../basic_types.h"
+#include "intrinsic.h"
+
int quant_avx2(coeff_t *coef, const int i_coef, const int scale, const int shift, const int add)
{
__m256i mScale, mAdd;
diff --git a/source/common/vec/intrinsic_sao_avx2.c b/source/common/vec/intrinsic_sao_avx2.c
index 9b7f428..cab0b1a 100644
--- a/source/common/vec/intrinsic_sao_avx2.c
+++ b/source/common/vec/intrinsic_sao_avx2.c
@@ -34,16 +34,16 @@
* For more information, contact us at sswang @ pku.edu.cn.
*/
-#include "../common.h"
-#include "intrinsic.h"
-#include "../filter.h"
-
#include <mmintrin.h>
#include <emmintrin.h>
#include <tmmintrin.h>
#include <smmintrin.h>
#include <immintrin.h>
+#include "../common.h"
+#include "intrinsic.h"
+#include "../filter.h"
+
/* ---------------------------------------------------------------------------
*/
void SAO_on_block_sse256(pel_t *p_dst, int i_dst, pel_t *p_src, int i_src, int i_block_w, int i_block_h,
|