From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id EE17B398B164 for ; Wed, 11 Nov 2020 15:16:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EE17B398B164 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-390-7c7pE0uFP12bqazxBIu-Sw-1; Wed, 11 Nov 2020 10:16:48 -0500 X-MC-Unique: 7c7pE0uFP12bqazxBIu-Sw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CBED6D240; Wed, 11 Nov 2020 15:16:47 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-113-127.ams2.redhat.com [10.36.113.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F22815B4A7; Wed, 11 Nov 2020 15:16:46 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.16.1/8.16.1) with ESMTPS id 0ABFGh6l3772485 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 11 Nov 2020 16:16:44 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.16.1/8.16.1/Submit) id 0ABFGgpT3772484; Wed, 11 Nov 2020 16:16:42 +0100 Date: Wed, 11 Nov 2020 16:16:42 +0100 From: Jakub Jelinek To: Thomas Schwinge Cc: Tobias Burnus , gcc-patches , fortran Subject: [committed] testsuite: Fix up scan-tree-dump-times regexps for 64-bit targets Message-ID: <20201111151642.GO3788@tucnak> Reply-To: Jakub Jelinek References: <50dd6d9f-d646-8475-14a9-da2d283ebbb6@codesourcery.com> <20201110121632.GN3788@tucnak> <3b161baf-e768-77d9-fd41-d2433a944a92@codesourcery.com> <20201110220525.2F581286469B@gskx-2.sc.intel.com> <87v9ecc8qj.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 In-Reply-To: <87v9ecc8qj.fsf@euler.schwinge.homeip.net> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 15:16:53 -0000 On Wed, Nov 11, 2020 at 02:40:20PM +0100, Thomas Schwinge wrote: > On 2020-11-11T09:25:25+0100, Tobias Burnus wrote: > > As Sunil's regression tester pointed out, the testcases fail on x86-64 with -m32. > > > > The reason is that then the _ull_ variants of the GOMP functions are called; > > in the C equivalent, those are always called – I assume that's because the C > > testcase uses 'unsigned' which does not exist with Fortran. > > > > Committed as r11-4903-g1644ab9917ca6b96e9e683c422f1793258b9a3db > > I'm confirming this fixes things for '-m32' -- but it also broke '-m64'. > ;-) The added (?:_ull) match on 32-bit targets, but are equivalent to just adding _ull into the strings, i.e. require the _ull substrings, while the intent is that they are optional, so we should use (?:_ull)? instead. Tested on x86_64-linux with -m32/-m64, committed to trunk. 2020-11-11 Jakub Jelinek * gfortran.dg/gomp/workshare-reduction-3.f90: Use (?:_ull)? instead of (?:_ull) in the scan-tree-dump-times directives. * gfortran.dg/gomp/workshare-reduction-26.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-27.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-28.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-36.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-37.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-38.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-39.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-40.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-41.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-42.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-43.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-44.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-45.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-46.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-47.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-56.f90: Likewise. * gfortran.dg/gomp/workshare-reduction-57.f90: Likewise. --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-26.f90 2020-11-11 16:08:18.865674174 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 0, 0, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 0, 0, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_maybe_nonmonotonic_runtime_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_maybe_nonmonotonic_runtime_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-28.f90 2020-11-11 16:08:18.871674108 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 4, 0, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 4, 0, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_runtime_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-44.f90 2020-11-11 16:08:18.895673844 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 3, 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 3, 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-57.f90 2020-11-11 16:08:18.907673712 +0100 @@ -1,10 +1,10 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_doacross_start \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_doacross_start \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_post " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_wait " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)?_post " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)?_wait " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-43.f90 2020-11-11 16:08:18.893673866 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, (?:2147483651|-2147483645), 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, (?:2147483651|-2147483645), 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-56.f90 2020-11-11 16:08:18.904673745 +0100 @@ -1,10 +1,10 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_doacross_start \[^\n\r]*, (?:2147483649|-2147483647), 0, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_doacross_start \[^\n\r]*, (?:2147483649|-2147483647), 0, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_post " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)_wait " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_static_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)?_post " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_doacross(?:_ull)?_wait " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_static_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-39.f90 2020-11-11 16:08:18.881673998 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 2, 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 2, 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-36.f90 2020-11-11 16:08:18.873674086 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 2, 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 2, 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-47.f90 2020-11-11 16:08:18.902673767 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 3, 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 3, 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-38.f90 2020-11-11 16:08:18.878674031 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 2, 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 2, 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-46.f90 2020-11-11 16:08:18.900673789 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, (?:2147483651|-2147483645), 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, (?:2147483651|-2147483645), 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-27.f90 2020-11-11 16:08:18.868674141 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, (?:2147483648|-2147483648), 0, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, (?:2147483648|-2147483648), 0, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_runtime_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_runtime_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-40.f90 2020-11-11 16:08:18.885673954 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, (?:2147483650|-2147483646), 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, (?:2147483650|-2147483646), 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-37.f90 2020-11-11 16:08:18.876674053 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, (?:2147483650|-2147483646), 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-41.f90 2020-11-11 16:08:18.888673921 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 2, 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 2, 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_dynamic_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_dynamic_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-42.f90 2020-11-11 16:08:18.890673899 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 3, 1, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 3, 1, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-45.f90 2020-11-11 16:08:18.898673811 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 3, 3, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 3, 3, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_guided_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_guided_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } --- gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90.jj 2020-11-11 14:11:07.924006064 +0100 +++ gcc/testsuite/gfortran.dg/gomp/workshare-reduction-3.f90 2020-11-11 16:08:18.883673976 +0100 @@ -1,8 +1,8 @@ ! { dg-do compile } ! { dg-options "-O2 -fopenmp -fdump-tree-optimized" } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_start \[^\n\r]*, 4, 0, " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_start \[^\n\r]*, 4, 0, " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop_end " 1 "optimized" } } -! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)_nonmonotonic_runtime_next " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "__builtin_GOMP_loop(?:_ull)?_nonmonotonic_runtime_next " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_workshare_task_reduction_unregister \\(0\\)" 1 "optimized" } } ! { dg-final { scan-tree-dump-times "__builtin_GOMP_parallel " 1 "optimized" } } Jakub