From patchwork Sat Feb 13 20:24:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Wilson X-Patchwork-Id: 1440248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=ayaATzTp; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DdML65GXrz9sBJ for ; Sun, 14 Feb 2021 07:24:59 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2CB613892454; Sat, 13 Feb 2021 20:24:57 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id B1B3538618B8 for ; Sat, 13 Feb 2021 20:24:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B1B3538618B8 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jimw@sifive.com Received: by mail-pl1-x632.google.com with SMTP id d13so1613467plg.0 for ; Sat, 13 Feb 2021 12:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id; bh=RBDy7Tk7fh2gdFBzl9pCAT1jog9tdsci537k1jQZZi4=; b=ayaATzTpJTvDRxFuKCEaUOwuNJZK7uxva+UJuo33Ei7HsvOT3kkdfu0Q8R6MiiNVwV grQso423qqHoR+wTQZdU2WDZYiMrobCAuOK7x8QRb4EPArSovJMhihPwMBLwuqUwRCaI f6Ik19aLKfrIwMUrRYBEXTCu1+jf9oW9OjD/6Fn4xG+MAxb1FrL8mVmDzhQPK2jZWdsT HXG+Uk/czl+NuNbH8loLHHATxD+JKH1Y/aZeZBfw9TaJIHv73xeghDZcNYcKwHZCnPlW tHKukdXiWHQfSU0Ug5dY2vtD7bQFl2pM9MvDU+oADGw/xhHm12DZ6qfOH36QzMqIm+mG gw/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RBDy7Tk7fh2gdFBzl9pCAT1jog9tdsci537k1jQZZi4=; b=qiCaPH3fB1wyK6DmJ+hGklsgTWmDQ0r2X5O2XST0q3nOIzzsqURMHF0MmmL5Kq0b2R Apv3RfOorNUsRCC2h13vI4VLTZmxJjpNTTlRJUF19od1qK82k4AqLsMvsR5+BRAGBdkk sSnJuaqFS/697u1BiBm5UsDduYxEl6faqDpvxURHz6vr4ZBw6xfLGtPqbjF5mykXHAeg k7ZLCdKggTKMMwQJnifRckbKp5Whg1NcL8/MmXVw9WrRdfxVB1eY7EcO81LaPTMbyHgx BOiLEku5b14+PIGwdHold1tgeTaqvYxZ2qJasWi6eN9LF6ZKJ4DFUMiEZH2LPUUD+NyF 3CYw== X-Gm-Message-State: AOAM532FAPa97PRxiozKmIpFN+ooExPm7Rl5HJxQCjJQMzx+Ccwct/cd +TW3Xrt5RDetfKS35pPx3C3qDt1BZm22Mg== X-Google-Smtp-Source: ABdhPJxeNr/FWH7o45iwh41MRuTkNtF52BA3CjnT/nBLC0plRqxlmfXThqLIT6NtV2RoToy5m0LykA== X-Received: by 2002:a17:902:8342:b029:e1:1465:4bf0 with SMTP id z2-20020a1709028342b02900e114654bf0mr7954849pln.76.1613247893309; Sat, 13 Feb 2021 12:24:53 -0800 (PST) Received: from rohan.hsd1.ca.comcast.net ([2601:646:c180:b150:e8ee:15df:b599:9672]) by smtp.gmail.com with ESMTPSA id k4sm12595859pfk.44.2021.02.13.12.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 12:24:52 -0800 (PST) From: Jim Wilson To: gcc-patches@gcc.gnu.org Subject: [PATCH] RISC-V: Shorten memrefs improvement, partial fix 97417. Date: Sat, 13 Feb 2021 12:24:27 -0800 Message-Id: <20210213202427.4855-1-jimw@sifive.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" We already have a check for riscv_shorten_memrefs in riscv_address_cost. This adds the same check to riscv_rtx_costs. Making this work also requires a change to riscv_compressed_lw_address_p to work before reload by checking the offset and assuming any pseudo reg is OK. Testing shows that this consistently gives small code size reductions. Tested with riscv32-elf rv32imac/ilp32 and riscv64-linux rv64gc/lp64d builds and checks and there were no regressions. Committed. gcc/ PR target/97417 * config/riscv/riscv.c (riscv_compressed_lw_address_p): Drop early exit when !reload_completed. Only perform check for compressed reg if reload_completed. (riscv_rtx_costs): In MEM case, when optimizing for size and shorten memrefs, if not compressible, then increase cost. --- gcc/config/riscv/riscv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index ff41795a031..7d274596ba3 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -891,17 +891,13 @@ riscv_compressed_lw_address_p (rtx x) bool result = riscv_classify_address (&addr, x, GET_MODE (x), reload_completed); - /* Before reload, assuming all load/stores of valid addresses get compressed - gives better code size than checking if the address is reg + small_offset - early on. */ - if (result && !reload_completed) - return true; - /* Return false if address is not compressed_reg + small_offset. */ if (!result || addr.type != ADDRESS_REG - || (!riscv_compressed_reg_p (REGNO (addr.reg)) - && addr.reg != stack_pointer_rtx) + /* Before reload, assume all registers are OK. */ + || (reload_completed + && !riscv_compressed_reg_p (REGNO (addr.reg)) + && addr.reg != stack_pointer_rtx) || !riscv_compressed_lw_offset_p (addr.offset)) return false; @@ -1708,6 +1704,13 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN instructions it needs. */ if ((cost = riscv_address_insns (XEXP (x, 0), mode, true)) > 0) { + /* When optimizing for size, make uncompressible 32-bit addresses + more expensive so that compressible 32-bit addresses are + preferred. */ + if (TARGET_RVC && !speed && riscv_mshorten_memrefs && mode == SImode + && !riscv_compressed_lw_address_p (XEXP (x, 0))) + cost++; + *total = COSTS_N_INSNS (cost + tune_param->memory_cost); return true; }