[rs6000] Fix compilation issue on power7 from r235577

Message ID	573F58E3.7010204@linux.vnet.ibm.com
State	New
Headers	show Return-Path: <gcc-patches-return-427936-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=eBlQtxmrb13Jikt6 kwpBs19iLwiDrzJpQY/UF6CXcST0NOr/ezSCNQ6blY882xhDu//xYmlEkBMHrs/3 szEztLgzm6Cv8a6TfaM7yt3cS5mELWm3IJrpmpuhtFvzPjsWRGdCaPxMeyPM8R6a ECROt/UyDRPMTbpvlHTHVcMUzDM= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Gateway: Authorized Use Only! Violators will be prosecuted for <gcc-patches@gcc.gnu.org> from <seurer@linux.vnet.ibm.com>; Fri, 20 May 2016 12:35:22 -0600 Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 May 2016 12:35:19 -0600 To: GCC Patches <gcc-patches@gcc.gnu.org> Cc: David Edelsohn <dje.gcc@gmail.com>, Segher Boessenkool <segher@kernel.crashing.org> From: Bill Seurer <seurer@linux.vnet.ibm.com> Subject: [PATCH, rs6000] Fix compilation issue on power7 from r235577 Message-ID: <573F58E3.7010204@linux.vnet.ibm.com> Date: Fri, 20 May 2016 13:35:15 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit

