From patchwork Mon Oct 14 08:28:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1996716 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=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=mcx15L4b; 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 4XRr440Qdwz1xv6 for ; Mon, 14 Oct 2024 19:29:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 28A10385842A for ; Mon, 14 Oct 2024 08:29:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id A93053858D34 for ; Mon, 14 Oct 2024 08:28:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A93053858D34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A93053858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::435 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728894521; cv=none; b=v7kE0tzfxanEmfvHJnUJ1wBc9YAqdT4ZVMCFFHX+zEq1Sjlw2dM/Gb3qDCIAIIqagzG9K26hTj/kqiIfUUsNewOY2DgJ3iy0/EbpYRHOHqaQQm1hUXvXYDwSF7UmSMe26TIrypyeotrK/+lBlspjyEV+azbdLkSntGwyYZmOb2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728894521; c=relaxed/simple; bh=Zk8Gr00UKTjHrb77Zuh3wajPIBX5wpzcJ+0uhXdaT/E=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Qrbwgq4VQpc1WAiiYxYtulB18+VqgZK1OPhBLRERUcATLlap3ZAc/eoIxUzbjNVKMtBNHf/N+Rvl/uGeam+kgTB9S1SPfOmUMlzjHowqyx72BL2BS2AiBCgRCGUop34Ur+8fOKKyBj6x3mHguWC/ho6xso7MwPSxIr5n+ZnEGKw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-37d473c4bb6so3125789f8f.3 for ; Mon, 14 Oct 2024 01:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1728894509; x=1729499309; darn=gcc.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dwLQ9de2LR7ZZ8+Ze0Y2KwGuHmzZIAFg8/pv6rnMitM=; b=mcx15L4b92Vpymb+Ejj1r+A4JHb8Rrq4wwpqy4iLDPbaS5PcURK39f/xhHh1FGCd85 N1f8UiikC9UDEeh6cOxk3uIjubnPlAx2z1vdCtPW5fCJSwCnU2cePVusdoe0YkS2N/Sf y8sasWZCQFa1Pken4ObuF7qLFVuKiXNVznfzqeHvICJv9oyWlvulDlXsXouIx+5AScNR nhKTITNlNaWhphdflg8SPoY1Z+7f50ACgvETqy78pibxX9vQ2ggA+fUA+jiEV9Oei7Bl k8yBwKG46OqtjhHX0M22VgTpuddEBNkjZlsBaZ4k6NikmHJ9fXhFG2e3XM/tfPZZlsGP dikQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728894509; x=1729499309; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dwLQ9de2LR7ZZ8+Ze0Y2KwGuHmzZIAFg8/pv6rnMitM=; b=qPq3vrUMch1tRZcahPXrjCNkmbm4VkXcRMTEYePCcCgyCML+8a0bfsSCnABiLDANZT us7h9hMw7V/+PO1OlsbxNemRhXUStK/9J2x0Nt4uqs7sZqXzyT2EpBXulgtXBiS0AGXY yaUV54HVLRY2wkkapu+KJw4ex6ANNe3eq4YejNrsVJ9OiTWXC91RdKeynGroOSEoSn7y 4vh+2J++LCkxS+jStpz0E3QkXR7x6FWBsVDBysY1u5n+khy8jcIucsAwr8iyBCZH28df NdXLfqCUhVAvLo/2HW9lmcQ8Ffualrc0WotLOuSrAwsibN9hJofrcMU9cHwixPLz0po0 yijA== X-Forwarded-Encrypted: i=1; AJvYcCUnN7Yp0tzKRHaGQd20bqYLl2yyKIe/zLD0CvEWi3gf0gLim8W+Ye0LKRqGFsD33N8XzIkT1bDZJxIL1g==@gcc.gnu.org X-Gm-Message-State: AOJu0YyNZ95EsSP2zdlVCvGEemWXPyLmeSPDiIDw0PJDY6EjhK7NYFTi r64Z/meu0/Pj+nAVGtPCb4zN1vqRG38NMBU+MTWgtJzX7vDvydHtZ4mMJXQKcSY= X-Google-Smtp-Source: AGHT+IHZjM0m6C/vAO9CoQZuwh1k1eiHYAnzqCmNh52n8GRVzVlWi8PvauU2Y5NNqjsecRR8crMsGg== X-Received: by 2002:a5d:5c87:0:b0:37d:6ba5:af1c with SMTP id ffacd0b85a97d-37d6ba5b135mr2788041f8f.2.1728894509308; Mon, 14 Oct 2024 01:28:29 -0700 (PDT) Received: from euler.schwinge.ddns.net (p200300c8b733b9005e8fc6f38b6af531.dip0.t-ipconnect.de. [2003:c8:b733:b900:5e8f:c6f3:8b6a:f531]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d4b6a891csm10736141f8f.13.2024.10.14.01.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 01:28:28 -0700 (PDT) From: Thomas Schwinge To: Tobias Burnus , gcc-patches@gcc.gnu.org Cc: fortran@gcc.gnu.org, Jakub Jelinek Subject: Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Fix effective-target keyword in 'libgomp.oacc-fortran/acc_on_device-2.f90' In-Reply-To: <87jzeb8543.fsf@euler.schwinge.ddns.net> References: <27b9bc80-8a5a-43c1-a528-04cdf08a1bf7@baylibre.com> <26fba4a3-a601-40a7-95d9-d9178de6ec52@baylibre.com> <7ad21f30-cdc4-4842-bd6c-2f845fc4dd74@baylibre.com> <87jzeb8543.fsf@euler.schwinge.ddns.net> User-Agent: Notmuch/0.30+8~g47a4bad (https://notmuchmail.org) Emacs/29.4 (x86_64-pc-linux-gnu) Date: Mon, 14 Oct 2024 10:28:21 +0200 Message-ID: <87h69f84wq.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 Hi! On 2024-10-14T10:23:56+0200, I wrote: > On 2024-10-13T10:21:01+0200, Tobias Burnus wrote: >> Now pushed as r15-4298-g3269a722b7a036. >>>>> Tested on x86-64 without and with offloading configured, running >>>>> with nvptx offloading. I see an UNRESOLVED: +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O scan-tree-dump-not optimized "acc_on_device" +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O scan-tree-dump-times gimple "acc_on_device" 1 +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 -foffload=disable -O (test for excess errors) +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O at line 37 (test for warnings, line 36) +UNRESOLVED: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O scan-nvptx-none-offload-tree-dump-not optimized "acc_on_device" +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O scan-tree-dump-not optimized "acc_on_device" +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O scan-tree-dump-times gimple "acc_on_device" 1 +PASS: libgomp.oacc-fortran/acc_on_device-2.f90 -DACC_DEVICE_TYPE_nvidia=1 -DACC_MEM_SHARED=0 -foffload=nvptx-none -O (test for excess errors) >> --- /dev/null >> +++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 >> @@ -0,0 +1,40 @@ >> +! { dg-do link } >> + >> +! Check whether 'acc_on_device()' is properly compile-time optimized. */ >> + >> +! { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" } >> +! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } } >> + >> +! { dg-final { scan-tree-dump-times "acc_on_device" 1 "gimple" } } >> + >> +! { dg-final { scan-tree-dump-not "acc_on_device" "optimized" } } >> + >> +! { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump-not "acc_on_device" "optimized" { target offload_target_amdgcn } } } >> +! { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump-not "acc_on_device" "optimized" { target offload_target_nvptx } } } Pushed to trunk branch commit c3774b2e2d7d00ad9f9f6fce10aa6bc872bd951f "Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Fix effective-target keyword in 'libgomp.oacc-fortran/acc_on_device-2.f90'", see attached. Grüße Thomas >> + >> + >> +module m >> + integer :: xxxx >> + !$acc declare device_resident(xxxx) >> +contains >> + subroutine set_var >> + !$acc routine >> + use openacc >> + implicit none (type, external) >> + if (acc_on_device(acc_device_host)) then >> + xxxx = 1234 >> + else >> + xxxx = 4242 >> + end if >> + end >> +end module m >> + >> + >> +program main >> + use m >> + call set_var >> + !$acc serial >> + ! { dg-warning "using 'vector_length \\(32\\)', ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } >> + call set_var >> + !$acc end serial >> +end From c3774b2e2d7d00ad9f9f6fce10aa6bc872bd951f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 14 Oct 2024 10:26:13 +0200 Subject: [PATCH] Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Fix effective-target keyword in 'libgomp.oacc-fortran/acc_on_device-2.f90' The test case 'libgomp.oacc-fortran/acc_on_device-2.f90' added in commit 3269a722b7a03613e9c4e2862bc5088c4a17cc11 "Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device" had a mismatch between dump file production and its scanning; the former needs to use 'offload_target_nvptx' (like 'offload_target_amdgcn'), not 'offload_device_nvptx'. PR testsuite/82250 libgomp/ * testsuite/libgomp.oacc-fortran/acc_on_device-2.f90: Fix effective-target keyword. --- libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 index 39d4357dd55..306555cfccf 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/acc_on_device-2.f90 @@ -3,7 +3,7 @@ ! Check whether 'acc_on_device()' is properly compile-time optimized. */ ! { dg-additional-options "-fdump-tree-gimple -fdump-tree-optimized" } -! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_device_nvptx || offload_target_amdgcn } } } +! { dg-additional-options -foffload-options=-fdump-tree-optimized { target { offload_target_nvptx || offload_target_amdgcn } } } ! { dg-final { scan-tree-dump-times "acc_on_device" 1 "gimple" } } -- 2.34.1