From patchwork Fri Jan 26 10:40:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 192519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp572274dyb; Fri, 26 Jan 2024 02:42:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHA+DqXZN8PA1bPP39+5M9XPQ1OPuwuKVMShs7SErSEGIQbWLxAEoa2GuIOeo9Ouux3K7OZ X-Received: by 2002:a9d:66d1:0:b0:6dd:e17e:f714 with SMTP id t17-20020a9d66d1000000b006dde17ef714mr1276347otm.27.1706265776475; Fri, 26 Jan 2024 02:42:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706265776; cv=pass; d=google.com; s=arc-20160816; b=JJDn5z9rVfxI7ejUyaahiohOowCSbV2sObUeW+oHsEZobWqnzotnT9mJ8PBgUx+qgC UF4klYI5LmKz2VneeudpQ5dqz3KC1ppy4tRhlh/Qn7q9I8cOK3C5ecrZLxmYswehByuc fbSgj+sbrGoXK/xIhbu0HqVi6gcOcMDYm/3aJ2mK9TEFFPOsWrZSg5TFQGXAdzcTIECJ Q6u9V+7lRodIn4Tgb8YWQnxTYuMCIwaC2Q8bOlo5Y8s8yIh68bPjrCH2hk6Vf5OhaOeU zx3vZ/TfxjPfSUA4h8ja2C0eLBmII+JOJxtZV4KlzWl3GKxcq5wy0kf8PyLkEe8822Z8 FeKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:errors-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :subject:cc:to:from:date:dkim-signature:dkim-signature :dkim-signature:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=WIFWSIbLan8wiaTuyUQd2FbHcAU/TdRyBwz5fZq1Jnc=; fh=WafaRBu98zStSTLJ3F2+0jkIRrCdRYw9kz8Gxtj95sk=; b=0PWnUJtOQnRpv4EqE0ShNaR+FEqLrbIs/25y+cnnKC45pe1XFpDxDxY15pMuJbv/Nu TR3pY9xYLTW7fNbY+Ui78XOlCXGeKLTGsVCJ8zvF6RguqkowmxI9IUOB4LmGhDaU5xW5 DGpEFM/HL3zI4sWTgQeQp5/lK6sYX7xIxF4WynuRD+KbEtN2lvBNauzd3tJ8EYq5YZ++ hVSDKhxLvbRanJrsXT+3bck5UkLbx+hLG+4vqIlJbi1/+7eVt8tRh1gHYazsobWuykWG i6PnkqNOdTBFZVNRdzpyuZWBLM866bTt1IZgib7dpOXClc04ua31J5GxQF9Wif/a8X0F UWPw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ny5/XoMF"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ny5/XoMF"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id 12-20020ad45bac000000b0068600507c19si999632qvq.522.2024.01.26.02.42.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 02:42:56 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ny5/XoMF"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b="ny5/XoMF"; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17E003858422 for ; Fri, 26 Jan 2024 10:42:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id D8A2D385840E for ; Fri, 26 Jan 2024 10:41:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D8A2D385840E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D8A2D385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706265722; cv=none; b=DLudi46HR+gtcri4CtPOxfrVcK2TDNUfkWx0t5rchFUg0wiaEZPswVXP+q/6GbkS9LQoNNmsQm/cL6359A6T3iaTOhvQ3Zw+fEXV8b6esZaolLEWqqmyizbu/vDU7c1xsWuFiExBgX830TMb9LdPw33Y2BSVfaBNlexW1GCLOZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706265722; c=relaxed/simple; bh=LUKtts2zE/+6vs3kNHhEwsf3i/UNepZUcfPSEWpSHVU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=czXdBUV7F76FFWgdHsP/ygaOkF+cLplm15I+ngUA84UGMkbtK4PR4VUbRT36pbR2ymi7OOzsfd9t5KW45tYkIjRNO/XvqJ9siETidiBStUGXDeqjhNjBjZ8ja6tXtPDut86Z4IDzZYPYFue6YT3iEBQCzLOjq/3JeIiftBIu8rI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DF6A921F03; Fri, 26 Jan 2024 10:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706265718; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=WIFWSIbLan8wiaTuyUQd2FbHcAU/TdRyBwz5fZq1Jnc=; b=ny5/XoMFZvmDDTN9XEBH7beapBczWZIvPPTf8zu6HfQ3GM/XzCKSQvnz+6ysP/V5oiFSBr 5wsRgP+B3aQtSWRRIZ3kGMog4yqi3L2DprZIPTILydiw9ePo296s60ga+Wh9RsdB6bQ4Et m/BQSVLvkbaqinlSBrFlPUNnNYfbjQI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706265718; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=WIFWSIbLan8wiaTuyUQd2FbHcAU/TdRyBwz5fZq1Jnc=; b=fMgilCq9IeclrwIq1xljcaj0/m479kZsAAJy4LT0Ax45V8eByPZgdco5cCLiZFCBWsO030 wooZQNWdxpCOiOAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706265718; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=WIFWSIbLan8wiaTuyUQd2FbHcAU/TdRyBwz5fZq1Jnc=; b=ny5/XoMFZvmDDTN9XEBH7beapBczWZIvPPTf8zu6HfQ3GM/XzCKSQvnz+6ysP/V5oiFSBr 5wsRgP+B3aQtSWRRIZ3kGMog4yqi3L2DprZIPTILydiw9ePo296s60ga+Wh9RsdB6bQ4Et m/BQSVLvkbaqinlSBrFlPUNnNYfbjQI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706265718; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=WIFWSIbLan8wiaTuyUQd2FbHcAU/TdRyBwz5fZq1Jnc=; b=fMgilCq9IeclrwIq1xljcaj0/m479kZsAAJy4LT0Ax45V8eByPZgdco5cCLiZFCBWsO030 wooZQNWdxpCOiOAQ== Date: Fri, 26 Jan 2024 11:40:50 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: ams@baylibre.com Subject: [PATCH] Avoid using an unsupported agent when offloading to GCN MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [1.54 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.86)[85.48%] X-Spam-Score: 1.54 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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+ouuuleilei=gmail.com@gcc.gnu.org Message-Id: <20240126104256.17E003858422@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789149342558854504 X-GMAIL-MSGID: 1789149342558854504 The following avoids selecting an unsupported agent early, avoiding later asserts when we rely on it being supported. tested on x86_64-unknown-linux-gnu -> amdhsa-gcn on gfx1060 that's the alternative to the other patch. I do indeed seem to get the other (unsupported) agent selected somehow after the other supported agent finished a kernel run. Not sure if it's the CPU or the IGPU though. OK? Which variant? libgomp/ * plugin/plugin-gcn.c (get_agent_info): When the agent isn't supported return NULL. --- libgomp/plugin/plugin-gcn.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index d8c3907c108..f453f630e06 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -1036,6 +1036,8 @@ print_kernel_dispatch (struct kernel_dispatch *dispatch, unsigned indent) /* }}} */ /* {{{ Utility functions */ +static const char* isa_hsa_name (int isa); + /* Cast the thread local storage to gcn_thread. */ static inline struct gcn_thread * @@ -1589,6 +1591,11 @@ get_agent_info (int n) GOMP_PLUGIN_error ("Attempt to use an uninitialized GCN agent."); return NULL; } + if (!isa_hsa_name (hsa_context.agents[n].device_isa)) + { + GOMP_PLUGIN_error ("Attempt to use an unsupported GCN agent."); + return NULL; + } return &hsa_context.agents[n]; }