generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change intrinsic code in isac fix to let it pass chrome clang compiler.

Browse Source 
Compiler complains about variables not initialized in instructions veor_s32() and vset_lane_s32().
Review URL: https://webrtc-codereview.appspot.com/1187006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3660 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org
2013-03-12 17:45:41 +00:00
parent 23875c1694
commit d6cd64ac6a
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c
View File

@@ -43,6 +43,8 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
} }
int32x4_t shift32x4 = vdupq_n_s32(shift); int32x4_t shift32x4 = vdupq_n_s32(shift);
int32x2_t shift32x2 = vdup_n_s32(shift); int32x2_t shift32x2 = vdup_n_s32(shift);
int32x4_t sum_32x4 = vdupq_n_s32(0);
int32x2_t sum_32x2 = vdup_n_s32(0);
assert(inner_loop_count % 2 == 0); assert(inner_loop_count % 2 == 0);
assert(mid_loop_count % 2 == 0); assert(mid_loop_count % 2 == 0);
@@ -51,8 +53,7 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
for (j = 0; j < SUBFRAMES; j++) { for (j = 0; j < SUBFRAMES; j++) {
matrix_prod_index = mid_loop_count * j; matrix_prod_index = mid_loop_count * j;
for (k = 0; k < (mid_loop_count >> 2) << 2; k += 4) { for (k = 0; k < (mid_loop_count >> 2) << 2; k += 4) {
// Initialize sum_32x4 to zeros. sum_32x4 = veorq_s32(sum_32x4, sum_32x4); // Initialize to zeros.
int32x4_t sum_32x4 = veorq_s32(sum_32x4, sum_32x4);
matrix1_index = k; matrix1_index = k;
matrix0_index = matrix0_index_factor1 * j; matrix0_index = matrix0_index_factor1 * j;
for (n = 0; n < inner_loop_count; n++) { for (n = 0; n < inner_loop_count; n++) {
@@ -69,8 +70,7 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
matrix_prod_index += 4; matrix_prod_index += 4;
} }
if (mid_loop_count % 4 > 1) { if (mid_loop_count % 4 > 1) {
// Initialize sum_32x2 to zeros. sum_32x2 = veor_s32(sum_32x2, sum_32x2); // Initialize to zeros.
int32x2_t sum_32x2 = veor_s32(sum_32x2, sum_32x2);
matrix1_index = k; matrix1_index = k;
k += 2; k += 2;
matrix0_index = matrix0_index_factor1 * j; matrix0_index = matrix0_index_factor1 * j;
@@ -90,11 +90,12 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
} }
} }
else if (matrix1_index_init_case == 0 && matrix0_index_factor1 == 1) { else if (matrix1_index_init_case == 0 && matrix0_index_factor1 == 1) {
int32x2_t multi_32x2 = vdup_n_s32(0);
int32x2_t matrix0_32x2 = vdup_n_s32(0);
for (j = 0; j < SUBFRAMES; j++) { for (j = 0; j < SUBFRAMES; j++) {
matrix_prod_index = mid_loop_count * j; matrix_prod_index = mid_loop_count * j;
for (k = 0; k < (mid_loop_count >> 2) << 2; k += 4) { for (k = 0; k < (mid_loop_count >> 2) << 2; k += 4) {
// Initialize sum_32x4 to zeros. sum_32x4 = veorq_s32(sum_32x4, sum_32x4); // Initialize to zeros.
int32x4_t sum_32x4 = veorq_s32(sum_32x4, sum_32x4);
matrix1_index = matrix1_index_factor1 * j; matrix1_index = matrix1_index_factor1 * j;
matrix0_index = k; matrix0_index = k;
for (n = 0; n < inner_loop_count; n++) { for (n = 0; n < inner_loop_count; n++) {
@@ -110,14 +111,12 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
matrix_prod_index += 4; matrix_prod_index += 4;
} }
if (mid_loop_count % 4 > 1) { if (mid_loop_count % 4 > 1) {
// Initialize sum_32x2 to zeros. sum_32x2 = veor_s32(sum_32x2, sum_32x2); // Initialize to zeros.
int32x2_t sum_32x2 = veor_s32(sum_32x2, sum_32x2);
matrix1_index = matrix1_index_factor1 * j; matrix1_index = matrix1_index_factor1 * j;
matrix0_index = k; matrix0_index = k;
for (n = 0; n < inner_loop_count; n++) { for (n = 0; n < inner_loop_count; n++) {
int32x2_t multi_32x2;
int32x2_t matrix1_32x2 = vdup_n_s32(matrix1[matrix1_index] << shift); int32x2_t matrix1_32x2 = vdup_n_s32(matrix1[matrix1_index] << shift);
int32x2_t matrix0_32x2 = matrix0_32x2 =
vset_lane_s32((int32_t)matrix0[matrix0_index], matrix0_32x2, 0); vset_lane_s32((int32_t)matrix0[matrix0_index], matrix0_32x2, 0);
matrix0_32x2 = vset_lane_s32((int32_t)matrix0[matrix0_index + 1], matrix0_32x2 = vset_lane_s32((int32_t)matrix0[matrix0_index + 1],
matrix0_32x2, 1); matrix0_32x2, 1);
@@ -135,12 +134,12 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
else if (matrix1_index_init_case == 0 && else if (matrix1_index_init_case == 0 &&
matrix1_index_step == 1 && matrix1_index_step == 1 &&
matrix0_index_step == 1) { matrix0_index_step == 1) {
int32x2_t multi_32x2 = vdup_n_s32(0);
int32x2_t matrix0_32x2 = vdup_n_s32(0);
for (j = 0; j < SUBFRAMES; j++) { for (j = 0; j < SUBFRAMES; j++) {
matrix_prod_index = mid_loop_count * j; matrix_prod_index = mid_loop_count * j;
for (k = 0; k < mid_loop_count; k++) { for (k = 0; k < mid_loop_count; k++) {
int32x2_t sum_32x2; sum_32x4 = veorq_s32(sum_32x4, sum_32x4); // Initialize to zeros.
// Initialize sum_32x4 to zeros.
int32x4_t sum_32x4 = veorq_s32(sum_32x4, sum_32x4);
matrix1_index = matrix1_index_factor1 * j; matrix1_index = matrix1_index_factor1 * j;
matrix0_index = matrix0_index_factor1 * k; matrix0_index = matrix0_index_factor1 * k;
for (n = 0; n < (inner_loop_count >> 2) << 2; n += 4) { for (n = 0; n < (inner_loop_count >> 2) << 2; n += 4) {
@@ -155,10 +154,9 @@ void WebRtcIsacfix_MatrixProduct1Neon(const int16_t matrix0[],
} }
sum_32x2 = vqadd_s32(vget_low_s32(sum_32x4), vget_high_s32(sum_32x4)); sum_32x2 = vqadd_s32(vget_low_s32(sum_32x4), vget_high_s32(sum_32x4));
if (inner_loop_count % 4 > 1) { if (inner_loop_count % 4 > 1) {
int32x2_t multi_32x2;
int32x2_t matrix1_32x2 = int32x2_t matrix1_32x2 =
vshl_s32(vld1_s32(&matrix1[matrix1_index]), shift32x2); vshl_s32(vld1_s32(&matrix1[matrix1_index]), shift32x2);
int32x2_t matrix0_32x2 = matrix0_32x2 =
vset_lane_s32((int32_t)matrix0[matrix0_index], matrix0_32x2, 0); vset_lane_s32((int32_t)matrix0[matrix0_index], matrix0_32x2, 0);
matrix0_32x2 = vset_lane_s32((int32_t)matrix0[matrix0_index + 1], matrix0_32x2 = vset_lane_s32((int32_t)matrix0[matrix0_index + 1],
matrix0_32x2, 1); matrix0_32x2, 1);
@@ -199,9 +197,9 @@ void WebRtcIsacfix_MatrixProduct2Neon(const int16_t matrix0[],
const int matrix0_index_step) { const int matrix0_index_step) {
int j = 0, n = 0; int j = 0, n = 0;
int matrix1_index = 0, matrix0_index = 0, matrix_prod_index = 0; int matrix1_index = 0, matrix0_index = 0, matrix_prod_index = 0;
int32x2_t sum_32x2 = vdup_n_s32(0);
for (j = 0; j < SUBFRAMES; j++) { for (j = 0; j < SUBFRAMES; j++) {
// Initialize sum_32x2 to zeros. sum_32x2 = veor_s32(sum_32x2, sum_32x2); // Initialize to zeros.
int32x2_t sum_32x2 = veor_s32(sum_32x2, sum_32x2);
matrix1_index = 0; matrix1_index = 0;
matrix0_index = matrix0_index_factor * j; matrix0_index = matrix0_index_factor * j;
for (n = SUBFRAMES; n > 0; n--) { for (n = SUBFRAMES; n > 0; n--) {