From patchwork Sun Nov 19 05:36:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1865626 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=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=ezbaSwtM; 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 4SXzsV6z5hz1yS4 for ; Sun, 19 Nov 2023 16:36:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 187DA3857C42 for ; Sun, 19 Nov 2023 05:36:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id 4B2F938582B8 for ; Sun, 19 Nov 2023 05:36:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B2F938582B8 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4B2F938582B8 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700372186; cv=none; b=Y7kbCbrQiyulBYWkvFXDU2onQvo+eLthacrsUXPFuXWWUyRKEDXUekKmiAZPwMcaii/uIj+Pv+ccSO9zIzAqaaXv88YhKp/gBI6iUfnvu5msHGaR+Co3jhDjV5ZmTRJDvlwvnypwJi8WpuT8DAT+gNEu7GcKMJ7oqh+OTcEgsfs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700372186; c=relaxed/simple; bh=yD9jdfUy8rBfPIbhqljuiqkZxZxe/Rn4uaxsQRsGzP4=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=TyfZICOPKa2NyvR/MiIgNrx0nVVIgAmlRqDqKwx/Dp1slmeub7bYm1KwI0t26sjLJXn13hn0KYoVEB/t+f4VPybJ8JEVcozxg4Gi9MlEoAeXyfYNxQt5H5ZOc5iQINQ1iORd+NhO60bcFXSLaZV3IyguWaaQ/cttdh23d+k8AFM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5437269a661so8567076a12.0 for ; Sat, 18 Nov 2023 21:36:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1700372184; x=1700976984; darn=gcc.gnu.org; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=S0kJ1UpnSfG0cSSILBX3Dq3Nl+sb6OqK64wHhs9sRyI=; b=ezbaSwtMLESI+9+0aLsyrgNO7lYkVn98lHEoNJx2DV+1fAxqemHSInoBzUwWQJC6bR UzybuZcW2U74rmatxFjBP8xekjFB7kRqnUzbutkUOcZAk0JdMNH6JtYNAPwm5WnzFruh oPBeOvoxVZ8tKMgnHWALxQZIGFagaulIgtsW39agru7Rz2H9Ge636zxUKXAhjqWGuOfO 2gM2WCIWH4TadPOyDDIa7DUTFiXH+/s15BSgOdYGPd2EXCxWUxcmFF8HEZ1MKk2m3PCg 4vGEPWa5+xZkBwKnOaeEdH9PJPrJuv4VCQ+L+dHzQ/TXIiT2feeaM3hlXIUbL7O+ECG7 zqrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700372184; x=1700976984; h=mime-version:user-agent:references:message-id:in-reply-to:subject :cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S0kJ1UpnSfG0cSSILBX3Dq3Nl+sb6OqK64wHhs9sRyI=; b=HqkAFsys2kzEHwVSm6fMmyhFkevv97wMmQ+7A2ODGFe95kpRNghdKCyORxVsXQ7d81 UewYyYQs2ABqJXZmnMPVjwyPVJ218vz78ZVg+DhmCm5nC6gw4DQwpg0BBygv6AC8qTUh 2jc5kInkJXUXEfU0daPld7dr4RD2KSD4xYw1xnsi8xSp4jSu5K44wUE54AgwkxZ373Op PtsRLXYBwkGnT4bDi1NahcWB9/fGvPxzh09tlPozrXx3t3a0uJvA6qDxlO5XVO0JDRid wqWvDWz5AZ/I0mSul66fMe0PvrmExwN09ezUciU5/SBFYvq/jdRbwPfC0sYHIpWY59Ev GSIA== X-Gm-Message-State: AOJu0Yx4HOr1f9XGQB3G6nddpBJ2aARm2mKgBkpVUNWkx+UwBUYlTKkm JULpF0XQfMDsm34zrHrB3mAamCKRzFmgz/QAKA5G4Q== X-Google-Smtp-Source: AGHT+IFzXi0zzm4TCjBH5/WmoMHR3r5rs0R1R4SWpdzkYb3Rfn6lQjlyRGjWI+Q7mlY3p8i8ixcG/w== X-Received: by 2002:a17:906:3e8a:b0:9ae:659f:4d2f with SMTP id a10-20020a1709063e8a00b009ae659f4d2fmr3089774ejj.26.1700372184101; Sat, 18 Nov 2023 21:36:24 -0800 (PST) Received: from [192.168.219.3] ([78.8.192.131]) by smtp.gmail.com with ESMTPSA id g25-20020a170906349900b009fd541851f4sm160795ejb.198.2023.11.18.21.36.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Nov 2023 21:36:23 -0800 (PST) Date: Sun, 19 Nov 2023 05:36:21 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Andrew Waterman , Jim Wilson , Kito Cheng , Palmer Dabbelt Subject: [PATCH 06/44] RISC-V: Avoid repeated GET_MODE calls in `riscv_expand_conditional_move' In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK autolearn=no 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 Use `mode0' and `mode1' shorthands respectively for `GET_MODE (op0)' and `GET_MODE (op1)' to improve code readability. gcc/ * config/riscv/riscv.cc (riscv_expand_conditional_move): Use `mode0' and `mode1' for `GET_MODE (op0)' and `GET_MODE (op1)'. --- gcc/config/riscv/riscv.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) gcc-riscv-expand-conditional-move-mode-cmp.diff Index: gcc/gcc/config/riscv/riscv.cc =================================================================== --- gcc.orig/gcc/config/riscv/riscv.cc +++ gcc/gcc/config/riscv/riscv.cc @@ -4007,12 +4007,15 @@ riscv_expand_conditional_move (rtx dest, else if (TARGET_ZICOND_LIKE && GET_MODE_CLASS (mode) == MODE_INT) { + machine_mode mode0 = GET_MODE (op0); + machine_mode mode1 = GET_MODE (op1); + /* The comparison must be comparing WORD_MODE objects. We must enforce that so that we don't strip away a sign_extension thinking it is unnecessary. We might consider using riscv_extend_operands if they are not already properly extended. */ - if ((GET_MODE (op0) != word_mode && GET_MODE (op0) != VOIDmode) - || (GET_MODE (op1) != word_mode && GET_MODE (op1) != VOIDmode)) + if ((mode0 != word_mode && mode0 != VOIDmode) + || (mode1 != word_mode && mode1 != VOIDmode)) return false; /* Canonicalize the comparison. It must be an equality comparison @@ -4032,9 +4035,9 @@ riscv_expand_conditional_move (rtx dest, rtx tmp = gen_reg_rtx (word_mode); /* We can support both FP and integer conditional moves. */ - if (INTEGRAL_MODE_P (GET_MODE (XEXP (op, 0)))) + if (INTEGRAL_MODE_P (mode0)) riscv_expand_int_scc (tmp, code, op0, op1, invert_ptr); - else if (FLOAT_MODE_P (GET_MODE (XEXP (op, 0))) + else if (FLOAT_MODE_P (mode0) && fp_scc_comparison (op, GET_MODE (op))) riscv_expand_float_scc (tmp, code, op0, op1); else