On 6 November 2013 08:04, Jakub Jelinek <ja...@redhat.com> wrote: > On Wed, Nov 06, 2013 at 02:24:01AM +0000, Iyer, Balaji V wrote: >> Fixed patch is attached. The responses to your question are given below. >> Is this patch OK? >> >> Here is the ChangeLog entry: >> >> +2013-11-05 Balaji V. Iyer <balaji.v.i...@intel.com> >> + >> + * c-c++-common/cilk-plus/CK/fib.c: Reduced the iteration from >> + 40 to 30. Replaced iteration variable with a #define. Instead of >> + returning non-zero value for error, called __builtin_abort (). Fixed >> + a bug of calling fib_serial in serial case instead of fib. >> + * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Likewise. >> + * c-c++-common/cilk-plus/CK/fib_no_return.c: Likewise. >> + * c-c++-common/cilk-plus/CK/fib_no_sync.c: Likewise. >> + * gcc.dg/cilk-plus/cilk-plus.exp: Removed duplicate/un-necessary >> + compiler flag testing. > > Ok. Balaji, May i suggest you rephrase the .exp so it does not line-wrap and is actually readable like in attached (untested) 01 or at least 00?
Thanks for your consideration..
Index: gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp =================================================================== --- gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (revision 204561) +++ gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (working copy) @@ -25,31 +25,34 @@ verbose "$tool $libdir" 1 set library_var [get_multilibs] -# Pointing the ld_library_path to the Cilk Runtime library binaries. +# Pointing the ld_library_path to the Cilk Runtime library binaries. set ld_library_path "${library_var}/libcilkrts/.libs" set ALWAYS_CFLAGS "" lappend ALWAYS_CFLAGS "-L${library_var}/libcilkrts/.libs" dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O2 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O3 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O2 -ftree-vectorize -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O2 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g -fcilkplus $ALWAYS_CFLAGS " " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " " +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] +dg-runtest $tests " -fcilkplus" " " +dg-runtest $tests " -O1 -fcilkplus" " " +dg-runtest $tests " -O2 -fcilkplus" " " +dg-runtest $tests " -O3 -fcilkplus" " " +dg-runtest $tests " -g -fcilkplus" " " +dg-runtest $tests " -g -O2 -ftree-vectorize -fcilkplus" " " +dg-runtest $tests " -fcilkplus -std=c99" " " +dg-runtest $tests " -fcilkplus -O2 -std=c99" " " +dg-runtest $tests " -fcilkplus -O3 -std=c99" " " +dg-runtest $tests " -fcilkplus -g -O0 -std=c99" " " +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] +dg-runtest $tests " -g -fcilkplus $ALWAYS_CFLAGS " " " +dg-runtest $tests " -O1 -fcilkplus $ALWAYS_CFLAGS" " " +dg-runtest $tests " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" " " +dg-runtest $tests " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" " " +dg-runtest $tests " -O3 -g -fcilkplus $ALWAYS_CFLAGS" " " +dg-runtest $tests " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " " + dg-finish
Index: gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp =================================================================== --- gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (revision 204561) +++ gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp (working copy) @@ -25,31 +25,40 @@ verbose "$tool $libdir" 1 set library_var [get_multilibs] -# Pointing the ld_library_path to the Cilk Runtime library binaries. +# Pointing the ld_library_path to the Cilk Runtime library binaries. set ld_library_path "${library_var}/libcilkrts/.libs" set ALWAYS_CFLAGS "" lappend ALWAYS_CFLAGS "-L${library_var}/libcilkrts/.libs" dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O2 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O3 -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O2 -ftree-vectorize -fcilkplus" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O2 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g -fcilkplus $ALWAYS_CFLAGS " " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus $ALWAYS_CFLAGS" " " -dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " " +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] +for flags [list \ + " -fcilkplus" \ + " -O1 -fcilkplus" \ + " -O2 -fcilkplus" \ + " -O3 -fcilkplus" \ + " -g -fcilkplus" \ + " -g -O2 -ftree-vectorize -fcilkplus" \ + " -fcilkplus -std=c99" \ + " -fcilkplus -O2 -std=c99" \ + " -fcilkplus -O3 -std=c99" \ + " -fcilkplus -g -O0 -std=c99" \ + ] { + dg-runtest $tests "$flags" " " +} +set tests [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] +for flags [list \ + " -g -fcilkplus $ALWAYS_CFLAGS " \ + " -O1 -fcilkplus $ALWAYS_CFLAGS" \ + " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" \ + " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" \ + " -O3 -g -fcilkplus $ALWAYS_CFLAGS" \ + " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" \ + ] { + dg-runtest $tests "$flags" " " +} - dg-finish