Merging Cilk Plus to GCC (2 of approximately 22)

Message ID	BF230D13CA30DD48930C31D40993300016C62282@FMSMSX102.amr.corp.intel.com
State	New
Headers	show Return-Path: <gcc-patches-return-326000-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-ExtLoop1:Received:Received:From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=kA76zGfxIwh5zT5Xlpu+Y3nOWRqQAIEseA2Co94os0wcNGghCLBV9EbfVO8Eea z13nXoev0aqBXosGTLssuYO5G7q56hDhlUzkSyhlihSav+aPVtN26Jl90w6KYWcI 85sRVps7bp0Xwt6F0kidO37xs3oRNGqzrJ93FzemOuH88=; From: "Iyer, Balaji V" <balaji.v.iyer@intel.com> To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org> CC: "Aldy Hernandez (aldyh@redhat.com)" <aldyh@redhat.com>, Jeff Law <law@redhat.com>, "rth@redhat.com" <rth@redhat.com> Subject: [PATCH] Merging Cilk Plus to GCC (2 of approximately 22) Date: Wed, 5 Sep 2012 23:05:33 +0000 Message-ID: <BF230D13CA30DD48930C31D40993300016C62282@FMSMSX102.amr.corp.intel.com> Content-Type: multipart/mixed; boundary="_002_BF230D13CA30DD48930C31D40993300016C62282FMSMSX102amrcor_" MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test1.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test1.c new file mode 100644 index 0000000..a33ea3b --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test1.c @@ -0,0 +1,30 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will insert the clone for the function ef_add inside the function + * main (the non-masked version). + */ + +#include <stdlib.h> +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (pentium_4), uniform (x,y)))) My_Type ef_add (My_Type x, My_Type y); + +My_Type vhx2[10]; +int +main (int argc, char **argv) +{ + My_Type vhx[10]; + int ii = 9; + + if (argc == 1) + for (ii = 0; ii < 10; ii++) + vhx[ii] = argc; + + for (ii = 0; ii < 10; ii++) + vhx2[ii] = ef_add(vhx[ii], vhx[ii]); + + for (ii = 0; ii < 10; ii++) + if (vhx2[ii] != (argc + argc)) + abort (); + return 0; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test10.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test10.c new file mode 100644 index 0000000..477369e --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test10.c @@ -0,0 +1,12 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 2 clones of the function below, + * for the pentium4 with sse3 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (pentium_4_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test11.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test11.c new file mode 100644 index 0000000..197064b --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test11.c @@ -0,0 +1,12 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clones of the function below, just mask + * for the pentium4 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), mask, processor (pentium_4_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test12.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test12.c new file mode 100644 index 0000000..1c78356 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test12.c @@ -0,0 +1,12 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clones of the function below, just no mask + * for the pentium4 with sse3 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), nomask, processor (pentium_4_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test7.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test7.c new file mode 100644 index 0000000..6720a8c --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test7.c @@ -0,0 +1,12 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 1 clone of the function below, just one for mask + * for the pentium4 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), mask, processor (pentium_4), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test8.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test8.c new file mode 100644 index 0000000..7f40220 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test8.c @@ -0,0 +1,12 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 1 clone of the function below, just one for nomask + * for the pentium4 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), nomask, processor (pentium_4), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test9.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test9.c new file mode 100644 index 0000000..0a5caf8 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/32bit/test9.c @@ -0,0 +1,12 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 2 clones of the function below, + * for the pentium4 processor. + */ +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (pentium_4), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow.c new file mode 100644 index 0000000..8df372a --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow.c @@ -0,0 +1,15 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 2 clones of the function below, one for mask and one + without the mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + if (x > 0) + return x + y; + else + return (x-y); +} diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow2.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow2.c new file mode 100644 index 0000000..30e710f --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/ctrl_flow2.c @@ -0,0 +1,22 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 2 clones of the function below, one for mask and one + without the mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + if (x > 0) { + if (y > 0) { + return x + y; + } + else + return (x-y); + } + else + return 0; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/switch_stmt.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/switch_stmt.c new file mode 100644 index 0000000..0d9db6f --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/switch_stmt.c @@ -0,0 +1,25 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 2 clones of the function below, one for mask and one + without the mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + switch ((int)x) { + case 0: + case 1: + x = x + 1; + return x+y; + case 2: + y = y + 2; + return x-y; + default: + return 0; + } + return 0; + +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test1.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test1.c new file mode 100644 index 0000000..576821a --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test1.c @@ -0,0 +1,30 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will insert the clone for the function ef_add inside the function + * main (the non-masked version). + */ + +#include <stdlib.h> +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_i7_sse4_2), uniform (x,y)))) My_Type ef_add (My_Type x, My_Type y); + +My_Type vhx2[10]; +int +main (int argc, char **argv) +{ + My_Type vhx[10]; + int ii = 9; + + if (argc == 1) + for (ii = 0; ii < 10; ii++) + vhx[ii] = argc; + + for (ii = 0; ii < 10; ii++) + vhx2[ii] = ef_add(vhx[ii], vhx[ii]); + + for (ii = 0; ii < 10; ii++) + if (vhx2[ii] != (argc + argc)) + abort (); + return 0; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test13.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test13.c new file mode 100644 index 0000000..18c8844 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test13.c @@ -0,0 +1,13 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 2 clones of the function below, + * for the pentium4 with sse3 processor. + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core2_duo_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test14.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test14.c new file mode 100644 index 0000000..f154d49 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test14.c @@ -0,0 +1,14 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 1 clones of the function below, just the mask + * for the pentium4 with sse3 processor. + */ + +#define My_Type float +__attribute__ ((vector(mask, vectorlength(4), processor (core2_duo_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test15.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test15.c new file mode 100644 index 0000000..8a458fc --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test15.c @@ -0,0 +1,14 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 1 clones of the function below, just the mask + * for the pentium4 with sse3 processor. + */ + +#define My_Type float +__attribute__ ((vector(nomask, vectorlength(4), processor (core2_duo_sse3), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test16.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test16.c new file mode 100644 index 0000000..fcfc5c0 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test16.c @@ -0,0 +1,14 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 2 clones of the function below, + * for the pentium4 with sse3 processor. + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_2_duo_sse_4_1), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test17.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test17.c new file mode 100644 index 0000000..847c219 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test17.c @@ -0,0 +1,14 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 2 clones of the function below, + * for the core2_duo with sse 4.1 processor. + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_2_duo_sse_4_1), linear(y), uniform (x), nomask))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test18.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test18.c new file mode 100644 index 0000000..daa1546 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test18.c @@ -0,0 +1,14 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clones of the function below, just mask + * for the core2_duo with sse 4.1 processor. + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_2_duo_sse_4_1), linear(y), mask, uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test2.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test2.c new file mode 100644 index 0000000..a515c53 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test2.c @@ -0,0 +1,14 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 2 clones of the function below, one for mask and one + without the mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test3.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test3.c new file mode 100644 index 0000000..d9e3fe1 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test3.c @@ -0,0 +1,13 @@ + +/* { dg-final { scan-assembler "simdsimd" } } */ +/* This test will create 1 clone of the function below, just one for mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), mask, processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test4.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test4.c new file mode 100644 index 0000000..9aa36cc --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test4.c @@ -0,0 +1,13 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clone of the function below, just one for nomask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), nomask, processor (core_i7_sse4_2), uniform (x,y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test5.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test5.c new file mode 100644 index 0000000..6688980 --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test5.c @@ -0,0 +1,14 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clone of the function below, just one for nomask and + do a linear for y variable + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), nomask, processor (core_i7_sse4_2), uniform (x), linear(y)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test6.c gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test6.c new file mode 100644 index 0000000..4ec317f --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/64bit/test6.c @@ -0,0 +1,13 @@ +/* { dg-final { scan-assembler "simdsimd" } } */ + +/* This test will create 1 clone of the function below, just one for mask + */ + +#define My_Type float +__attribute__ ((vector(vectorlength(4), mask, processor (core_i7_sse4_2), linear(y), uniform (x)))) +My_Type ef_add (My_Type x, My_Type y) + +{ + return x + y; +} + diff --git gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/elem_fn.exp gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/elem_fn.exp new file mode 100644 index 0000000..50a27ba --- /dev/null +++ gcc/testsuite/gcc.dg/cilk-plus/elem_fn_tests/elem_fn.exp @@ -0,0 +1,50 @@ +# Copyright (C) 2012 +# Free Software Foundation, Inc. + +# Contributed by Balaji V. Iyer <balaji.v.iyer@intel.com> +# Intel Corporation. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# <http://www.gnu.org/licenses/>. + + +# Exit immediately if this isn't a x86 target. +if { ![istarget i?86*-*-*] && ![istarget x86_64-*-*] } then { + return +} + +# Load support procs. +load_lib gcc-dg.exp +set tests_32bit [lsort [glob -nocomplain $srcdir/$subdir/32bit/*.\[cS\]]] +set tests_64bit [lsort [glob -nocomplain $srcdir/$subdir/64bit/*.\[cS\]]] + +if { [istarget i?86*-*-*] } then { + +# Main loop. +dg-runtest $tests_32bit " -O3 -ftree-vectorize -fcilkplus" " " +# All done. +dg-finish +} + +# For 64 bit architectures, we can run both 32 bit and 64 bit tests. +if { [istarget x86_64-*-*] } then { + +# Main loop. +dg-runtest $tests_32bit "-m32 -O3 -ftree-vectorize -fcilkplus" " " +# All done. +dg-finish +# Main loop. +dg-runtest $tests_64bit " -O3 -ftree-vectorize -fcilkplus" " " +# All done. +dg-finish +}

Merging Cilk Plus to GCC (2 of approximately 22)

Commit Message

Comments

Patch