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: 1891287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=eLoOtfyJ; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=D0swwawQ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=eLoOtfyJ; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=D0swwawQ; 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 4TLwnT1mN9z23dy for ; Fri, 26 Jan 2024 22:43:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C6553858029 for ; Fri, 26 Jan 2024 11:43:39 +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+incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20240126114339.3C6553858029@sourceware.org> 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,