From patchwork Thu Sep 14 19:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 139794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp566841vqi; Thu, 14 Sep 2023 12:11:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+jKjspnNhJm2v4g/gH8YIeOhMJa40RCCB4WVqaavCErW4+za4AYtstHSYZku3RygyKFL6 X-Received: by 2002:a05:6402:134b:b0:52b:d169:b373 with SMTP id y11-20020a056402134b00b0052bd169b373mr5019955edw.32.1694718710014; Thu, 14 Sep 2023 12:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694718710; cv=none; d=google.com; s=arc-20160816; b=PvyvrasC4apcon9uU3IXnXRWq+859GyiLdUeKM/Ip9PwzisOZ5cydX3RAJXclfRLb5 s+AF9ir8SQ9JpKcSeRXv3dhZSD8dqsplKkT+Rk58j2wOyAzDiXHiXGcdSx9h09N6D/5H pq8sxegEuIF6zEEXBYjpP3KLy8H9hMfSTE6r7Ou64AGxsZSWeXmXP3pGDJ5baqpgSkxH W79Ex/IHwbZLrVIVHqDkJ43glByKR7ZRXJcZvJ90HKDSmcPBs2fbrpmonO7xw8janKQf IRZdCEPpEIueDKwKyrP96lkW74EGEPwVhnCxuZ0cbpfFuEXn7XxsxDgyyYUkcVVwCmtJ CQ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=6LKdcs9IOUF1bJW5IaEo2wAxFJZjNcVcCpWubswmQDc=; fh=4phMKkteGv1PErctpPXBMUZ9zlI/RCMjc+gelCCT6Xc=; b=byLML0s6lKTHDkKr8xV62Zxsj80Blm6v6kH5Hpg/nI6oAUbMXhx+lFMQoG9b4U01eE 5wqmxXXi8bHYwc+PTe2a2Bck2c+J6b7xIp/SFpkK9NrblMpnM471ib2NVmo3kYPdWwPF 7sUsY+4WywU93G473CPUV5T+bLk0J32lzZHPRKAymF03JH/AcgOkO1Yic0XSlqFe13uW hvlrilVgvn2v6TsuVH+uFU7styWlCTIl2JdMAg8l5vnkTOt7+aOetpmrUQkbE2OdczXZ IwhdiHhvrZU635/0E7R/YMZnnNyRO7ivHwqtySYgbomh7Fc0lQoN5YsLcLj4ppPpscu1 +NXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=g6FWZyQp; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v4-20020aa7d644000000b0052a48148227si1941475edr.361.2023.09.14.12.11.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 12:11:49 -0700 (PDT) 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=@gcc.gnu.org header.s=default header.b=g6FWZyQp; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A69403857C44 for ; Thu, 14 Sep 2023 19:11:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A69403857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694718708; bh=6LKdcs9IOUF1bJW5IaEo2wAxFJZjNcVcCpWubswmQDc=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=g6FWZyQp9jFYXXaOsMc1RsjaYmfkalQtsqci5tbgUpT4nylqxWpnZD+/gK7BytHjH TNjNU/JKevH/5iV40JgtXO4I3MsWr/8TXLKbgOrwv+JgLIizBv/0lgnmCH5NAfQ9Of cvJJkyqo+y0LGG5yjnbxzYSg8UDGDRB3B8xmZyfc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 20C403858CDA for ; Thu, 14 Sep 2023 19:11:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 20C403858CDA Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68fbd31d9deso1227466b3a.3 for ; Thu, 14 Sep 2023 12:11:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694718660; x=1695323460; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6LKdcs9IOUF1bJW5IaEo2wAxFJZjNcVcCpWubswmQDc=; b=jnaMcrADaHbwFhcL0nvV8rh3UG8iMtAlTnLJYX06Aa2lVGTs+wfFHsR2adn0lkzZRx AdsmWsjP1Shk+hnOIggpRDhjqoj7I7DsNX8DJeExZk5kcqbbYJXeYfcS8WtfXBb8AqRb pfvRhOy3N67wrhq1PJItP3AfM8ZbpZkYX7G9Xc49ue+hSpbdDZB3lNLc4xLs4O6dq6K7 uPuax4+RgppRd7FOLdsiqvmPO4HdTgJ6RPOZIOxLl9TI8lDbc3Ez1Mm71SGfs0r4Vnad Jn0B3bDS+Ja+NlWgJFTW7nacG4NB6iPOEI9syFEUvQ/SafxKTmJeUcu7iEHRpP48YRKv On7w== X-Gm-Message-State: AOJu0YyhKOByTYPYGnJlhBcXFkwvV9afd14gzvTJM2xqKl8DojiE6ltI z6aLvLQPjcIFOBjL/5ylkXlBE8rWd+U= X-Received: by 2002:a05:6a21:3e05:b0:154:d3ac:2063 with SMTP id bk5-20020a056a213e0500b00154d3ac2063mr5534766pzc.27.1694718659591; Thu, 14 Sep 2023 12:10:59 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:646:a201:19d0:6a05:3448:a669:ff94]) by smtp.gmail.com with ESMTPSA id bu13-20020a63294d000000b00577d53c50f7sm1497201pgb.75.2023.09.14.12.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 12:10:59 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Takayuki 'January June' Suwa , Max Filippov Subject: [COMMITTED] gcc: xtensa: use salt/saltu in xtensa_expand_scc Date: Thu, 14 Sep 2023 12:10:50 -0700 Message-Id: <20230914191050.717517-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: , X-Patchwork-Original-From: Max Filippov via Gcc-patches From: Max Filippov Reply-To: Max Filippov Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777041365887289741 X-GMAIL-MSGID: 1777041365887289741 gcc/ * config/xtensa/predicates.md (xtensa_cstoresi_operator): Add unsigned comparisons. * config/xtensa/xtensa.cc (xtensa_expand_scc): Add code generation of salt/saltu instructions. * config/xtensa/xtensa.h (TARGET_SALT): New macro. * config/xtensa/xtensa.md (salt, saltu): New instruction patterns. --- gcc/config/xtensa/predicates.md | 2 +- gcc/config/xtensa/xtensa.cc | 55 +++++++++++++++++++++++++++++++++ gcc/config/xtensa/xtensa.h | 1 + gcc/config/xtensa/xtensa.md | 20 ++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md index a3575a688923..672fb003a6c5 100644 --- a/gcc/config/xtensa/predicates.md +++ b/gcc/config/xtensa/predicates.md @@ -195,7 +195,7 @@ (match_code "plus,minus")) (define_predicate "xtensa_cstoresi_operator" - (match_code "eq,ne,gt,ge,lt,le")) + (match_code "eq,ne,gt,ge,lt,le,gtu,geu,ltu,leu")) (define_predicate "xtensa_shift_per_byte_operator" (match_code "ashift,ashiftrt,lshiftrt")) diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc index 2481b028ca12..a4f8e3e49d06 100644 --- a/gcc/config/xtensa/xtensa.cc +++ b/gcc/config/xtensa/xtensa.cc @@ -995,6 +995,61 @@ xtensa_expand_scc (rtx operands[4], machine_mode cmp_mode) rtx one_tmp, zero_tmp; rtx (*gen_fn) (rtx, rtx, rtx, rtx, rtx); + if (cmp_mode == SImode && TARGET_SALT) + { + rtx a = operands[2], b = force_reg (SImode, operands[3]); + enum rtx_code code = GET_CODE (operands[1]); + bool invert_res = false; + + switch (code) + { + case GE: + case GEU: + invert_res = true; + break; + case GT: + case GTU: + std::swap (a, b); + break; + case LE: + case LEU: + invert_res = true; + std::swap (a, b); + break; + default: + break; + } + + switch (code) + { + case GE: + case GT: + case LE: + case LT: + emit_insn (gen_salt (dest, a, b)); + if (!invert_res) + return 1; + break; + case GEU: + case GTU: + case LEU: + case LTU: + emit_insn (gen_saltu (dest, a, b)); + if (!invert_res) + return 1; + break; + default: + break; + } + + if (invert_res) + { + emit_insn (gen_negsi2 (dest, dest)); + emit_insn (gen_addsi3 (dest, dest, const1_rtx)); + return 1; + } + } + if (! (cmp = gen_conditional_move (GET_CODE (operands[1]), cmp_mode, operands[2], operands[3]))) return 0; diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h index 34e06afcff48..5987681e5496 100644 --- a/gcc/config/xtensa/xtensa.h +++ b/gcc/config/xtensa/xtensa.h @@ -54,6 +54,7 @@ along with GCC; see the file COPYING3. If not see #define TARGET_WINDOWED_ABI xtensa_windowed_abi #define TARGET_DEBUG XCHAL_HAVE_DEBUG #define TARGET_L32R XCHAL_HAVE_L32R +#define TARGET_SALT (XTENSA_MARCH_EARLIEST >= 260000) #define TARGET_DEFAULT (MASK_SERIALIZE_VOLATILE) diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md index 6476fdc395ae..20af1cbfbd03 100644 --- a/gcc/config/xtensa/xtensa.md +++ b/gcc/config/xtensa/xtensa.md @@ -2393,6 +2393,26 @@ DONE; }) +(define_insn "salt" + [(set (match_operand:SI 0 "register_operand" "=a") + (lt:SI (match_operand:SI 1 "register_operand" "r") + (match_operand:SI 2 "register_operand" "r")))] + "TARGET_SALT" + "salt\t%0, %1, %2" + [(set_attr "type" "arith") + (set_attr "mode" "SI") + (set_attr "length" "3")]) + +(define_insn "saltu" + [(set (match_operand:SI 0 "register_operand" "=a") + (ltu:SI (match_operand:SI 1 "register_operand" "r") + (match_operand:SI 2 "register_operand" "r")))] + "TARGET_SALT" + "saltu\t%0, %1, %2" + [(set_attr "type" "arith") + (set_attr "mode" "SI") + (set_attr "length" "3")]) + (define_expand "cstoresf4" [(match_operand:SI 0 "register_operand") (match_operator:SI 1 "comparison_operator"