From patchwork Thu Nov 30 14:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 81036 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EDCF33857014 for ; Thu, 30 Nov 2023 14:59:53 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 1C7DB385AE41 for ; Thu, 30 Nov 2023 14:59:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1C7DB385AE41 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1C7DB385AE41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.129.153 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701356378; cv=none; b=oKdgavJWvTU//IUdwdMSz9BWpHaTAKkYLRpLXK/xuL741ZLOufC1SwaD1hW92Ydr/IKxcL1IYB4Oopfl0xynBPR/Oc0LQ70vgWefB9rEiwAtBM9FbS1cfR2TlxNTRRA3OlJDbrQ2eunBm/Kan2Bjw4ycxDEZUmgX+Cv0VPvcCaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701356378; c=relaxed/simple; bh=ZyTyFDHBGLJYVgLkPiKZ/gbT0B0KjLWUbgx6m1PleN0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JC0ioGAqi6DgV+jvc56/tMxB/TvthQJSeLMwuXGvxukpbN5l5xET+Nn92QPi1vGwD+7Uby6Sij7lgNA6gt9Dmd1SKcv2hKwldpBubGMzIs0e3kSMj8AH5T7sHZdRPPQVF+ib1Uc1zNo/hoD7PYvpZN+1QxqxQY03b7wucsgXNPg= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: O5YHVmj1QZ2SROwT1WDoYQ== X-CSE-MsgGUID: a2A1UpDLRmKD6SPL8Ks8AQ== X-IronPort-AV: E=Sophos;i="6.04,239,1695715200"; d="scan'208,223";a="27270283" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 30 Nov 2023 06:59:36 -0800 IronPort-SDR: n8RC0XLjO3y/QEb7k6O+JP5WjkqzIv55oBNg8dwGT2/8Fgt0+2/pbaiOwd3qhgyMiKXgQxQfRI umaeGeMGN+iUZvz5s6f25j09Fgb+/fm1sr1HQuDN0uOrMlZeCIdGQ0DDQtiLEdhwRpmkIbLkq9 RS/O3r1Nl1b6lJdL60eJE10U/evjckPfuZF1BFuEN1jDXOJ6rj95gHLdDid7y0RGAU7hLLYS1e ukRGO1N209+J9DqTV7jYS20fiKW+YByomksihe/+ejncF+E2f51ZEpoT6GHvAxCfnTDEZ2ma3g Q4E= From: Thomas Schwinge To: CC: Tom de Vries , Jakub Jelinek , Tobias Burnus Subject: Spin 'dg-do run' part of 'libgomp.c/declare-variant-3-sm30.c' off into new 'libgomp.c/declare-variant-3.c' (was: [PATCH][libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c) In-Reply-To: <0ce14ee6-a677-76a9-7e7a-d99d3927bd8a@suse.de> References: <6b0f4fe5-06d4-5ede-5bd1-a53ed82f6d36@suse.de> <221e5215-3b8b-fa9f-4e7b-2faa86b8b991@codesourcery.com> <71e9c008-7ad1-c24f-76eb-6a03180525c4@suse.de> <0ce14ee6-a677-76a9-7e7a-d99d3927bd8a@suse.de> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Thu, 30 Nov 2023 15:59:29 +0100 Message-ID: <877clz5lta.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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+patchwork=sourceware.org@gcc.gnu.org Hi! On 2022-02-24T11:32:53+0100, Tom de Vries via Gcc-patches wrote: > the sm_30 test which is still dg-do run (although I've > added the compile time test) which should pass on all boards (since we > don't support below sm_30). Pushed to master branch commit 95e6e32a85566a5510d21938d439e90e504e0ddc "Spin 'dg-do run' part of 'libgomp.c/declare-variant-3-sm30.c' off into new 'libgomp.c/declare-variant-3.c'", see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 95e6e32a85566a5510d21938d439e90e504e0ddc Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 21 Nov 2023 19:03:47 +0100 Subject: [PATCH] Spin 'dg-do run' part of 'libgomp.c/declare-variant-3-sm30.c' off into new 'libgomp.c/declare-variant-3.c' Having nvptx offloading configured doesn't imply being able to run nvptx offloading test cases on the test host. Also, make 'libgomp.c/declare-variant-3.c' work for all non-offloading and offloading cases. Fix-up for commit 59b8ade88774b4dcf1691a8f650cdbb86cc30862 "[libgomp, testsuite, nvptx] Add libgomp.c/declare-variant-3-sm*.c". libgomp/ * testsuite/libgomp.c/declare-variant-3-sm30.c: Turn 'dg-do run' into 'dg-do link'. * testsuite/libgomp.c/declare-variant-3.c: New. * testsuite/libgomp.c/declare-variant-3.h: Extend. --- libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c | 2 +- libgomp/testsuite/libgomp.c/declare-variant-3.c | 8 ++++++++ libgomp/testsuite/libgomp.c/declare-variant-3.h | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libgomp/testsuite/libgomp.c/declare-variant-3.c diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c index a373647bb33..d2ffa5637c5 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-3-sm30.c @@ -1,4 +1,4 @@ -/* { dg-do run { target { offload_target_nvptx } } } */ +/* { dg-do link { target { offload_target_nvptx } } } */ /* { dg-additional-options -foffload=nvptx-none } */ /* { dg-additional-options "-foffload=-misa=sm_30 -foffload=-mptx=_" } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3.c b/libgomp/testsuite/libgomp.c/declare-variant-3.c new file mode 100644 index 00000000000..62c1fa766ba --- /dev/null +++ b/libgomp/testsuite/libgomp.c/declare-variant-3.c @@ -0,0 +1,8 @@ +/* { dg-additional-options -DOFFLOAD_DEVICE_NVPTX { target offload_device_nvptx } } */ +/* { dg-additional-options {-fdump-tree-optimized -foffload-options=-fdump-tree-optimized} } */ + +#include "declare-variant-3.h" + +/* { dg-final { scan-tree-dump "= f \\(\\);" "optimized" } } + { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= f \\(\\);" "optimized" { target offload_target_amdgcn } } } + { dg-final { only_for_offload_target nvptx-none scan-offload-tree-dump "= f\[0-9\]+ \\(\\);" "optimized" { target offload_target_nvptx } } } */ diff --git a/libgomp/testsuite/libgomp.c/declare-variant-3.h b/libgomp/testsuite/libgomp.c/declare-variant-3.h index 646e15e5311..38ee257e42d 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-3.h +++ b/libgomp/testsuite/libgomp.c/declare-variant-3.h @@ -65,10 +65,15 @@ main (void) #pragma omp target map(from:v) v = f (); +#ifdef OFFLOAD_DEVICE_NVPTX if (v == 0) __builtin_abort (); __builtin_printf ("Nvptx accelerator: sm_%d\n", v); +#else + if (v != 0) + __builtin_abort (); +#endif return 0; } -- 2.34.1