From patchwork Tue Apr 30 07:29:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 1929343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cebitec.uni-bielefeld.de header.i=@cebitec.uni-bielefeld.de header.a=rsa-sha256 header.s=20200306 header.b=AGJ1gPNq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VTBfP0NJmz23hd for ; Tue, 30 Apr 2024 17:29:33 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 411CE3858D35 for ; Tue, 30 Apr 2024 07:29:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id 11CC53858D35 for ; Tue, 30 Apr 2024 07:29:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11CC53858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cebitec.uni-bielefeld.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11CC53858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=129.70.160.84 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714462153; cv=none; b=OEOP+2aoHHOrQk7V1GzWhN2m5ggl2UE3iYRy/2cmt8q3Te9Hz64CBTWFtb3bGxh3lqfxHL8NAyYI3Gi0FQHX8RaVN7pt5rDvW1eAtSoDH3k4nHh00cdVeql1x55CnE9tGrdGRzvqKiKzSoiUgm2AAqcajC5IF9ozeeW4rwzsd0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714462153; c=relaxed/simple; bh=k2GMDRIjAv4WgObBUaNhvsNOz0cq48IQuyCItSraj1c=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=oMPMXlmOMJ9BOFAsyAkVQVEeUVjzVoosZFHvMOuE9Ls5kq+MwpvXaONjqpTO7MMTlCALlemR3UszaWY1hBLeoNHSBd8wIxWxr+3wetVNaadA3en/yZA8X+2RbcHoqJLI3ys/U2kQxeJzW+nJSZrvjsMZnuiRQdmVf+ZTET46iSE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 2A888AAD48; Tue, 30 Apr 2024 09:29:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= cebitec.uni-bielefeld.de; h=content-type:content-type :mime-version:user-agent:message-id:date:date:subject:subject :from:from:received:received; s=20200306; t=1714462148; bh=k2GMD RIjAv4WgObBUaNhvsNOz0cq48IQuyCItSraj1c=; b=AGJ1gPNqjZXoObd8cuZwj W0WLpW+q/TXDmYgacKG9XCjaoYj870qEYN0sGwmYtViDZehlxIcbr0ceowO5OPt3 Ufg6oPZrOyjQrHfx8Ssx6Ex/NPGjSqYBHsakEbxVxcMcmwC7aAhcddKUf7bHxp/7 YSGutSE6+beCUkKmeagl56733bugxs7Ood4SWuduSbIImSc8+UxF8uwaN1OgFc9h WbopdL/OtN6HmO4GnmTOkCOEqeJz5f0QHRUqXXPGhvsemhIGt3Ue7s+rfdDD+H1d TITrKUrXlJufdqDBKU/khAtczmiYJMhEVpn62hz+xFulmeDyfmzEFr8vywZE5M5d Q== X-Virus-Scanned: amavisd-new at cebitec.uni-bielefeld.de Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1fL8uk7m-sfx; Tue, 30 Apr 2024 09:29:08 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p4fddbd87.dip0.t-ipconnect.de [79.221.189.135]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 71E7EAABC0; Tue, 30 Apr 2024 09:29:08 +0200 (CEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Gaius Mulley Subject: [PATCH] testsuite: gm2: Remove timeout overrides [PR114886] Date: Tue, 30 Apr 2024 09:29:07 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 X-Spam-Status: No, score=-3789.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org A large number of gm2 tests are timing out even on current Solaris/SPARC systems. As detailed in the PR, the problem is that the gm2 testsuite artificially lowers many timeouts way below the DejaGnu default of 300 seconds, often as short as 10 seconds. The problem lies both in the values (they may be appropriate for some targets, but too low for others, especially under high load) and the fact that it uses absolute values, overriding e.g. settings from a build-wide site.exp. Therefore this patch removes all those overrides, restoring the defaults. Tested on sparc-sun-solaris2.11 (where all the previous timeouts are gone) and i386-pc-solaris2.11. Ok for trunk and the gcc-14 branch once GCC 14.1.0 has been released? Rainer # HG changeset patch # Parent 7ce0689744625483e581866918724503e5630773 testsuite: gm2: Remove timeout overrides [PR114886] diff --git a/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp b/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp --- a/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp +++ b/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp @@ -24,16 +24,11 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -load_lib timeout-dg.exp set gm2src ${srcdir}/../gm2 gm2_init_cor "" -# We should be able to compile, link or run in 20 seconds. -gm2_push_timeout 20 - - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -42,5 +37,3 @@ foreach testcase [lsort [glob -nocomplai gm2-torture-execute $testcase "" "pass" } - -gm2_pop_timeout diff --git a/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp b/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp --- a/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp +++ b/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp @@ -27,9 +27,6 @@ load_lib gm2-torture.exp gm2_init_pim "${srcdir}/${subdir}" -# We should be able to compile, link or run in 30 seconds. -gm2_push_timeout 30 - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -38,5 +35,3 @@ foreach testcase [lsort [glob -nocomplai gm2-torture $testcase } - -gm2_pop_timeout diff --git a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp --- a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp +++ b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp @@ -23,14 +23,10 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -load_lib timeout-dg.exp gm2_init_iso "${srcdir}/gm2/iso/run/pass" -fsoft-check-all gm2_link_obj fileio.o -# We should be able to compile, link or run in 60 seconds. -gm2_push_timeout 60 - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -42,5 +38,3 @@ foreach testcase [lsort [glob -nocomplai gm2-torture-execute $testcase "" "pass" } } - -gm2_pop_timeout diff --git a/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp b/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp --- a/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp +++ b/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp @@ -24,15 +24,11 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -load_lib timeout-dg.exp set gm2src ${srcdir}/../m2 gm2_init_pim "" -# We should be able to compile, link or run in 60 seconds. -gm2_push_timeout 60 - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -41,5 +37,3 @@ foreach testcase [lsort [glob -nocomplai gm2-torture-execute $testcase "" "pass" } - -gm2_pop_timeout diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp --- a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp +++ b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp @@ -29,11 +29,6 @@ set gm2src ${srcdir}/../m2 gm2_init_iso "" -# We should be able to compile, link or run in 45 seconds even on a -# really slow host/target. - -gm2_push_timeout 45 - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -42,5 +37,3 @@ foreach testcase [lsort [glob -nocomplai gm2-torture-execute $testcase "" "pass" } - -gm2_pop_timeout diff --git a/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp b/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp --- a/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp +++ b/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp @@ -23,10 +23,8 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -load_lib timeout-dg.exp gm2_init_pim "${srcdir}/gm2/switches/whole-program/run/pass" -fm2-whole-program -gm2_push_timeout 120 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. @@ -35,5 +33,3 @@ foreach testcase [lsort [glob -nocomplai } gm2-torture $testcase } - -gm2_pop_timeout diff --git a/gcc/testsuite/lib/gm2-torture.exp b/gcc/testsuite/lib/gm2-torture.exp --- a/gcc/testsuite/lib/gm2-torture.exp +++ b/gcc/testsuite/lib/gm2-torture.exp @@ -21,34 +21,6 @@ load_lib file-format.exp load_lib target-libpath.exp load_lib timeout.exp -load_lib timeout-dg.exp - - -if {[info exists individual_timeout]} { - set gm2_previous_timeout $individual_timeout -} else { - set gm2_previous_timeout 10 -} - - -# We should be able to complete any test in 10 seconds. -dg-timeout S 10 - - -# only push one level. - -proc gm2_push_timeout { secs } { - global individual_timeout - set individual_timeout $secs -} - - -proc gm2_pop_timeout { } { - global individual_timeout - global gm2_previous_timeout - set individual_timeout $gm2_previous_timeout -} - # The default option list can be overridden by # TORTURE_OPTIONS="{ { list1 } ... { listN } }" diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp --- a/gcc/testsuite/lib/gm2.exp +++ b/gcc/testsuite/lib/gm2.exp @@ -23,36 +23,6 @@ load_lib prune.exp load_lib gcc-defs.exp load_lib target-libpath.exp load_lib timeout.exp -load_lib timeout-dg.exp - - -if {[info exists individual_timeout]} { - set gm2_previous_timeout $individual_timeout -} else { - set gm2_previous_timeout 10 -} - - -# set gm2_previous_timeout $individual_timeout - -# We should be able to complete any test in 10 seconds. -dg-timeout S 10 - - -# only push one level. - -proc gm2_push_timeout { secs } { - global individual_timeout - set individual_timeout $secs -} - - -proc gm2_pop_timeout { } { - global individual_timeout - global gm2_previous_timeout - set individual_timeout $gm2_previous_timeout -} - # # GCC_UNDER_TEST is the compiler under test. @@ -167,10 +137,6 @@ proc gm2_init { args } { set gm2_link_path "[gm2_link_flags [get_multilibs]]" verbose $gm2_link_path 1 - - # Set the default timeout value, larger tests can override - # this if necessary. - dg-timeout S 10 }