From patchwork Mon Feb 19 17:05:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1901070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=10gMHhHk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4Tdpnw4xT5z20Qg for ; Tue, 20 Feb 2024 04:05:40 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 943743858C41 for ; Mon, 19 Feb 2024 17:05:38 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 029663858D20 for ; Mon, 19 Feb 2024 17:05:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 029663858D20 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 029663858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::633 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708362317; cv=none; b=A8ILMjamQs+tZ2USzfp2vPBVoExJIn+kxKaNHru18AWCsgi/J2xu6QnEONI5IsW7qiHsrslc4nI+VHKxU41ZmZzX/0SNv/ZmfuOzy7G8KmWtEdPnWnVoB30NngrtaYZ5HlTIvA0pFfZC013rYBUDfote4u4vx7tqWsRiiom/ia4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708362317; c=relaxed/simple; bh=7AE/a0gJDbbKEUX2ALC/oer4B3+zm3edN3nT8gii7Rs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=grlwKKBg47ugrPKPmFdSJtFZa06WAuxXhF2FV9+TqnITZ/4tb1tN9x00MWGaMxbqKP5uLPvWUTBVryzG72Z8KgKe5GxIVXyDhUt0PV2ktdC45WwixE4IjlcAvHG5Sd0SuJRnxeXMo4QprEplom62B6fdCuUn5dsLwPIoGnaJYFI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a3cc2f9621aso479439266b.1 for ; Mon, 19 Feb 2024 09:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1708362314; x=1708967114; darn=gcc.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=64rQX1Qs+G5AWpWElhjEW5EW5fLiGGz1sZKPCxYlCFo=; b=10gMHhHkPQEPq7rmkVzvLeBvSs8uVza3jMWpJbvVavX7llshGqAJXqgLZ1t6jMsk++ rwEfarDHwuyqX5U52ZBunvJeXx+whgveO5CFJBHc8rPXFAjjwkzaPQr6+vWHEgXVb63W W349lJsqL979T97IqyeFb+NY96YBrCzFwABUzuF6IynyMekqYNXd2lzyijDtD1wQOGpY CD5wkXc26uHbGJx8NwKD9yEVAelhlSIhVQXRjkvT8Wn9YFulEvy5ezF25hkZkjmqoX42 mu5v7dUz04BJr77+Z6M8Ai8Pc/qaD7aQU8AWps9tDvNvSZAtLpTOqHy4lT0KgK0D3FUi zjdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708362314; x=1708967114; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=64rQX1Qs+G5AWpWElhjEW5EW5fLiGGz1sZKPCxYlCFo=; b=rm2IFejjb+M0Ox6ncydqtK01+BwX+P6y5uHIzwNYssgywQGkUfoll4MDFkAUxOEk1C CpPwZMovVcJSi0bp86JGUAD9Am+qNmR29jE4wu/dbLwXCgu2/nI3Z/miHH6tbFrvjuqs 3V7kcHuLu7XiWZfXKdumKraY32XL/aQgIMW7awEJf6hVkq6vny8b2kF5p/pjB2IKsmPT 0o1EhjYETJSnKfYnOEY9VMaXeM9SsTFhSee63NhMr629RQPm7mtoaP3Tpo7F2kIlAXu9 B44caF0Yrc0UgodgxjpWF9Isrr5a56XwNN16X3B3caybNbPs0YnS8+UuvsmyAGsLLihS hnyw== X-Forwarded-Encrypted: i=1; AJvYcCW9INgvcEjHtiP4ciBkLvjuDqtDkUNG8oxPe+G+AcbP+kyW6oLgjcRYiCoqgaS4IkXL54U68TVU0rh6G2+7bhW+CowTV7axeQ== X-Gm-Message-State: AOJu0YxME6N6sAdnM3qysIOvOz8VNF4P1WPRksZp64fJTZly7+QRAKu1 JfavHalCpPIR42KsMj8HN3LZLbRvmWoKXVycpIREmcEACi77Ohx1a4ZN/yaCFkE= X-Google-Smtp-Source: AGHT+IGPDdKY0j2+pahQV4npVu0wdE5s2oPcm0XaTsuC+1APu4k1NaDgard/UOUDliCVJv43BRLKOg== X-Received: by 2002:a17:906:5fda:b0:a3e:b263:d769 with SMTP id k26-20020a1709065fda00b00a3eb263d769mr1582993ejv.4.1708362313643; Mon, 19 Feb 2024 09:05:13 -0800 (PST) Received: from euler.schwinge.homeip.net (p200300c8b7344200b5efa23283b9f09b.dip0.t-ipconnect.de. [2003:c8:b734:4200:b5ef:a232:83b9:f09b]) by smtp.gmail.com with ESMTPSA id lc26-20020a170906dffa00b00a3e7cb91865sm1579378ejc.121.2024.02.19.09.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 09:05:13 -0800 (PST) From: Thomas Schwinge To: Tobias Burnus , gcc-patches@gcc.gnu.org, Andrew Stubbs Subject: GCN: Restore lost '__gfx90a__' target CPU definition (was: [Patch] GCN: Add pre-initial support for gfx1100) In-Reply-To: References: User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/29.1 (x86_64-pc-linux-gnu) Date: Mon, 19 Feb 2024 18:05:10 +0100 Message-ID: <87msrwjsft.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Hi! On 2024-01-07T20:20:19+0100, Tobias Burnus wrote: > --- a/gcc/config/gcn/gcn.h > +++ b/gcc/config/gcn/gcn.h > @@ -30,6 +30,8 @@ > builtin_define ("__CDNA2__"); \ > else if (TARGET_RDNA2) \ > builtin_define ("__RDNA2__"); \ > + else if (TARGET_RDNA3) \ > + builtin_define ("__RDNA3__"); \ > if (TARGET_FIJI) \ > { \ > builtin_define ("__fiji__"); \ > @@ -41,11 +43,13 @@ > builtin_define ("__gfx906__"); \ > else if (TARGET_GFX908) \ > builtin_define ("__gfx908__"); \ > - else if (TARGET_GFX90a) \ > - builtin_define ("__gfx90a__"); \ > + else if (TARGET_GFX1030) \ > + builtin_define ("__gfx1030"); \ > + else if (TARGET_GFX1100) \ > + builtin_define ("__gfx1100__"); \ > } while (0) Supposedly it wasn't intentional that we lost gfx90a here -- I've pushed to master branch commit 159174f25716c18a74a915cb01b9a28024ea7a3d "GCN: Restore lost '__gfx90a__' target CPU definition", see attached. Grüße Thomas From 159174f25716c18a74a915cb01b9a28024ea7a3d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 8 Feb 2024 23:27:19 +0100 Subject: [PATCH] GCN: Restore lost '__gfx90a__' target CPU definition Also, add some safeguards for the future. Fix-up for commit 52a2c659ae6c21f84b6acce0afcb9b93b9dc71a0 "GCN: Add pre-initial support for gfx1100". gcc/ * config/gcn/gcn.h (TARGET_CPU_CPP_BUILTINS): Restore lost '__gfx90a__' target CPU definition. Add some safeguards for the future. --- gcc/config/gcn/gcn.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/config/gcn/gcn.h b/gcc/config/gcn/gcn.h index a17f16aacc40..c314c7b4ae8e 100644 --- a/gcc/config/gcn/gcn.h +++ b/gcc/config/gcn/gcn.h @@ -32,6 +32,8 @@ builtin_define ("__RDNA2__"); \ else if (TARGET_RDNA3) \ builtin_define ("__RDNA3__"); \ + else \ + gcc_unreachable (); \ if (TARGET_FIJI) \ { \ builtin_define ("__fiji__"); \ @@ -43,10 +45,14 @@ builtin_define ("__gfx906__"); \ else if (TARGET_GFX908) \ builtin_define ("__gfx908__"); \ + else if (TARGET_GFX90a) \ + builtin_define ("__gfx90a__"); \ else if (TARGET_GFX1030) \ builtin_define ("__gfx1030"); \ else if (TARGET_GFX1100) \ builtin_define ("__gfx1100__"); \ + else \ + gcc_unreachable (); \ } while (0) #define ASSEMBLER_DIALECT (TARGET_RDNA2_PLUS ? 1 : 0) -- 2.43.0