From patchwork Fri Jan 19 18:27:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 84456 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 04E18386C586 for ; Fri, 19 Jan 2024 18:28:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id 5F6493865C10 for ; Fri, 19 Jan 2024 18:27:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F6493865C10 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 5F6493865C10 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::634 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705688863; cv=none; b=S7P18AQgGMrsonNXtg/cpGo01MoX3tk6+aO4j10dwza42UHPhiZjNQQF1U/pnQ/Kk7nwcp58dBSM1WXNeii7M1rEfSA3LoYpdL0e8t8+uwXucXcM6y2emEZ4bbV27Vu6HEgAntL97sRnw/wOXbpUe5mC8SqknDtJgB0D11wmuZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705688863; c=relaxed/simple; bh=aX/7pGLGkXKG/jMmgt6LBnsYESxhPmnDOQEbArwSWi0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=FRfRZ5wsUT9ZC0Wz6f636wkl+u4Re8kNQMl9icILmiZEdoE6vwklbaiFBXAW8+q6W424gLqY0byCfn5Tc629A+ZagkrqCLmjRVS/hwoN1qaEdpGE0rZK4bxTT2E2y5nG3O0hkyKkmZ7vJ1tEnKEHFuR6MuJIrIqGR7NzLSITzCU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a2ac304e526so111315966b.0 for ; Fri, 19 Jan 2024 10:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1705688859; x=1706293659; darn=gcc.gnu.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=LWoMTF0fVfC+p+LDh+7YyvRyNYbpd75ZTn06BILSFhc=; b=VZ4zI6i1pyLMEHyJxmno2enOtaIhwNIUECdXz4rHm5LIBJriAw4Nbq7r47GRtERfkh fjv5xD3ISQbH7x5WsbQGza42cmG73wdgnzJTg7eo9S9D1mI8Js9mUkUGmWiKX3BIp7Xu rYPl1pp+SiOSbC4eBl+m8H7SZSkW549kSd7ePM2YpM9eQnRbbgT5CQmQhpkrIw3dLSjH cXVNajwMt77UyPMUJ2M8MejTqCh+CxLmNYTitl760WeetyEtj9SBu+ByXTBm7Yd9U4ds niKB69qSYj4DuOE8UkiAG0CSiXdRZxK5T+/B4Zyin46ysieFw24ULzPTZGhzIcAFHoNe b57Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705688859; x=1706293659; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LWoMTF0fVfC+p+LDh+7YyvRyNYbpd75ZTn06BILSFhc=; b=ibYR0w4V15h9kqf5sWbiegqonHBUPOHeytOGepF0PDghVfwBScOj/Cf6guvA0thM0I ien47BXuN3S9kFsh3TlvAiw4yz8YoJ4II1oBd+iQnIp99yA+LEezqko7OxUb47dtzwiL zyb4wGoUplNdwL/+AIWivzZem1ba/dB0fdfl9MjzhL82aGV8Y2OehhW4zyUWzdxrpm8W LRp6uZA6Lk8KPTJCcoIqQ1qVUxK6glTjVeWybSaPKOpu/HQihbh6KH0SxcC83s9rcG08 Muw3gZ6Dv0N/9gvz3IiBNDKn9xi6lJ+UuzQBRvK6EFYi4ONUDIv8/8yQMH5HRODZMNBB 6vxQ== X-Gm-Message-State: AOJu0YwdSYwMSUa5heiHaYjVw4vDEw7cqNz2kkOsdD9Y/ZX31PzJ9jje cn7xVrCDl0z4ip+yphRGtwinxpJdq+33Jgo5VMGBtm5mkVWDd13D7y8dKHNtzSzmhLggUQ6+Udq RsdnqyA== X-Google-Smtp-Source: AGHT+IHXRASgD0rCfWaATaRUL+xW4iK4nYvFlc9Uc+Ha4wICmatRxp2FPWCReon4ZUY0Op+x7Ja3GA== X-Received: by 2002:a17:906:8c4:b0:a2e:ac17:4fd8 with SMTP id o4-20020a17090608c400b00a2eac174fd8mr133214eje.26.1705688859080; Fri, 19 Jan 2024 10:27:39 -0800 (PST) Received: from ?IPV6:2001:16b8:3fec:9600:be03:58ff:fe31:f74? ([2001:16b8:3fec:9600:be03:58ff:fe31:f74]) by smtp.gmail.com with ESMTPSA id p26-20020a1709061b5a00b00a298ade2e72sm10568790ejg.195.2024.01.19.10.27.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Jan 2024 10:27:38 -0800 (PST) Message-ID: Date: Fri, 19 Jan 2024 19:27:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches , Andrew Stubbs From: Tobias Burnus Subject: [Patch] xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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 The problem is as described at https://gcc.gnu.org/install/specific.html#amdgcn-x-amdhsa "Note that support for Fiji devices has been removed in ROCm 4.0 and support in LLVM is deprecated and will be removed in LLVM 18." Therefore, GCC is no longer build with Fiji (gfx803) support by default – and the -march=fiji testcases now fails as the -lgomp multilib for Fiji is not available. (That is: It fails, unless Fiji support has been enabled manually.) Andrew mentioned that there is a PR about this, but I couldn't find it. If someone can, I am happy to add it to the changelog. OK for mainline? Tobias xfail libgomp.c/declare-variant-4-{fiji,gfx803}.c Since r14-4734-g56ed1055b2f40ac162ae8d382280ac07a33f789f, GCC no longer builds the Fiji (alias gfx803) libraries by default as support for it was removed in ROCm 4.0 and will be removed in LLVM 18. Thus, unless gfx803 is explicitly enabled, the following testcases will fail to link as libgomp is not available for Fiji. Hence, this commit xfails those testcases. libgomp/ChangeLog: * testsuite/libgomp.c/declare-variant-4-fiji.c: Xfail as fiji support is no longer enabled by default. * testsuite/libgomp.c/declare-variant-4-gfx803.c: Likewise. Signed-off-by: Tobias Burnus libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c | 2 ++ libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c index a138fb092f8..654f9bc655c 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-fiji.c @@ -3,6 +3,8 @@ /* { dg-additional-options -foffload=-march=fiji } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ +/* { dg-xfail-if "fiji/gfx803 is no longer enabled by default & deprectated in ROCm/LLVM/GCC" { *-*-* } } */ + #define USE_FIJI_FOR_GFX803 #include "declare-variant-4.h" diff --git a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c index 03dffddac49..b447631e52e 100644 --- a/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c +++ b/libgomp/testsuite/libgomp.c/declare-variant-4-gfx803.c @@ -3,6 +3,8 @@ /* { dg-additional-options -foffload=-march=fiji } */ /* { dg-additional-options "-foffload=-fdump-tree-optimized" } */ +/* { dg-xfail-if "fiji/gfx803 is no longer enabled by default & deprectated in ROCm/LLVM/GCC" { *-*-* } } */ + #include "declare-variant-4.h" /* { dg-final { only_for_offload_target amdgcn-amdhsa scan-offload-tree-dump "= gfx803 \\(\\);" "optimized" } } */