diff options
author | eschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a> | 2014-03-26 17:23:04 +0000 |
---|---|---|
committer | eschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a> | 2014-03-26 17:23:04 +0000 |
commit | a282d6add9e220c8a896e8c1bd03e8ed0469fa0e (patch) | |
tree | ac74ba22d00aad07800fd589d1cafe4a44a15cf1 | |
parent | 8dd8f3f9b516fa7aa726bb94bc67bd8105c77afc (diff) |
Don't use designated initializers
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@98 105869f7-3296-0410-a4ea-f4349344b45a
-rw-r--r-- | src/vectors-4-AVX.h | 36 | ||||
-rw-r--r-- | src/vectors-8-AVX.h | 20 | ||||
-rw-r--r-- | src/vectors-8-SSE2.h | 2 |
3 files changed, 29 insertions, 29 deletions
diff --git a/src/vectors-4-AVX.h b/src/vectors-4-AVX.h index bdfbabf..edd54cf 100644 --- a/src/vectors-4-AVX.h +++ b/src/vectors-4-AVX.h @@ -260,27 +260,27 @@ void vec4_store_nta_partial_(bool const all, __m256i const mask, // Masks indicating which vector element should be stored: static k4const_t const k4store_lo[9] = { - { .i= { 0, 0, 0, 0, 0, 0, 0, 0, }}, - { .i= { ~0, 0, 0, 0, 0, 0, 0, 0, }}, - { .i= { ~0, ~0, 0, 0, 0, 0, 0, 0, }}, - { .i= { ~0, ~0, ~0, 0, 0, 0, 0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, 0, 0, 0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, ~0, 0, 0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, ~0, ~0, 0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, ~0, ~0, ~0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, 0, 0, 0, 0, 0, }}, + {{ ~0, 0, 0, 0, 0, 0, 0, 0, }}, + {{ ~0, ~0, 0, 0, 0, 0, 0, 0, }}, + {{ ~0, ~0, ~0, 0, 0, 0, 0, 0, }}, + {{ ~0, ~0, ~0, ~0, 0, 0, 0, 0, }}, + {{ ~0, ~0, ~0, ~0, ~0, 0, 0, 0, }}, + {{ ~0, ~0, ~0, ~0, ~0, ~0, 0, 0, }}, + {{ ~0, ~0, ~0, ~0, ~0, ~0, ~0, 0, }}, + {{ ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, }; static k4const_t const k4store_hi[9] = { - { .i= { 0, 0, 0, 0, 0, 0, 0, 0, }}, - { .i= { 0, 0, 0, 0, 0, 0, 0, ~0, }}, - { .i= { 0, 0, 0, 0, 0, 0, ~0, ~0, }}, - { .i= { 0, 0, 0, 0, 0, ~0, ~0, ~0, }}, - { .i= { 0, 0, 0, 0, ~0, ~0, ~0, ~0, }}, - { .i= { 0, 0, 0, ~0, ~0, ~0, ~0, ~0, }}, - { .i= { 0, 0, ~0, ~0, ~0, ~0, ~0, ~0, }}, - { .i= { 0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, - { .i= { ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, 0, 0, 0, 0, 0, }}, + {{ 0, 0, 0, 0, 0, 0, 0, ~0, }}, + {{ 0, 0, 0, 0, 0, 0, ~0, ~0, }}, + {{ 0, 0, 0, 0, 0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, 0, ~0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, ~0, ~0, ~0, ~0, ~0, }}, + {{ 0, 0, ~0, ~0, ~0, ~0, ~0, ~0, }}, + {{ 0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, + {{ ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, }}, }; #if !defined(__INTEL_COMPILER) && defined(__GNUC__) && __GNUC__==4 && __GNUC_MINOR__<=4 // gcc 4.4 uses a wrong prototype for _mm256_maskstore_ps diff --git a/src/vectors-8-AVX.h b/src/vectors-8-AVX.h index a955f41..68dcd4e 100644 --- a/src/vectors-8-AVX.h +++ b/src/vectors-8-AVX.h @@ -253,19 +253,19 @@ void vec8_store_nta_partial_(bool const all, __m256i const mask, // Masks indicating which vector element should be stored: /*static*/ k8const_t const k8store_lo[5] = { - { .i= { 0, 0, 0, 0, }}, - { .i= { ~0, 0, 0, 0, }}, - { .i= { ~0, ~0, 0, 0, }}, - { .i= { ~0, ~0, ~0, 0, }}, - { .i= { ~0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, 0, }}, + {{ ~0, 0, 0, 0, }}, + {{ ~0, ~0, 0, 0, }}, + {{ ~0, ~0, ~0, 0, }}, + {{ ~0, ~0, ~0, ~0, }}, }; /*static*/ k8const_t const k8store_hi[5] = { - { .i= { 0, 0, 0, 0, }}, - { .i= { 0, 0, 0, ~0, }}, - { .i= { 0, 0, ~0, ~0, }}, - { .i= { 0, ~0, ~0, ~0, }}, - { .i= { ~0, ~0, ~0, ~0, }}, + {{ 0, 0, 0, 0, }}, + {{ 0, 0, 0, ~0, }}, + {{ 0, 0, ~0, ~0, }}, + {{ 0, ~0, ~0, ~0, }}, + {{ ~0, ~0, ~0, ~0, }}, }; #if !defined(__INTEL_COMPILER) && defined(__GNUC__) && __GNUC__==4 && __GNUC_MINOR__<=4 // gcc 4.4 uses a wrong prototype for _mm256_maskstore_pd diff --git a/src/vectors-8-SSE2.h b/src/vectors-8-SSE2.h index 96c687c..1c145a5 100644 --- a/src/vectors-8-SSE2.h +++ b/src/vectors-8-SSE2.h @@ -754,7 +754,7 @@ CCTK_REAL8_VEC k8ifthen(CCTK_BOOLEAN8_VEC const x, #elif 0 // We don't need to shift -- the condition (mask) will be either all // zeros or all ones - k8const_t const k8ione = { .i= { 1, 1, }}; + k8const_t const k8ione = {{ 1, 1, }}; // there is no _mm_srai_epi64(x, 63); we therefore calculate srli(x)-1 __m128i const x_int = *(__m128i const*)&x; __m128i const imask_int = _mm_sub_epi64(_mm_srli_epi64(x_int, 63), k8ione.vi); |