From patchwork Thu Sep 19 14:29:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1164710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509297-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mentor.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="XOa8+4mL"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Yzkw3Bbfz9sPD for ; Fri, 20 Sep 2019 00:29:44 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=cWWa5wcwDfDlAdhIr4phjGcQkUS7H1RsFGHxxgjUH8nYR0wBj+ TpI5jBLO/xys80R/wkJTh+W2KnLXtG1dREUWDLRNoppqoKzMcQa9iNeIEkDNU2bb 036j/jCP+zbpaYJiOP7cBJGXB0gwZ+E3cHXqXSvmMdN07nLNHEAdS/OFU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=bwYu0aZATML4OSfn5d8pBPfgWaU=; b=XOa8+4mLMGZgTvJkA/gr QPKdRB5az49HLnNYpRSdGE1q68ls/Z/5Y8QvJJ6ZTu2plB97CN8aeoIhhkOB2b4X oC0r0+isS55hhVgjthimsW4hhtD9WIKTq+IJT3zlvWWa+gFPayiyuWFJErwyY2OV ZrG3qKebCuqTWRjCR5ywpzs= Received: (qmail 33170 invoked by alias); 19 Sep 2019 14:29:37 -0000 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 Received: (qmail 33162 invoked by uid 89); 19 Sep 2019 14:29:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Sep 2019 14:29:34 +0000 IronPort-SDR: AnXDB4irgpQOr0eSIaMrdby/Y049ugL9vIpS/4RHCKj7i2AvwwYAGuCZRmw8wf7IHYzlEDgcVX T9b4c+Zxd7Up4Tb1gcwG05m3zSobfy0jxBPe5RTQxcv2VYdPhN4tU5oxU2pvg+wuiMgnXQdUqZ sjPCQZnfjR6JpC7do0JetIL8nnfs5/XYA9OtKORJdmWpJtObdD2zuIZEN4rtsjgNKJcuqV2BXn 94rRLxro+szMlmo2TZ2jVe4tPLxHpS1PmDppwrlHArRy6/tBN28pF1XnwSEOUq0x6/Ixl5E+83 +qU= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 19 Sep 2019 06:29:33 -0800 IronPort-SDR: JdYczw5kHNg9mx6KbhoCo3NO3ojMFKmzxNCJ2jezPmeD3GSrpiaxo/RTs2v+idmDONSLiGj8XP 6uPl8O1HBZGK/eykKfsC4NSdfrBClZLE7fLkxhcxlE89iyXa1phA3LpB5qXCHMtJhSpft/seSV bAcM8tI0gya4r1G9Me81Eg25OQlQ5LKit744H9z2ydchpmeFGH22KTsYHlZL9s4Zpr2+cwRzpx gO9gOvp33iQj/HLv8WgFjib+KMq5aqzM/nFGQpRsSb6qrx64oK22lwLmaLUt/P4pTn0YK3pakq oxQ= To: CC: Thomas Schwinge , Andrew Stubbs From: Tobias Burnus Subject: [Patch,committed][OG9] Update dg-* in to reduce test failures Message-ID: <426d38ef-101d-bbcf-7ba0-626514a7b32f@mentor.com> Date: Thu, 19 Sep 2019 16:29:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Hi all, the gfortran.dg/goacc/kernels-decompose-1.f95 change is just "note:" to "optimized:". It reduces the fails a bit – but I still see some XPASS and FAIL, which I haven't checked. The other two files have an additional output which looks OK and, hence, has been added to the expected result: "optimized: beginning .parloops. region in OpenACC .kernels. construct". Cheers, Tobias commit e74aaa153d846fe852b6be202258daa46f48a900 Author: Tobias Burnus Date: Thu Sep 19 15:57:08 2019 +0200 Reduce testsuite fails gcc/testsuite/ 2019-09-19 Tobias Burnus * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Add one dg-message for additional -fopt-info-optimized-omp output. * gfortran.dg/goacc/classify-kernels.f95: Likewise. * gfortran.dg/goacc/kernels-decompose-1.f95: Change 'note' to 'optimized' in dg-message. diff --git a/gcc/testsuite/ChangeLog.openacc b/gcc/testsuite/ChangeLog.openacc index 6faedb6866a..5f452e64a93 100644 --- a/gcc/testsuite/ChangeLog.openacc +++ b/gcc/testsuite/ChangeLog.openacc @@ -1,3 +1,11 @@ +2019-09-19 Tobias Burnus + + * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Add + one dg-message for additional -fopt-info-optimized-omp output. + * gfortran.dg/goacc/classify-kernels.f95: Likewise. + * gfortran.dg/goacc/kernels-decompose-1.f95: Change 'note' to + 'optimized' in dg-message. + 2019-09-17 Julian Brown * c-c++-common/goacc/classify-kernels-unparallelized.c: Update expected diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 index 6e4001b4f9b..6411f481064 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 @@ -21,6 +21,7 @@ program main !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } + ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 23 } c(i) = a(f (i)) + b(f (i)) end do !$acc end kernels diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 index a0a5fd93bbc..8ee3e3d54aa 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 @@ -17,6 +17,7 @@ program main !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 19 } c(i) = a(i) + b(i) end do !$acc end kernels diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95 index 8173c3651e1..073b963f50d 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95 @@ -24,7 +24,7 @@ program main integer :: a(N), b(N), c(N) !$acc kernels - x = 0 ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" } + x = 0 ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } y = 0 y_l = x < 10 z = x @@ -32,67 +32,67 @@ program main ; !$acc end kernels - !$acc kernels ! { dg-message "note: assigned OpenACC gang loop parallelism" } - do i = 1, N ! { dg-message "note: beginning .parloops. region in OpenACC .kernels. construct" } + !$acc kernels ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + do i = 1, N ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } a(i) = 0 end do !$acc end kernels - !$acc kernels loop ! { dg-message "note: assigned OpenACC gang loop parallelism" } - ! { dg-message "note: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } + !$acc kernels loop ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } do i = 1, N b(i) = a(N - i + 1) end do !$acc kernels - !$acc loop ! { dg-message "note: assigned OpenACC gang loop parallelism" } - ! { dg-message "note: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } + !$acc loop ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } do i = 1, N b(i) = a(N - i + 1) end do - !$acc loop ! { dg-message "note: assigned OpenACC gang loop parallelism" } - ! { dg-message "note: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } + !$acc loop ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } do i = 1, N c(i) = a(i) * b(i) end do - a(z) = 0 ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" } + a(z) = 0 ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } - !$acc loop ! { dg-message "note: assigned OpenACC gang loop parallelism" } - ! { dg-message "note: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } + !$acc loop ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } do i = 1, N c(i) = c(i) + a(i) end do - !$acc loop seq ! { dg-message "note: assigned OpenACC seq loop parallelism" } - ! { dg-message "note: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } + !$acc loop seq ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } + ! { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } do i = 1 + 1, N c(i) = c(i) + c(i - 1) end do !$acc end kernels - !$acc kernels ! { dg-bogus "note: assigned OpenACC seq loop parallelism" "TODO" { xfail *-*-* } } - !$acc loop independent ! { dg-message "note: assigned OpenACC gang loop parallelism" } - ! { dg-message "note: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } + !$acc kernels ! { dg-bogus "optimized: assigned OpenACC seq loop parallelism" "TODO" { xfail *-*-* } } + !$acc loop independent ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } do i = 1, N - !$acc loop independent ! { dg-message "note: assigned OpenACC worker loop parallelism" } + !$acc loop independent ! { dg-message "optimized: assigned OpenACC worker loop parallelism" } do j = 1, N - !$acc loop independent ! { dg-message "note: assigned OpenACC seq loop parallelism" "TODO" { xfail *-*-* } } + !$acc loop independent ! { dg-message "optimized: assigned OpenACC seq loop parallelism" "TODO" { xfail *-*-* } } ! { dg-warning "insufficient partitioning available to parallelize loop" "TODO" { xfail *-*-* } .-1 } - ! { dg-bogus "note: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } .-2 } + ! { dg-bogus "optimized: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } .-2 } do k = 1, N a(1 + mod(i + j + k, N)) & = b(j) & - + f_v (c(k)) ! { dg-message "note: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } .-1 } + + f_v (c(k)) ! { dg-message "optimized: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } .-1 } end do end do end do !TODO Should the following turn into "gang-single" instead of "parloops"? !TODO The problem is that the first STMT is "if (y <= 4) goto ; else goto ;", thus "parloops". - if (y < 5) then ! { dg-message "note: beginning .parloops. region in OpenACC .kernels. construct" } - !$acc loop independent ! { dg-message "note: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" } + if (y < 5) then ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } + !$acc loop independent ! { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" } do j = 1, N b(j) = f_w (c(j)) end do @@ -102,30 +102,30 @@ program main !$acc kernels !TODO This refers to the "gang-single" "f_g" call. ! { dg-warning "region contains gang partitoned code but is not gang partitioned" "TODO" { xfail *-*-* } .-2 } - ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" "" { target *-*-* } .+1 } - y = f_g (a(5)) ! { dg-message "note: assigned OpenACC gang worker vector loop parallelism" "TODO" { xfail *-*-* } } + ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" "" { target *-*-* } .+1 } + y = f_g (a(5)) ! { dg-message "optimized: assigned OpenACC gang worker vector loop parallelism" "TODO" { xfail *-*-* } } - !$acc loop independent ! { dg-message "note: assigned OpenACC gang loop parallelism" "TODO" { xfail *-*-* } } - ! { dg-message "note: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } - ! { dg-bogus "note: assigned OpenACC gang vector loop parallelism" "TODO" { xfail *-*-* } .-2 } + !$acc loop independent ! { dg-message "optimized: assigned OpenACC gang loop parallelism" "TODO" { xfail *-*-* } } + ! { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } + ! { dg-bogus "optimized: assigned OpenACC gang vector loop parallelism" "TODO" { xfail *-*-* } .-2 } do j = 1, N - b(j) = y + f_w (c(j)) ! { dg-message "note: assigned OpenACC worker vector loop parallelism" "TODO" { xfail *-*-* } } + b(j) = y + f_w (c(j)) ! { dg-message "optimized: assigned OpenACC worker vector loop parallelism" "TODO" { xfail *-*-* } } end do !$acc end kernels !$acc kernels - y = 3 ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" } + y = 3 ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } - !$acc loop independent ! { dg-message "note: assigned OpenACC gang worker loop parallelism" "TODO" { xfail *-*-* } } - ! { dg-message "note: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } - ! { dg-bogus "note: assigned OpenACC gang vector loop parallelism" "TODO" { xfail *-*-* } .-2 } + !$acc loop independent ! { dg-message "optimized: assigned OpenACC gang worker loop parallelism" "TODO" { xfail *-*-* } } + ! { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } + ! { dg-bogus "optimized: assigned OpenACC gang vector loop parallelism" "TODO" { xfail *-*-* } .-2 } do j = 1, N - b(j) = y + f_v (c(j)) ! { dg-message "note: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } } + b(j) = y + f_v (c(j)) ! { dg-message "optimized: assigned OpenACC vector loop parallelism" "TODO" { xfail *-*-* } } end do - z = 2 ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" } + z = 2 ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } !$acc end kernels - !$acc kernels ! { dg-message "note: beginning .gang-single. region in OpenACC .kernels. construct" } + !$acc kernels ! { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } !$acc end kernels end program main