From patchwork Fri Jan 26 11:42:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 192557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp600482dyb; Fri, 26 Jan 2024 03:44:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcZIvgajFbBZqMFj7Ssx8GAxpOZw7mHneU5g2DL7UfWsGfBT3LmOoTzrOjnQNbYMUEzHJ0 X-Received: by 2002:a05:6214:e6f:b0:686:a3c7:16ed with SMTP id jz15-20020a0562140e6f00b00686a3c716edmr1468801qvb.76.1706269442424; Fri, 26 Jan 2024 03:44:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706269442; cv=pass; d=google.com; s=arc-20160816; b=X1yM4uS0YzDbxWz1qEPmq4hmBUA20DDw3cR4tQhuXNd+AAkTTUJghbU10e2qDi4RBo xXHObjncKQ8mSNuepGZxo3ZwZjjLxFTVJaZ7w+BkvobZj3AkKKIPcuxu8D7Fmw1DKfQ9 PqKNb9sFO2unBa+aQDEjj91mbFVWwBGYvXQpRSsNF33jxYjiNn2oG01aHRzX55GUBhdU eIPHSUopM3/6+481voIMbpg7/wOz4m+M/NHD5NfV4zUzP/sv20bJZKXlT3s9V+ALO4rz ZMfMpFbP5yrpellt5R1Z/pwIfV6sq2njMixuGuP3B9SSXpWyUow7yO8HyvIRJQNxB7rf AiMA== 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=/9SIzBHuhxr1CA4EUDat8VATJ/O+mSPqiikjbSSZor0=; fh=WafaRBu98zStSTLJ3F2+0jkIRrCdRYw9kz8Gxtj95sk=; b=jbn5u8cxjJ/4GG9AsJsYdvzeBQHzZEp2VCZePx0c5zDhtfHxJxC5hNGwZ9EeO9dHgz ejXuIS/bFul10mIBxn5u2qI/h3E29cOu+MzbgbTxydp7ikrNE8HvCpScEqUEqIHP9dbm li1Cay7U1ocG3ZGyuJxE4CTXa7R2iEeVOEytZbx3FNLo9vvNBGAbQs8V8opFPh0GLhXK m1qi5ug2Y6igM1G9Py2EwaVWlHvYVeaHOc5TZvlep3MzSg5PADbtfCvsRxibRmFPnNpm XtwzQmCmzfddPGYiZvPaCDcVmYIQQlYVwlGLIzJS7RUpg+8wWRHw9SldVnT4tPHa9Wet 2FFw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eLoOtfyJ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eLoOtfyJ; 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 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id 10-20020a056214202a00b00681757d978asi1164007qvf.243.2024.01.26.03.44.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 03:44:02 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eLoOtfyJ; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=eLoOtfyJ; 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 8.43.85.97 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 1F19D3858008 for ; Fri, 26 Jan 2024 11:44:02 +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 94D0E3858C3A for ; Fri, 26 Jan 2024 11:43:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94D0E3858C3A 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 94D0E3858C3A 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=1706269397; cv=none; b=FRfr0tmVjEmL8oJtvQsygu+qiEYInJV9q/qXACV1J5AbfPIgJWTreX4qX3J25GLRosSkq8bHaOUnmEXh9IAnzxnyaSO4rfLQ4HOqvTCqXDnyW2wz+baEO6JApkSyKSzIoUQ2XNtrMuE9Zr84rIbuYXSp8afkrvyiZb7BQc5iUCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706269397; c=relaxed/simple; bh=mAc6bOw7tIgtixMMlEYiMMFAJmLbyefkCqSRrrCWBwc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=HzDFzR9k52SaB4my8lr2gBG5iRsGTgIsMo3eiyBiR2neq+WXho6RsMU1d6kUr01kexsszUDvKhoAaNeSWDJFhfwTj6l1nDiOWVqSTCySCT7ake/ZdDpy9V/qwDvb9N8g4EVBO6L/PcL0VtdMqoYWaeGP/GITZHqKJNEOfzKY41s= 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 79E39221A7; Fri, 26 Jan 2024 11:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706269394; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=/9SIzBHuhxr1CA4EUDat8VATJ/O+mSPqiikjbSSZor0=; b=eLoOtfyJFjtPDTf90clYNc2UEagJ7towxBIkTUJN2cMoFsOpQjTaWL5W7u9KhjYi9ZVAOa 5kf3snucV6qbCztnOd1ig5F+EkzkA/QMeXCD0j4shUQi54FJJghy9pSK/PDbLqCtu9HMk3 N6Wn60c8FD5sdYi3PhzsPdPxJXiXMII= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706269394; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=/9SIzBHuhxr1CA4EUDat8VATJ/O+mSPqiikjbSSZor0=; b=D0swwawQz5jo3+Ixk3BHO8Vp563VmgLS8KB381DGUu4vs2dFy7mtBnMwAW9/tLwjPsbcbY 1/9HA1/tKfvE/fDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1706269394; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=/9SIzBHuhxr1CA4EUDat8VATJ/O+mSPqiikjbSSZor0=; b=eLoOtfyJFjtPDTf90clYNc2UEagJ7towxBIkTUJN2cMoFsOpQjTaWL5W7u9KhjYi9ZVAOa 5kf3snucV6qbCztnOd1ig5F+EkzkA/QMeXCD0j4shUQi54FJJghy9pSK/PDbLqCtu9HMk3 N6Wn60c8FD5sdYi3PhzsPdPxJXiXMII= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1706269394; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=/9SIzBHuhxr1CA4EUDat8VATJ/O+mSPqiikjbSSZor0=; b=D0swwawQz5jo3+Ixk3BHO8Vp563VmgLS8KB381DGUu4vs2dFy7mtBnMwAW9/tLwjPsbcbY 1/9HA1/tKfvE/fDg== Date: Fri, 26 Jan 2024 12:42:06 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: ams@baylibre.com Subject: [PATCH] Fix architecture support in OMP_OFFLOAD_init_device for gcn MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 4.36 X-Spamd-Result: default: False [4.36 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.988]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; NEURAL_SPAM_SHORT(2.97)[0.990]; 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.03)[55.42%] 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, KAM_SHORT, 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: <20240126114402.1F19D3858008@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789153186798901074 X-GMAIL-MSGID: 1789153186798901074 The following makes the existing architecture support check work instead of being optimized away (enum vs. -1). This avoids later asserts when we assume such devices are never actually used. Tested as previously, now the error is libgomp: GCN fatal error: Unknown GCN agent architecture Runtime message: HSA_STATUS_ERROR: A generic error has occurred. now will figure why we try to initialize that device. OK? libgomp/ * plugin/plugin-gcn.c (EF_AMDGPU_MACH::EF_AMDGPU_MACH_UNSUPPORTED): Add. (isa_code): Return that instead of -1. (GOMP_OFFLOAD_init_device): Adjust. --- libgomp/plugin/plugin-gcn.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index db28781dedb..588358bbbf9 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -384,6 +384,7 @@ struct gcn_image_desc See https://llvm.org/docs/AMDGPUUsage.html#amdgpu-ef-amdgpu-mach-table */ typedef enum { + EF_AMDGPU_MACH_UNSUPPORTED = -1, EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a, EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c, EF_AMDGPU_MACH_AMDGCN_GFX906 = 0x02f, @@ -1727,7 +1728,7 @@ isa_code(const char *isa) { if (!strncmp (isa, gcn_gfx1100_s, gcn_isa_name_len)) return EF_AMDGPU_MACH_AMDGCN_GFX1100; - return -1; + return EF_AMDGPU_MACH_UNSUPPORTED; } /* CDNA2 devices have twice as many VGPRs compared to older devices. */ @@ -3374,7 +3375,7 @@ GOMP_OFFLOAD_init_device (int n) return hsa_error ("Error querying the name of the agent", status); agent->device_isa = isa_code (agent->name); - if (agent->device_isa < 0) + if (agent->device_isa == EF_AMDGPU_MACH_UNSUPPORTED) return hsa_error ("Unknown GCN agent architecture", HSA_STATUS_ERROR); status = hsa_fns.hsa_agent_get_info_fn (agent->id, HSA_AGENT_INFO_VENDOR_NAME,