From patchwork Thu May 24 22:32:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 161230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 22973B6FA5 for ; Fri, 25 May 2012 08:33:22 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1338503603; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Received:Received:To:Subject:Message-Id:Date: From:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=rK+BTdF J4vyfIq4DKovZFAaB7po=; b=nsTu+p0JZAFcPPdV3shpT931491gOEEp12ClW4E QgbrAb1hDiK2p64TO0HnsUAXsspfZhtfYqCBqhUPccoB6CvNs5vOOrsOMGrNDhmw Lj6nT5cK6z2JlxNja7qZW6wTt/aYRQhytjEwp6Pjv0fCD7ts0jTlsKEXeoMhE8LY dwiY= 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-Google-DKIM-Signature:Received:Received:Received:Received:Received:To:Subject:Message-Id:Date:From:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=AdgJr7t/xHmokcJNa+BLsb2CQP2DUiQdvUG1ZnApEB5ZWeygpP3WlGZ9sj5Tim 6bpRTXsDqX8UfuJDyQlk7GQswiq4MhFeQL70Z23Z5RvI1aPQsRuYwXvEJqMo6Qbk pYCFX4WhMewIU4vP3Fr4OrwKqxID9JBB1UFkdVN2L3I04=; Received: (qmail 24626 invoked by alias); 24 May 2012 22:33:12 -0000 Received: (qmail 24595 invoked by uid 22791); 24 May 2012 22:33:07 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_BJ, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-lb0-f201.google.com (HELO mail-lb0-f201.google.com) (209.85.217.201) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 24 May 2012 22:32:49 +0000 Received: by lbdb5 with SMTP id b5so12501lbd.2 for ; Thu, 24 May 2012 15:32:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:message-id:date:from:x-gm-message-state; bh=R+rPw0W85ZbxSM+FmbkXMdrMfl1V+x/tiNmxAyXbQBA=; b=o4zZdg3CIvKjdg1uDr2815mh3aLDasd11hL+9AClw+brD+fCvzvHwQWsPB4nSVJv88 vPdR2/Vf+KkfaSuXFnwOsZm7fGbJtqIV8m1nMkYdAnv5o8uSkKcKw3ecF1YqE48+ZQS5 ZbYd8iv1t8uAY2JvCywWf5Z/MnCmeXZi26Uicc2Zzjub3H4bvafKAPts5GfSb/lUVKGC SfLfZRM2lQDWA15Tv8vfkVGJ1KZIEXVEkDd8YGojdemHFQihVQHnan4wCKCh7e5lp+pP IHBwHlx/vuHd6LXWnmK3RdOHVyjGIXrJLgfyu1UtWVGCNepmbRlOKmIBMGWdTR6A9nVx I3tw== Received: by 10.14.99.75 with SMTP id w51mr387541eef.8.1337898768036; Thu, 24 May 2012 15:32:48 -0700 (PDT) Received: by 10.14.99.75 with SMTP id w51mr387529eef.8.1337898767374; Thu, 24 May 2012 15:32:47 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id u54si142628eeb.2.2012.05.24.15.32.47 (version=TLSv1/SSLv3 cipher=AES128-SHA); Thu, 24 May 2012 15:32:47 -0700 (PDT) Received: from tobiano.tor.corp.google.com (tobiano.tor.corp.google.com [172.29.41.6]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 0DE5C20004E; Thu, 24 May 2012 15:32:47 -0700 (PDT) Received: by tobiano.tor.corp.google.com (Postfix, from userid 54752) id 445C4AE1DF; Thu, 24 May 2012 18:32:46 -0400 (EDT) To: reply@codereview.appspotmail.com, soni.sandeepb@gmail.com, gcc-patches@gcc.gnu.org Subject: [gimplefe] Add dejagnu support for gimple tests (issue6258047) Message-Id: <20120524223246.445C4AE1DF@tobiano.tor.corp.google.com> Date: Thu, 24 May 2012 18:32:46 -0400 (EDT) From: dnovillo@google.com (Diego Novillo) X-Gm-Message-State: ALoCoQl3wNnAt5RlHAHr606Ew47a0YM9sI9lKRRPQ9sLM0/UYBqPgK2Qb1V8mrM0HsL4Enf9vGxZvFl9WO5adjRIMyyn6WGfEl8BqST+dJXFyZarWhwqVTR1NJLZsPlsjL05mINqGczHYAUaHGeUcWiYJi2UN84azg== X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Add basic testsuite support for gimple. Running the gimple testsuite is the same as running any other testsuite. From /gcc, run: $ make check-gimple I have added a single .gimple test which is currently segfaulting the parser. This means that you will get the following output from the testsuite: Running /usr/local/google/home/dnovillo/gimplefe/gimple-front-end/gcc/testsuite/gimple.dg/dg.exp ... FAIL: gimple.dg/20120523-1.gimple -O (internal compiler error) FAIL: gimple.dg/20120523-1.gimple -O (test for excess errors) === gimple Summary === # of unexpected failures 2 I will fix this in a separate patch, shortly. To add gimple tests, simply add .gimple files to the directory testsuite/gimple.dg. You can use all the dejagnu commands described in http://gcc.gnu.org/onlinedocs/gccint/Directives.html. 2012-05-24 Diego Novillo gimple/ChangeLog * Make-lang.in: Add support for check-gimple. testsuite/ChangeLog.gimplefe * gimple.dg/20120523-1.gimple: New. * gimple.dg/dg.exp: New. * lib/gimple-dg.exp: New. * lib/gimple.exp: New. --- This patch is available for review at http://codereview.appspot.com/6258047 diff --git a/gcc/gimple/ChangeLog b/gcc/gimple/ChangeLog index 9bfc69c..fe274ce 100644 --- a/gcc/gimple/ChangeLog +++ b/gcc/gimple/ChangeLog @@ -1,3 +1,7 @@ +2012-05-24 Diego Novillo + + * Make-lang.in: Add support for check-gimple. + 2012-03-23 Diego Novillo * gimple-lang.c (def_builtin_1): Call set_builtin_decl. diff --git a/gcc/gimple/Make-lang.in b/gcc/gimple/Make-lang.in index ed22492..5cab504 100644 --- a/gcc/gimple/Make-lang.in +++ b/gcc/gimple/Make-lang.in @@ -64,6 +64,11 @@ gimple.stage4: gimple.stageprofile: gimple.stagefeedback: +# Testsuite support. +lang_checks += check-gimple +lang_checks_parallelized += check-gimple +check_gimple_parallelize = gimple.exp=* + # GIMPLE rules. # Use strict warnings for this front end. diff --git a/gcc/testsuite/ChangeLog.gimplefe b/gcc/testsuite/ChangeLog.gimplefe new file mode 100644 index 0000000..31b226d --- /dev/null +++ b/gcc/testsuite/ChangeLog.gimplefe @@ -0,0 +1,6 @@ +2012-05-24 Diego Novillo + + * gimple.dg/20120523-1.gimple: New. + * gimple.dg/dg.exp: New. + * lib/gimple-dg.exp: New. + * lib/gimple.exp: New. diff --git a/gcc/testsuite/gimple.dg/20120523-1.gimple b/gcc/testsuite/gimple.dg/20120523-1.gimple new file mode 100644 index 0000000..54c39ac --- /dev/null +++ b/gcc/testsuite/gimple.dg/20120523-1.gimple @@ -0,0 +1,2 @@ +gimple_assign + diff --git a/gcc/testsuite/gimple.dg/dg.exp b/gcc/testsuite/gimple.dg/dg.exp new file mode 100644 index 0000000..54c732f --- /dev/null +++ b/gcc/testsuite/gimple.dg/dg.exp @@ -0,0 +1,39 @@ +# Copyright (C) 2012 Free Software Foundation, Inc. + +# 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 +# . + +# gimple testsuite that uses the `dg.exp' driver. + +# Load support procs. +load_lib gimple-dg.exp + +# If a testcase doesn't have special options, use these. +global DEFAULT_GIMPLEFLAGS +if ![info exists DEFAULT_GIMPLEFLAGS] then { + set DEFAULT_GIMPLEFLAGS "" +} + +# Initialize `dg'. +dg-init + +# Gather a list of all tests, with the exception of those in directories +# that are handled specially. +set tests [lsort [find $srcdir/$subdir *.gimple]] + +# Main loop. +gimple-dg-runtest $tests $DEFAULT_GIMPLEFLAGS + +# All done. +dg-finish diff --git a/gcc/testsuite/lib/gimple-dg.exp b/gcc/testsuite/lib/gimple-dg.exp new file mode 100644 index 0000000..5ee5adb --- /dev/null +++ b/gcc/testsuite/lib/gimple-dg.exp @@ -0,0 +1,51 @@ +# Copyright (C) 1997, 1999, 2000, 2003, 2007 Free Software Foundation, Inc. + +# 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 +# . + +# Define gimple callbacks for dg.exp. + +load_lib gcc-dg.exp + +proc gimple-dg-test { prog do_what extra_tool_flags } { + return [gcc-dg-test-1 gimple_target_compile $prog $do_what $extra_tool_flags] +} + + +proc gimple-dg-prune { system text } { + return [gcc-dg-prune $system $text] +} + +# Modified dg-runtest that runs tests in both C++98 and C++11 modes +# unless they specifically specify one or the other. +proc gimple-dg-runtest { testcases default-extra-flags } { + global runtests + + foreach test $testcases { + # look if this is dg-do-run test, in which case + # we cycle through the option list, otherwise we don't + if [expr [search_for $test "dg-do run"]] { + set option_list $TORTURE_OPTIONS + } else { + set option_list [list { -O } ] + } + + set nshort [file tail [file dirname $test]]/[file tail $test] + + foreach flags $option_list { + verbose "Testing $nshort, $flags" 1 + dg-test $test $flags ${default-extra-flags} + } + } +} diff --git a/gcc/testsuite/lib/gimple.exp b/gcc/testsuite/lib/gimple.exp new file mode 100644 index 0000000..905c237 --- /dev/null +++ b/gcc/testsuite/lib/gimple.exp @@ -0,0 +1,299 @@ +# Copyright (C) 2012 Free Software Foundation, Inc. + +# 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 +# . + +# This file was written by Rob Savoye (rob@cygnus.com) +# Many modifications by Jeffrey Wheat (cassidy@cygnus.com) +# With modifications by Mike Stump . + +# +# gimple support library routines +# +load_lib prune.exp +load_lib gcc-defs.exp +load_lib timeout.exp +load_lib target-libpath.exp + +# +# GIMPLEC_UNDER_TEST is the compiler under test. +# + + +set gimple_compile_options "" + +# +# gimple_version -- extract and print the version number of the compiler +# + +proc gimple_version { } { + global GIMPLEC_UNDER_TEST + + gimple_init + + # ignore any arguments after the command + set compiler [lindex $GIMPLEC_UNDER_TEST 0] + + # verify that the compiler exists + if { [is_remote host] || [which $compiler] != 0 } then { + set tmp [remote_exec host "$compiler -v"] + set status [lindex $tmp 0] + set output [lindex $tmp 1] + regexp " version \[^\n\r\]*" $output version + if { $status == 0 && [info exists version] } then { + if [is_remote host] { + clone_output "$compiler $version\n" + } else { + clone_output "[which $compiler] $version\n" + } + } else { + clone_output "Couldn't determine version of [which $compiler]\n" + } + } else { + # compiler does not exist (this should have already been detected) + warning "$compiler does not exist" + } +} + +# +# gimple_include_flags -- provide new version of gimple_include_flags +# (originally from libgloss.exp) which knows about the gcc tree structure +# +proc gimple_include_flags { paths } { + global srcdir + global TESTING_IN_BUILD_TREE + + set flags "" + + if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { + return "${flags}" + } + + set gccpath ${paths} + + return "$flags" +} + +# +# gimple_link_flags -- provide new version of gimple_link_flags +# (originally from libgloss.exp) which knows about the gcc tree structure +# + +proc gimple_link_flags { paths } { + global srcdir + global ld_library_path + global GIMPLEC_UNDER_TEST + global shlib_ext + + set gccpath ${paths} + set libio_dir "" + set flags "" + set ld_library_path "." + + set shlib_ext [get_shlib_extension] + verbose "shared lib extension: $shlib_ext" + + if { $gccpath != "" } { + if [file exists "${gccpath}/libgimple/libgimple.a"] { + append flags "-L${gccpath}/libgimple " + append ld_library_path ":${gccpath}/libgimple" + } + if [file exists "${gccpath}/libiberty/libiberty.a"] { + append flags "-L${gccpath}/libiberty " + } + append ld_library_path [gcc-set-multilib-library-path $GIMPLEC_UNDER_TEST] + } else { + global tool_root_dir + set libiberty [lookfor_file ${tool_root_dir} libiberty] + if { $libiberty != "" } { + append flags "-L${libiberty} " + } + set librx [lookfor_file ${tool_root_dir} librx] + } + + set_ld_library_path_env_vars + + return "$flags" +} + +# +# gimple_init -- called at the start of each subdir of tests +# + +proc gimple_init { args } { + global subdir + global gimple_initialized + global base_dir + global tmpdir + global libdir + global gluefile wrap_flags + global objdir srcdir + global ALWAYS_GIMPLEFLAGS + global GIMPLEFLAGS + global TOOL_EXECUTABLE TOOL_OPTIONS + global GIMPLEC_UNDER_TEST + global TESTING_IN_BUILD_TREE + global gcc_warning_prefix + global gcc_error_prefix + global TEST_ALWAYS_FLAGS + + # We set LC_ALL and LANG to C so that we get the same error messages as expected. + setenv LC_ALL C + setenv LANG C + + # Many hosts now default to a non-ASCII C locale, however, so + # they can set a charset encoding here if they need. + if { [ishost "*-*-cygwin*"] } { + setenv LC_ALL C.ASCII + setenv LANG C.ASCII + } + + if ![info exists GIMPLEC_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GIMPLEC_UNDER_TEST $TOOL_EXECUTABLE + } else { + if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { + set GIMPLEC_UNDER_TEST [transform gimplec] + } else { + set GIMPLEC_UNDER_TEST [findfile $base_dir/../../xgcc "$base_dir/../../xgcc -B$base_dir/../../" [findfile $base_dir/xgcc "$base_dir/gimple -B$base_dir/" [transform gimplec]]] + } + } + } + + if ![is_remote host] { + if { [which $GIMPLEC_UNDER_TEST] == 0 } then { + perror "GIMPLEC_UNDER_TEST ($GIMPLEC_UNDER_TEST) does not exist" + exit 1 + } + } + if ![info exists tmpdir] { + set tmpdir "/tmp" + } + + if [info exists gluefile] { + unset gluefile + } + + gimple_maybe_build_wrapper "${tmpdir}/gimple-testglue.o" "-fexceptions" + + if {![info exists GIMPLEFLAGS]} { + set GIMPLEFLAGS "" + } + + set ALWAYS_GIMPLEFLAGS "" + + # TEST_ALWAYS_FLAGS are flags that should be passed to every + # compilation command. They are passed first to allow individual + # tests to override them. + if [info exists TEST_ALWAYS_FLAGS] { + lappend ALWAYS_GIMPLEFLAGS "additional_flags=$TEST_ALWAYS_FLAGS" + } + + if ![is_remote host] { + if [info exists TOOL_OPTIONS] { + lappend ALWAYS_GIMPLEFLAGS "additional_flags=[gimple_include_flags [get_multilibs ${TOOL_OPTIONS}] ]" + lappend ALWAYS_GIMPLEFLAGS "ldflags=[gimple_link_flags [get_multilibs ${TOOL_OPTIONS}] ]" + } else { + lappend ALWAYS_GIMPLEFLAGS "additional_flags=[gimple_include_flags [get_multilibs] ]" + lappend ALWAYS_GIMPLEFLAGS "ldflags=[gimple_link_flags [get_multilibs] ]" + } + } + + if [info exists TOOL_OPTIONS] { + lappend ALWAYS_GIMPLEFLAGS "additional_flags=$TOOL_OPTIONS" + } + + # Make sure that lines are not wrapped. That can confuse the + # error-message parsing machinery. + lappend ALWAYS_GIMPLEFLAGS "additional_flags=-fmessage-length=0" + + set gcc_warning_prefix "warning:" + set gcc_error_prefix "error:" + + if { [istarget *-*-darwin*] } { + lappend ALWAYS_GIMPLEFLAGS "ldflags=-multiply_defined suppress" + } + + verbose -log "ALWAYS_GIMPLEFLAGS set to $ALWAYS_GIMPLEFLAGS" + + verbose "gimple is initialized" 3 +} + +# +# gimple_target_compile -- compile a source file +# + +proc gimple_target_compile { source dest type options } { + global tmpdir + global gimple_compile_options + global gluefile wrap_flags + global ALWAYS_GIMPLEFLAGS + global GIMPLEC_UNDER_TEST + + if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { + lappend options "libs=${gluefile}" + lappend options "ldflags=${wrap_flags}" + } + + lappend options "additional_flags=[libio_include_flags]" + lappend options "compiler=$GIMPLEC_UNDER_TEST" + lappend options "timeout=[timeout_value]" + + set options [concat $gimple_compile_options $options] + + set options [concat "$ALWAYS_GIMPLEFLAGS" $options] + + if { [regexp "(^| )-frepo( |$)" $options] && \ + [regexp "\.o(|bj)$" $dest] } then { + regsub "\.o(|bj)$" $dest ".rpo" rponame + exec rm -f $rponame + } + + set options [dg-additional-files-options $options $source] + + set result [target_compile $source $dest $type $options] + + return $result +} + +# +# ${tool}_option_help +# +# Changed "additional" to "extra" because runtest.exp treats --a* as --all. +# +# This shouldn't be necessary at all; it should be entirely redundant with +# --tool_opts, except that --tool_opts currently breaks multilib: see +# http://lists.gnu.org/archive/html/dejagnu/2002-10/msg00007.html + +proc ${tool}_option_help { } { + send_user " --extra_opts,OPTIONS\t\tUse OPTIONS to compile the testcase files. OPTIONS should be comma-separated.\n" +} + +# +# ${tool}_option_proc +# + +proc ${tool}_option_proc { option } { + if [regexp "^--extra_opts," $option] { + global gimple_compile_options + regsub "^--extra_opts," $option "" option + foreach x [split $option ","] { + lappend gimple_compile_options "additional_flags=$x" + } + verbose -log "gimple_compile_options set to $gimple_compile_options" + return 1 + } else { + return 0 + } +}