From patchwork Tue Mar 26 05:44:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 1065181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-498427-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="lpQ801ec"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jzH6WsnK"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44T0SX5ydyz9sSq for ; Tue, 26 Mar 2019 16:44:25 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=BP2V+XI1+FMUHvcKSeTRlGPpK7Yu0BdQvv0ZzSQYo7GRc/PgJY DURF7DKUHagRnbChRfgt8g3cP/jRWcY0CN6hwETXBU/mgEhryyKR4kLIuB/W3PwF RhkOUEZIXR23RHBndxvUKn+QMqnfNf9VkJUmQRt+eKYJahxejcBo1mOH4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=tpdXRCIEvnZCI5bvsb9elhLZj44=; b=lpQ801ecpR4eGoUR1v/x XrfL2Oxo8gMxqmG7mZX70ax3CQZA5+hk3QyI8nvLHM9/GGz0lw7c9JZIkku0v5dK eLSWRAKW7/K5mra8oP7gJxjZTi7BkZKRYz+veTqEI5KOPedF4eWtM8M97zKI+iBB fa3Q1ZuYT2P68Wj6p+7aZYw= Received: (qmail 35160 invoked by alias); 26 Mar 2019 05:44:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 35149 invoked by uid 89); 26 Mar 2019 05:44:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=estimates, HX-Spam-Relays-External:sk:mail-pg, HX-HELO:sk:mail-pg X-HELO: mail-pg1-f172.google.com Received: from mail-pg1-f172.google.com (HELO mail-pg1-f172.google.com) (209.85.215.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 26 Mar 2019 05:44:14 +0000 Received: by mail-pg1-f172.google.com with SMTP id z9so1432340pgu.10 for ; Mon, 25 Mar 2019 22:44:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=LRymiDJbIn7cKd0zNg6s8girB9k1SXKRfZQR0l0lYow=; b=jzH6WsnKnYChTnk5To5zvwi6cnPL+mZDmMJBoZtvtE+vYAQlrJjWn8eelTjfHP2Arl TBp2ySPqqJuZEADsRUgIRmsBur0kyQxzwU40GB2lEQMFMCZQyT2v5lkbc2gtL7OWeFKl gtU7xdFo20T7AptYZ3SupEZzhLvStFRZaABMToRVra5y31mog0hQMbB4bTBl9aLlRslP dqQ2v81a11k5GcgwrJIrYC/UwW0/3Va2oVZQd0NDFJC94cnJLMLrXwD4/sSu5BQ/Z0qz rDHeSnmASx9+MDDxineM6yn5Px6tt0CmTwP14FnYHk1q+aVMKN/he4zgdOn387S1nPjh jxpg== Received: from bubble.grove.modra.org ([58.175.241.133]) by smtp.gmail.com with ESMTPSA id 17sm25048523pgt.0.2019.03.25.22.44.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 22:44:11 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 03F8A804D6; Tue, 26 Mar 2019 16:14:07 +1030 (ACDT) Date: Tue, 26 Mar 2019 16:14:07 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Cc: Segher Boessenkool Subject: [RS6000] Rename NON_SPECIAL_REGS to GEN_OR_FLOAT_REGS Message-ID: <20190326054407.GC13871@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-IsSubscribed: yes This just chooses a more descriptive name for this register class. Bootstrapped etc. powerpc64le-linux. OK for next stage1? * config/rs6000/rs6000.h: Rename NON_SPECIAL_REGS to GEN_OR_FLOAT_REGS throughout file. * config/rs6000/darwin.h: Likewise. * config/rs6000/rs6000.c: Likewise. diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 6884185f0bc..9fb36e41e7d 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -346,7 +346,7 @@ extern int darwin_emit_branch_islands; && reg_class_subset_p (BASE_REGS, (CLASS))) \ ? BASE_REGS \ : (GET_MODE_CLASS (GET_MODE (X)) == MODE_INT \ - && (CLASS) == NON_SPECIAL_REGS) \ + && (CLASS) == GEN_OR_FLOAT_REGS) \ ? GENERAL_REGS \ : (CLASS)) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 03c91432bff..cc8dc941537 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -20236,7 +20236,7 @@ rs6000_preferred_reload_class (rtx x, enum reg_class rclass) return NO_REGS; } - if (GET_MODE_CLASS (mode) == MODE_INT && rclass == NON_SPECIAL_REGS) + if (GET_MODE_CLASS (mode) == MODE_INT && rclass == GEN_OR_FLOAT_REGS) return GENERAL_REGS; return rclass; @@ -20384,7 +20384,7 @@ rs6000_secondary_reload_class (enum reg_class rclass, machine_mode mode, /* Constants, memory, and FP registers can go into FP registers. */ if ((regno == -1 || FP_REGNO_P (regno)) - && (rclass == FLOAT_REGS || rclass == NON_SPECIAL_REGS)) + && (rclass == FLOAT_REGS || rclass == GEN_OR_FLOAT_REGS)) return (mode != SDmode || lra_in_progress) ? NO_REGS : GENERAL_REGS; /* Memory, and AltiVec registers can go into AltiVec registers. */ @@ -36154,7 +36154,7 @@ rs6000_libcall_value (machine_mode mode) } /* Compute register pressure classes. We implement the target hook to avoid - IRA picking something like NON_SPECIAL_REGS as a pressure class, which can + IRA picking something like GEN_OR_FLOAT_REGS as a pressure class, which can lead to incorrect estimates of number of available registers and therefor increased register pressure/spill. */ static int diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index 3b705255219..ff9449c2d45 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -1138,7 +1138,7 @@ enum reg_class VRSAVE_REGS, VSCR_REGS, SPR_REGS, - NON_SPECIAL_REGS, + GEN_OR_FLOAT_REGS, LINK_REGS, CTR_REGS, LINK_OR_CTR_REGS, @@ -1167,7 +1167,7 @@ enum reg_class "VRSAVE_REGS", \ "VSCR_REGS", \ "SPR_REGS", \ - "NON_SPECIAL_REGS", \ + "GEN_OR_FLOAT_REGS", \ "LINK_REGS", \ "CTR_REGS", \ "LINK_OR_CTR_REGS", \ @@ -1204,7 +1204,7 @@ enum reg_class { 0x00000000, 0x00000000, 0x00000000, 0x00004000 }, \ /* SPR_REGS. */ \ { 0x00000000, 0x00000000, 0x00000000, 0x00010000 }, \ - /* NON_SPECIAL_REGS. */ \ + /* GEN_OR_FLOAT_REGS. */ \ { 0xffffffff, 0xffffffff, 0x00000008, 0x00008000 }, \ /* LINK_REGS. */ \ { 0x00000000, 0x00000000, 0x00000002, 0x00000000 }, \