Index: /home/seurer/gcc/gcc-checkin2/gcc/config/rs6000/rs6000-c.c =================================================================== --- /home/seurer/gcc/gcc-checkin2/gcc/config/rs6000/rs6000-c.c (revision 236518) +++ /home/seurer/gcc/gcc-checkin2/gcc/config/rs6000/rs6000-c.c (working copy) @@ -4622,37 +4622,41 @@ assignment for unaligned loads and stores"); /* All 3 arguments must be vectors of (signed or unsigned) (int or __int128) and the types must match. */ if ((arg0_type != arg1_type) || (arg1_type != arg2_type)) - goto bad; + goto bad; if (TREE_CODE (arg0_type) != VECTOR_TYPE) - goto bad; + goto bad; switch (TYPE_MODE (TREE_TYPE (arg0_type))) { - /* For {un}signed ints, - vec_adde (va, vb, carryv) == vec_add (vec_add (va, vb), - vec_and (carryv, 0x1)). */ + /* For {un}signed ints, + vec_adde (va, vb, carryv) == vec_add (vec_add (va, vb), + vec_and (carryv, 0x1)). */ case SImode: { - vec<tree, va_gc> *params = make_tree_vector(); + vec<tree, va_gc> *params = make_tree_vector (); vec_safe_push (params, arg0); vec_safe_push (params, arg1); - tree call = altivec_resolve_overloaded_builtin - (loc, rs6000_builtin_decls[ALTIVEC_BUILTIN_VEC_ADD], params); - tree const1 = build_vector_from_val (arg0_type, - build_int_cstu(TREE_TYPE (arg0_type), 1)); - tree and_expr = fold_build2_loc (loc, BIT_AND_EXPR, - arg0_type, arg2, const1); - params = make_tree_vector(); + tree add_builtin = rs6000_builtin_decls[ALTIVEC_BUILTIN_VEC_ADD]; + tree call = altivec_resolve_overloaded_builtin (loc, add_builtin, + params); + tree const1 = build_int_cstu (TREE_TYPE (arg0_type), 1); + tree ones_vector = build_vector_from_val (arg0_type, const1); + tree and_expr = fold_build2_loc (loc, BIT_AND_EXPR, arg0_type, + arg2, ones_vector); + params = make_tree_vector (); vec_safe_push (params, call); vec_safe_push (params, and_expr); - return altivec_resolve_overloaded_builtin - (loc, rs6000_builtin_decls[ALTIVEC_BUILTIN_VEC_ADD], params); + return altivec_resolve_overloaded_builtin (loc, add_builtin, + params); } /* For {un}signed __int128s use the vaddeuqm instruction directly. */ case TImode: - return altivec_resolve_overloaded_builtin - (loc, rs6000_builtin_decls[P8V_BUILTIN_VEC_VADDEUQM], arglist); + { + tree adde_bii = rs6000_builtin_decls[P8V_BUILTIN_VEC_VADDEUQM]; + return altivec_resolve_overloaded_builtin (loc, adde_bii, + arglist); + } /* Types other than {un}signed int and {un}signed __int128 are errors. */ @@ -4839,9 +4843,9 @@ assignment for unaligned loads and stores"); arg1_type = TREE_TYPE (arg1); if (TREE_CODE (arg1_type) != VECTOR_TYPE) - goto bad; + goto bad; if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2))) - goto bad; + goto bad; /* If we are targeting little-endian, but -maltivec=be has been specified to override the element order, adjust the element @@ -4942,9 +4946,9 @@ assignment for unaligned loads and stores"); arg2 = (*arglist)[2]; if (TREE_CODE (arg1_type) != VECTOR_TYPE) - goto bad; + goto bad; if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2))) - goto bad; + goto bad; /* If we are targeting little-endian, but -maltivec=be has been specified to override the element order, adjust the element Index: /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde-int128.c =================================================================== --- /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde-int128.c (revision 236518) +++ /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde-int128.c (working copy) @@ -1,7 +1,9 @@ -/* { dg-do run { target { powerpc64-*-* } } } */ +/* { dg-do run { target { powerpc64*-*-* } } } */ +/* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ /* { dg-options "-mcpu=power8 -O3" } */ + /* Test that the vec_adde builtin works as expected. */ #include "altivec.h" @@ -20,38 +22,43 @@ STYPE expected_##NAMESUFFIX[N]; \ \ __attribute__((noinline)) void vector_tests_##NAMESUFFIX () \ { \ + vector STYPE v1, v2, v3, tmp; \ int i; \ - vector STYPE v1, v2, v3, tmp; \ - for (i = 0; i < N; i+=16/sizeof(STYPE)) { \ - /* result=addend1+addend2+(carry & 0x1) */ \ - v1 = (vector STYPE) { addend1_##NAMESUFFIX[i] }; \ - v2 = (vector STYPE) { addend2_##NAMESUFFIX[i] }; \ - v3 = (vector STYPE) { carry_##NAMESUFFIX[i] }; \ + for (i = 0; i < N; i+=16/sizeof (STYPE)) \ + { \ + /* result=addend1+addend2+(carry & 0x1). */ \ + v1 = (vector STYPE) { addend1_##NAMESUFFIX[i] }; \ + v2 = (vector STYPE) { addend2_##NAMESUFFIX[i] }; \ + v3 = (vector STYPE) { carry_##NAMESUFFIX[i] }; \ \ - tmp = vec_adde (v1, v2, v3); \ - result_##NAMESUFFIX[i] = tmp[0]; \ - } \ + tmp = vec_adde (v1, v2, v3); \ + result_##NAMESUFFIX[i] = tmp[0]; \ + } \ } \ \ __attribute__((noinline)) void init_##NAMESUFFIX () \ { \ int i; \ - for (i = 0; i < N; ++i) { \ - result_##NAMESUFFIX[i] = 0; \ - addend1_##NAMESUFFIX[i] = 1; \ - addend2_##NAMESUFFIX[i] = 2; \ - carry_##NAMESUFFIX[i] = (i%12); \ - expected_##NAMESUFFIX[i] = addend1_##NAMESUFFIX[i] + \ - addend2_##NAMESUFFIX[i] + (carry_##NAMESUFFIX[i] & 0x1); \ - } \ + for (i = 0; i < N; ++i) \ + { \ + result_##NAMESUFFIX[i] = 0; \ + addend1_##NAMESUFFIX[i] = 1; \ + addend2_##NAMESUFFIX[i] = 2; \ + carry_##NAMESUFFIX[i] = (i%12); \ + expected_##NAMESUFFIX[i] = addend1_##NAMESUFFIX[i] + \ + addend2_##NAMESUFFIX[i] + \ + (carry_##NAMESUFFIX[i] & 0x1); \ + } \ } \ \ __attribute__((noinline)) void verify_results_##NAMESUFFIX () \ { \ - for (int i = 0; i < N; ++i) { \ - if (result_##NAMESUFFIX[i] != expected_##NAMESUFFIX[i]) \ - abort(); \ - } \ + int i; \ + for (i = 0; i < N; ++i) \ + { \ + if (result_##NAMESUFFIX[i] != expected_##NAMESUFFIX[i]) \ + abort (); \ + } \ } @@ -63,13 +70,13 @@ __attribute__((noinline)) void verify_results_##NA } -define_test_functions(signed __int128, si128); -define_test_functions(unsigned __int128, ui128); +define_test_functions (signed __int128, si128); +define_test_functions (unsigned __int128, ui128); int main () { - execute_test_functions(signed __int128, si128); - execute_test_functions(unsigned __int128, ui128); + execute_test_functions (signed __int128, si128); + execute_test_functions (unsigned __int128, ui128); return 0; } Index: /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde.c =================================================================== --- /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde.c (revision 236518) +++ /home/seurer/gcc/gcc-checkin2/gcc/testsuite/gcc.target/powerpc/vec-adde.c (working copy) @@ -1,6 +1,6 @@ -/* { dg-do run { target { powerpc64-*-* } } } */ -/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */ -/* { dg-options "-mcpu=power8 -O3" } */ +/* { dg-do run { target { powerpc64*-*-* } } } */ +/* { dg-require-effective-target powerpc_vsx_ok } */ +/* { dg-options "-mvsx -O3" } */ /* Test that the vec_adde builtin works as expected. */ @@ -20,38 +20,43 @@ STYPE expected_##NAMESUFFIX[N]; \ \ __attribute__((noinline)) void vector_tests_##NAMESUFFIX () \ { \ + vector STYPE v1, v2, v3, tmp; \ int i; \ - vector STYPE v1, v2, v3, tmp; \ - for (i = 0; i < N; i+=16/sizeof(STYPE)) { \ - /* result=addend1+addend2+(carry & 0x1) */ \ - v1 = vec_vsx_ld (0, &addend1_##NAMESUFFIX[i]); \ - v2 = vec_vsx_ld (0, &addend2_##NAMESUFFIX[i]); \ - v3 = vec_vsx_ld (0, &carry_##NAMESUFFIX[i]); \ + for (i = 0; i < N; i+=16/sizeof (STYPE)) \ + { \ + /* result=addend1+addend2+(carry & 0x1). */ \ + v1 = vec_vsx_ld (0, &addend1_##NAMESUFFIX[i]); \ + v2 = vec_vsx_ld (0, &addend2_##NAMESUFFIX[i]); \ + v3 = vec_vsx_ld (0, &carry_##NAMESUFFIX[i]); \ \ - tmp = vec_adde (v1, v2, v3); \ - vec_vsx_st (tmp, 0, &result_##NAMESUFFIX[i]); \ - } \ + tmp = vec_adde (v1, v2, v3); \ + vec_vsx_st (tmp, 0, &result_##NAMESUFFIX[i]); \ + } \ } \ \ __attribute__((noinline)) void init_##NAMESUFFIX () \ { \ int i; \ - for (i = 0; i < N; ++i) { \ - result_##NAMESUFFIX[i] = 0; \ - addend1_##NAMESUFFIX[i] = 1; \ - addend2_##NAMESUFFIX[i] = 2; \ - carry_##NAMESUFFIX[i] = (i%12); \ - expected_##NAMESUFFIX[i] = addend1_##NAMESUFFIX[i] + \ - addend2_##NAMESUFFIX[i] + (carry_##NAMESUFFIX[i] & 0x1); \ - } \ + for (i = 0; i < N; ++i) \ + { \ + result_##NAMESUFFIX[i] = 0; \ + addend1_##NAMESUFFIX[i] = 1; \ + addend2_##NAMESUFFIX[i] = 2; \ + carry_##NAMESUFFIX[i] = (i%12); \ + expected_##NAMESUFFIX[i] = addend1_##NAMESUFFIX[i] + \ + addend2_##NAMESUFFIX[i] + \ + (carry_##NAMESUFFIX[i] & 0x1); \ + } \ } \ \ __attribute__((noinline)) void verify_results_##NAMESUFFIX () \ { \ - for (int i = 0; i < N; ++i) { \ - if (result_##NAMESUFFIX[i] != expected_##NAMESUFFIX[i]) \ - abort(); \ - } \ + int i; \ + for (i = 0; i < N; ++i) \ + { \ + if (result_##NAMESUFFIX[i] != expected_##NAMESUFFIX[i]) \ + abort (); \ + } \ } @@ -63,13 +68,13 @@ __attribute__((noinline)) void verify_results_##NA } -define_test_functions(signed int, si); -define_test_functions(unsigned int, ui); +define_test_functions (signed int, si); +define_test_functions (unsigned int, ui); int main () { - execute_test_functions(signed int, si); - execute_test_functions(unsigned int, ui); + execute_test_functions (signed int, si); + execute_test_functions (unsigned int, ui); return 0; }

[rs6000] Fix compilation issue on power7 from r235577

Commit Message

Comments

Patch