From patchwork Thu Feb 1 13:49:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 195338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp162455dyb; Thu, 1 Feb 2024 05:50:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6Abp4daoqbdgur2J6RZC/hiVX2i2hBFV/q0l9vKcJwqNAqPICcdxVW0Bi+Nm4EidFOa2j X-Received: by 2002:a05:620a:384a:b0:785:404e:6cf3 with SMTP id po10-20020a05620a384a00b00785404e6cf3mr2561084qkn.68.1706795424636; Thu, 01 Feb 2024 05:50:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706795424; cv=pass; d=google.com; s=arc-20160816; b=ZjUfCyEirmPDXovTiBZRsug0fhPF1SdCEjb6iX/x5MkEBhp8ccCzZ0cwqYjBzZF2kb ctKg/5QLsWD8SnvQbimjafRluK0p7v9Yczj8H1LE/kgjJvPMta4ZCUIAEuUXObCCAQuj 9rpCwDBZAMkArpncJ6Gs7mJBpbPmpO8QW1HTXZ6PLr/KSd3saSBnsnFet1XBOuAxX5a3 cVyVwTsFBhNc+CYld8kMIIpSqJwlk2xTVh4UHUU063N54nQPDdNDINYt3q6Ffbk38UFv aN4ywq/URtgNLRZIus5l43xAj7HRLr9FYNS29uMm3FZmgJHdRON51VBkWQkcl3JLkh8t NxzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=jc8IX0tkDdxSDnGRo4zzvEluphCuS24mjtMnZHb+Ie8=; fh=IiXzmUKyGBUWubpLqi+3lPTjW553abtUQjQPqExHu5U=; b=O1VDGVVY6KuL6YrfDRHTrTj4R86gh/Z8jzAFU8mg6ZW9ncwHWlb9t5yYCTkjteKq/z zSC+oqStm7oxxYnITBhs0HL0k8VzGQFczWOYviE5i8LgJBtudXj448FNLBiUpa3Z2xPc CrPiQhoV73XBMx5wT8ICOo7NKmcTVPMe492OWi3KXNnF9Orz4kp9+1iVv51nWFm8hhsX AWga3cDhW3zUJ5ZDNmyf0LKFtE+nmbO6Dc1XLAyAALhtNj0Z+cCINsmIdvpjHLnAlJpB c7ibUEbZZCqB7lXEQITTpJ1eRF9ms6i4MPVpJ++VQvZTcXWNbWJpgtt8mnuPVwyZ6bYI kYxg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=erjLg129; 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" X-Forwarded-Encrypted: i=1; AJvYcCVe81Z6ocskXZ9OXp8SfLQSOlBTC/cc9orFCBSJtA3PiOkOQTlJDMkf3wCja6njk8zfFmBfKpYScsKJliK+qtAql2jnUQ== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id x23-20020ae9f817000000b00783efcaaeadsi11172804qkh.195.2024.02.01.05.50.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 05:50:24 -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=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=erjLg129; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5906738582A4 for ; Thu, 1 Feb 2024 13:50:24 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id DC70F38582B1 for ; Thu, 1 Feb 2024 13:49:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC70F38582B1 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 DC70F38582B1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706795363; cv=none; b=B7rS7MRG5gh1Vzns6b3+OufZwWTTs4lAi4aWg5IWraInoxcx/UtuArNYx8eULisnPbTqpVdjAbILAabaZyf/fEcOkRTxs1+qDPDQIr20et9E/1yHI/u45/9xpTuIdbSyEVwASjo1XtUZsmGve54e04JDvSkE0LZO1TYyAsK4LJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706795363; c=relaxed/simple; bh=tLUP5AXaQdjIGt0y08eCYM4l4E5Wv695eaoD5CZW6bY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bipJSjTyl0BW/TYiwuxEZeYcAyUeQ9j8VrO8+a69ECRcWauycZlFhhAFo5Xa+I5HE8h7SIKj/XZa5xG82g3hFluYCZEnUYqpC+fw6m0IpP/grN09mTdiZvJVgRDSmksinYxQmWD4002HasJq5pXdFT7HBLs/EIINBDqo5Vdv00A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a34c5ca2537so129044666b.0 for ; Thu, 01 Feb 2024 05:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1706795359; x=1707400159; 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=jc8IX0tkDdxSDnGRo4zzvEluphCuS24mjtMnZHb+Ie8=; b=erjLg129ntcNfwMeBE/P9BVnZYdld0tGo86MpdMQfhdXUN1s/QRIcwXJFAhZP0b/B8 D9nT5c5pU5CgTM8Qfwe9mMjkRsEaa++sAXypmAcaf/sktSOM6QvbRvrGYrfVP/iZyeX4 IPnrHTx8ml2y0vLlXfgJhuJFG9j87oIAaaKkVO8MfThWOTzikMix3WCfVewS8mZryC41 Ydj8ViHRV0j413QFAzA1liC0d/8JdxM+W52C+QqBPD3KjHHmPcr1uigl/rpciJG5gpje 2ICgjtdIBmlGlWpIbd8GHIhkUYls8cUF0nOBDSbCjs9O7UZ137JhDy0G0KizZFAgP+s1 MdMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706795359; x=1707400159; 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=jc8IX0tkDdxSDnGRo4zzvEluphCuS24mjtMnZHb+Ie8=; b=NIBZaHIYq5UxQrl6G+zh+e1yIx1ARt5fdv7Y+2AcmrMqINLb3aeBhDbwkukOF4Yh0y M5Ni4RJMkwiQmEr9bIhrLDEB1BEFuVUrIl1dDbiVi4C31mNVeINRPh3HE5vPVNctrlyA QdUcH70b1tM15QGUhLEjE7Cxvq0kBj7d2MMDZBPtOQgi4VhTOQSugVpVCW6KUE/YTYG/ MTOBWEifmBp9Tlr/hTI+JpLrpOYV/V4N307qvkPnUZNsK57u2zL8UhGFQEg3z5VtXNNW T/KMs7zi1Bs9Xrex4G3OAoumjLNBc5pjDplG1in4WteXrq3G09E0tfAlCFWm0iPMVTUI lRrw== X-Gm-Message-State: AOJu0YwMEUBnAbTYbIVtW3kGIElAcwVTuN9g7JYtBJESHsVPKSUqoOGI OXI7NJMzJmqP9QEqQayEKarW3GEijUuN7/pqI32gOZhEekt+1DxwwlCRN+98HUvzKhwiOH5h43W J X-Received: by 2002:a17:906:f2c6:b0:a35:85b7:560a with SMTP id gz6-20020a170906f2c600b00a3585b7560amr3516215ejb.46.1706795359420; Thu, 01 Feb 2024 05:49:19 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUuHNpFtu3MJfI0IibBFfWNTvMVVzCpMGqQV2bcyYBAILiBDim9psruLGy3Odon5JLvda1xsv1NlOzJbwYuoEeckuibk6NIjw== 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 un9-20020a170907cb8900b00a3682ad6354sm1463606ejc.41.2024.02.01.05.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 05:49:19 -0800 (PST) From: Thomas Schwinge To: Andrew Stubbs , gcc-patches@gcc.gnu.org Subject: GCN: Don't hard-code number of SGPR/VGPR/AVGPR registers (was: [PATCH v3 05/10] GCN back-end code) In-Reply-To: References: User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/29.1 (x86_64-pc-linux-gnu) Date: Thu, 01 Feb 2024 14:49:04 +0100 Message-ID: <87jzno9twv.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789704719266194824 X-GMAIL-MSGID: 1789704719266194824 Hi! On 2018-12-12T11:52:52+0000, Andrew Stubbs wrote: > This patch contains the major part of the GCN back-end. [...] > --- /dev/null > +++ b/gcc/config/gcn/gcn.c > +void > +gcn_hsa_declare_function_name (FILE *file, const char *name, tree) > +{ > + /* Determine count of sgpr/vgpr registers by looking for last > + one used. */ > + for (sgpr = 101; sgpr >= 0; sgpr--) > + if (df_regs_ever_live_p (FIRST_SGPR_REG + sgpr)) > + break; > + sgpr++; > + for (vgpr = 255; vgpr >= 0; vgpr--) > + if (df_regs_ever_live_p (FIRST_VGPR_REG + vgpr)) > + break; > + vgpr++; > --- /dev/null > +++ b/gcc/config/gcn/gcn.h > +#define FIRST_SGPR_REG 0 > +#define SGPR_REGNO(N) ((N)+FIRST_SGPR_REG) > +#define LAST_SGPR_REG 101 > +#define FIRST_VGPR_REG 160 > +#define VGPR_REGNO(N) ((N)+FIRST_VGPR_REG) > +#define LAST_VGPR_REG 415 OK to push "GCN: Don't hard-code number of SGPR/VGPR/AVGPR registers", see attached? Grüße Thomas From ff812668636bce9d203acbcbdc19260f98857e03 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 31 Jan 2024 11:56:59 +0100 Subject: [PATCH] GCN: Don't hard-code number of SGPR/VGPR/AVGPR registers Also add 'STATIC_ASSERT's for number of SGPR/VGPR/AVGPR registers (in '#ifndef USED_FOR_TARGET', as otherwise 'STATIC_ASSERT' isn't available). gcc/ * config/gcn/gcn.cc (gcn_hsa_declare_function_name): Don't hard-code number of SGPR/VGPR/AVGPR registers. * config/gcn/gcn.h: Add a 'STATIC_ASSERT's for number of SGPR/VGPR/AVGPR registers. --- gcc/config/gcn/gcn.cc | 6 +++--- gcc/config/gcn/gcn.h | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc index 9d3ae2ff1110..c56576ffd9a4 100644 --- a/gcc/config/gcn/gcn.cc +++ b/gcc/config/gcn/gcn.cc @@ -6584,15 +6584,15 @@ gcn_hsa_declare_function_name (FILE *file, const char *name, tree decl) /* Determine count of sgpr/vgpr registers by looking for last one used. */ - for (sgpr = 101; sgpr >= 0; sgpr--) + for (sgpr = LAST_SGPR_REG - FIRST_SGPR_REG; sgpr >= 0; sgpr--) if (df_regs_ever_live_p (FIRST_SGPR_REG + sgpr)) break; sgpr++; - for (vgpr = 255; vgpr >= 0; vgpr--) + for (vgpr = LAST_VGPR_REG - FIRST_VGPR_REG; vgpr >= 0; vgpr--) if (df_regs_ever_live_p (FIRST_VGPR_REG + vgpr)) break; vgpr++; - for (avgpr = 255; avgpr >= 0; avgpr--) + for (avgpr = LAST_AVGPR_REG - FIRST_AVGPR_REG; avgpr >= 0; avgpr--) if (df_regs_ever_live_p (FIRST_AVGPR_REG + avgpr)) break; avgpr++; diff --git a/gcc/config/gcn/gcn.h b/gcc/config/gcn/gcn.h index efe3c91511e5..a17f16aacc40 100644 --- a/gcc/config/gcn/gcn.h +++ b/gcc/config/gcn/gcn.h @@ -146,14 +146,23 @@ #define EXEC_HI_REG 127 #define EXECZ_REG 128 #define SCC_REG 129 + /* 132-159 are reserved to simplify masks. */ + #define FIRST_VGPR_REG 160 #define VGPR_REGNO(N) ((N)+FIRST_VGPR_REG) #define LAST_VGPR_REG 415 + #define FIRST_AVGPR_REG 416 #define AVGPR_REGNO(N) ((N)+FIRST_AVGPR_REG) #define LAST_AVGPR_REG 671 +#ifndef USED_FOR_TARGET +STATIC_ASSERT (LAST_SGPR_REG + 1 - FIRST_SGPR_REG == 102); +STATIC_ASSERT (LAST_VGPR_REG + 1 - FIRST_VGPR_REG == 256); +STATIC_ASSERT (LAST_AVGPR_REG + 1 - FIRST_AVGPR_REG == 256); +#endif /* USED_FOR_TARGET */ + /* Frame Registers, and other registers */ #define HARD_FRAME_POINTER_REGNUM 14 @@ -180,9 +189,9 @@ #define HARD_FRAME_POINTER_IS_ARG_POINTER 0 #define HARD_FRAME_POINTER_IS_FRAME_POINTER 0 -#define SGPR_REGNO_P(N) ((N) <= LAST_SGPR_REG) -#define VGPR_REGNO_P(N) ((N)>=FIRST_VGPR_REG && (N) <= LAST_VGPR_REG) -#define AVGPR_REGNO_P(N) ((N)>=FIRST_AVGPR_REG && (N) <= LAST_AVGPR_REG) +#define SGPR_REGNO_P(N) ((N) >= FIRST_SGPR_REG && (N) <= LAST_SGPR_REG) +#define VGPR_REGNO_P(N) ((N) >= FIRST_VGPR_REG && (N) <= LAST_VGPR_REG) +#define AVGPR_REGNO_P(N) ((N) >= FIRST_AVGPR_REG && (N) <= LAST_AVGPR_REG) #define SSRC_REGNO_P(N) ((N) <= SCC_REG && (N) != VCCZ_REG) #define SDST_REGNO_P(N) ((N) <= EXEC_HI_REG && (N) != VCCZ_REG) #define CC_REG_P(X) (REG_P (X) && CC_REGNO_P (REGNO (X))) -- 2.43.0