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
|
From 00ef2c8062a7f7d7265d933676fb5cc60f1ea659 Mon Sep 17 00:00:00 2001
From: Daniel Bermond <danielbermond@yahoo.com>
Date: Tue, 20 Nov 2018 16:54:25 +0000
Subject: [PATCH] Make AVX symbols to be strictly visible (fix build with gcc8)
_mm256_insertf128_si256 and _mm256_castsi128_si256 are undeclared
in the scope of source/common/vec/intrinsic.h, which seems to be
strictly not permitted by gcc8.
Fixes #9
---
source/common/vec/intrinsic_deblock_avx2.cc | 5 ++---
source/common/vec/intrinsic_idct_avx2.cc | 6 +++---
source/common/vec/intrinsic_inter_pred.cc | 6 +++---
source/common/vec/intrinsic_inter_pred_avx2.cc | 7 ++++---
source/common/vec/intrinsic_intra-pred_avx2.cc | 6 +++---
source/common/vec/intrinsic_pixel_avx.cc | 6 +++---
source/common/vec/intrinsic_sao_avx2.cc | 6 +++---
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/source/common/vec/intrinsic_deblock_avx2.cc b/source/common/vec/intrinsic_deblock_avx2.cc
index b87e472..ca9534e 100644
--- a/source/common/vec/intrinsic_deblock_avx2.cc
+++ b/source/common/vec/intrinsic_deblock_avx2.cc
@@ -30,15 +30,14 @@
* 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 !HIGH_BIT_DEPTH
__m128i c_0_128;
diff --git a/source/common/vec/intrinsic_idct_avx2.cc b/source/common/vec/intrinsic_idct_avx2.cc
index 0b40fde..ee5384d 100644
--- a/source/common/vec/intrinsic_idct_avx2.cc
+++ b/source/common/vec/intrinsic_idct_avx2.cc
@@ -30,15 +30,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"
+
/* disable warnings */
#pragma warning(disable:4127) // warning C4127: 条件表达式是常量
diff --git a/source/common/vec/intrinsic_inter_pred.cc b/source/common/vec/intrinsic_inter_pred.cc
index 46c0da8..55ff6a0 100644
--- a/source/common/vec/intrinsic_inter_pred.cc
+++ b/source/common/vec/intrinsic_inter_pred.cc
@@ -30,15 +30,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 !HIGH_BIT_DEPTH
/* ---------------------------------------------------------------------------
*/
diff --git a/source/common/vec/intrinsic_inter_pred_avx2.cc b/source/common/vec/intrinsic_inter_pred_avx2.cc
index 6f35771..05f6957 100644
--- a/source/common/vec/intrinsic_inter_pred_avx2.cc
+++ b/source/common/vec/intrinsic_inter_pred_avx2.cc
@@ -30,14 +30,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"
+
#pragma warning(disable:4127) // warning C4127: 条件表达式是常量
#if !HIGH_BIT_DEPTH
diff --git a/source/common/vec/intrinsic_intra-pred_avx2.cc b/source/common/vec/intrinsic_intra-pred_avx2.cc
index 6440929..1357bdb 100644
--- a/source/common/vec/intrinsic_intra-pred_avx2.cc
+++ b/source/common/vec/intrinsic_intra-pred_avx2.cc
@@ -30,15 +30,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 !HIGH_BIT_DEPTH
void intra_pred_ver_avx(pel_t *src, pel_t *dst, int i_dst, int dir_mode, int bsx, int bsy)
diff --git a/source/common/vec/intrinsic_pixel_avx.cc b/source/common/vec/intrinsic_pixel_avx.cc
index 813a36f..fba7e46 100644
--- a/source/common/vec/intrinsic_pixel_avx.cc
+++ b/source/common/vec/intrinsic_pixel_avx.cc
@@ -30,15 +30,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"
+
/* ---------------------------------------------------------------------------
*/
void *davs2_memzero_aligned_c_avx(void *dst, size_t n)
diff --git a/source/common/vec/intrinsic_sao_avx2.cc b/source/common/vec/intrinsic_sao_avx2.cc
index 11be4d3..bb0c4aa 100644
--- a/source/common/vec/intrinsic_sao_avx2.cc
+++ b/source/common/vec/intrinsic_sao_avx2.cc
@@ -30,15 +30,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 !HIGH_BIT_DEPTH
#ifdef _MSC_VER
#pragma warning(disable:4244) // TODO: 修正编译warning
|