Commit 687bdebe authored by Raymond Knopp's avatar Raymond Knopp

Merge branch 'Monti/openairinterface5g-fix-x86_64' into develop-aarch64build

parents 813a21e5 a28bd74b
...@@ -1905,7 +1905,7 @@ void prec2A_TM4_128(int pmi,__m128i *ch0,__m128i *ch1) { ...@@ -1905,7 +1905,7 @@ void prec2A_TM4_128(int pmi,__m128i *ch0,__m128i *ch1) {
// print_shorts("prec2A_TM4 ch0 (end):",ch0); // print_shorts("prec2A_TM4 ch0 (end):",ch0);
//print_shorts("prec2A_TM4 ch1 (end):",ch1); //print_shorts("prec2A_TM4 ch1 (end):",ch1);
} }
#elsif defined(__arm__) || defined(__aarch64__) #elif defined(__arm__) || defined(__aarch64__)
void prec2A_TM4_128(int pmi,int16x8_t *ch0,int16x8_t *ch1) { void prec2A_TM4_128(int pmi,int16x8_t *ch0,int16x8_t *ch1) {
AssertFatal(1==0,"To be done for ARM\n"); AssertFatal(1==0,"To be done for ARM\n");
} }
...@@ -3454,7 +3454,7 @@ void dlsch_detection_mrc_TM34(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -3454,7 +3454,7 @@ void dlsch_detection_mrc_TM34(LTE_DL_FRAME_PARMS *frame_parms,
_mm_empty(); _mm_empty();
_m_empty(); _m_empty();
#elsif defined(__arm__) || defined(__aarch64__) #elif defined(__arm__) || defined(__aarch64__)
AssertFatal(1==0,"To be done for ARM\n"); AssertFatal(1==0,"To be done for ARM\n");
#endif #endif
} }
......
...@@ -1036,7 +1036,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms, ...@@ -1036,7 +1036,7 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
} }
_mm_empty(); _mm_empty();
_m_empty(); _m_empty();
#elsif defined(__arm__) || defined(__aarch64__) #elif defined(__arm__) || defined(__aarch64__)
AssertFatal(1==0,"To be done for ARM\n"); AssertFatal(1==0,"To be done for ARM\n");
#endif #endif
} }
...@@ -1362,7 +1362,7 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -1362,7 +1362,7 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
_mm_empty(); _mm_empty();
_m_empty(); _m_empty();
#elsif defined(__arm__) || defined(__aarch64__) #elif defined(__arm__) || defined(__aarch64__)
AssertFatal(1==0,"To be done for ARM\n"); AssertFatal(1==0,"To be done for ARM\n");
#endif #endif
} }
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
#define simd_q15_t __m128i #define simd_q15_t __m128i
#define simd_q31_t __m128i #define simd_q31_t __m128i
#define simd_q63_t __m128i #define simd_q63_t __m128i
#define simd_q15_short_t __m64i #define simd_q15_short_t __m64
#define simd_q15_add(a,b) _mm_adds_epi16(a,b) #define simd_q15_add(a,b) _mm_adds_epi16(a,b)
#define simd_q63_add(a,b) _mm_add_epi64(a,b) #define simd_q63_add(a,b) _mm_add_epi64(a,b)
#define simd_q15_sub(a,b) _mm_subs_epi16(a,b) #define simd_q15_sub(a,b) _mm_subs_epi16(a,b)
#define simd_q63_sub(a,b) _mm_subs_epi64(a,b) #define simd_q63_sub(a,b) _mm_sub_epi64(a,b)
#define simd_q15_add_short(a,b) _mm_adds_pi16(a,b) #define simd_q15_add_short(a,b) _mm_adds_pi16(a,b)
#define simd_q31_add(a,b) _mm_adds_epi32(a,b) #define simd_q31_add(a,b) _mm_add_epi32(a,b)
#ifdef __AVX2__ #ifdef __AVX2__
#define simd256_q15_t __m256i #define simd256_q15_t __m256i
#endif #endif
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
extern void print_shorts(char *s,__m128i *x); extern void print_shorts(char *s,__m128i *x);
#elsif defined (__arm__) || defined(__aarch64__) #elif defined (__arm__) || defined(__aarch64__)
extern void print_shorts(char *s,int16x8_t *x); extern void print_shorts(char *s,int16x8_t *x);
#endif #endif
void fill_channel_desc(channel_desc_t *chan_desc, void fill_channel_desc(channel_desc_t *chan_desc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment