From patchwork Fri Sep 8 06:00:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 137697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp342799vqo; Thu, 7 Sep 2023 23:01:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQlfHlsO7o4ETo/ACMGa2xsGsRYFROXC2CTnGVaTnU/aIDS9BVqjnsFHBGsw/GVYY/gJfB X-Received: by 2002:a2e:8804:0:b0:2b6:df23:2117 with SMTP id x4-20020a2e8804000000b002b6df232117mr1080163ljh.43.1694152881320; Thu, 07 Sep 2023 23:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694152881; cv=none; d=google.com; s=arc-20160816; b=ej2nnukY9GX/XecTlug1Qn/xnPMQrqVecsglq4HfQwfbkq/h3KwUp/bpO3uOWDAFdI 2+jDqvu2SdV7bzH9CmR55lqMscU0O78lhKw8wlzvzjM9C9ieJeIz6ASLnBXCV2e6zqCZ P0ybJkBUcq04a+zSfqbD0lFzvx1byT+onkwswqB6bguK7nLjAN+A0dx9ideD6wAm4FBK 5QI084zAEGuz5+P3oVODtj3P/9pD3CV53a2/1+f/ImwcefJemauys8wtcbPHfzEW7f58 kmI9ukqOU/n6v/7OBUHumrr4hky2wcG7W7GlURzdJkCk5g4OvKsHbS7AvuYgCyDVPm8S qrJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :dmarc-filter:delivered-to; bh=myKpeBJTCYQOPLAMJdabQRiMlt8P6F84k2f9wTxEEwY=; fh=rhzHQJhq9WV4qpo88d7UFjCUBpstN9AhlgFhCyDisF8=; b=bqVtCEsjacq8mnprpMJr5yga7ecFpMWoWHwyXT4S1ylB8hmmnF9xO7shGzNECsi3tv imLWoGXh1z0t7sYwuRDN8SXGpASq6jlSbocbph+82WqIhrRipX+lIhVGFPuZdGEjPOFz xjADJhowDnveQhkXSFYJkgY3G7wCqWOAUxr61sTVWxfazGuEdst80zjwUnMxy0CnY/EW bmyhgGBEMPZOoXLL/Ff72Vc9y6LVwCFfDUlWxt/Y7bxSwYg3uvjcbP9pDP8NvJO4ULEt HJk/jXvEYlo0nGcHxI4cXDWmEnxu9xXi7rSWk6r7PsnUooo+SpKvoFu3ByRR4qrf1RBZ A3vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@vrull.eu header.s=google header.b=c1iinIMG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b7-20020a170906660700b0099307a5a755si716227ejp.45.2023.09.07.23.01.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 23:01:21 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=fail header.i=@vrull.eu header.s=google header.b=c1iinIMG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 5908C385842C for ; Fri, 8 Sep 2023 06:01:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id E169E3858D1E for ; Fri, 8 Sep 2023 06:00:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E169E3858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-52713d2c606so2263408a12.2 for ; Thu, 07 Sep 2023 23:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1694152848; x=1694757648; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=myKpeBJTCYQOPLAMJdabQRiMlt8P6F84k2f9wTxEEwY=; b=c1iinIMGFwoJd3+ZqX+eGu/GBlf1WhJj1hrntV2XP5Hg1iV75HH5BdoD8Z5YGFNZKL JQ/+Zokr17DAIutPrJYFI25D0mBfe5p0dwqe8Z5Fhvh+X1EnKrPMrnsCdziWzG39eVCm unk1U0a1OfSW67D9wK8yiZ0z4XGtLWfc5XKRql2S8LqBweuikpp9VMd8ffMdD6bjPjmG 1AZ0fErBUrtHHCxGBfdg6/pfazqUfv7Fzd1azW67wjFFbVPUf303e/f0KaQa58Tz/Co/ c4uHnoHMYAeRCBWwE0CoG263mcaGJNdY5r8RJgq4UcDcHNSsc1mzLSgwm43O8JuHZjFb KQhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694152848; x=1694757648; 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=myKpeBJTCYQOPLAMJdabQRiMlt8P6F84k2f9wTxEEwY=; b=GXlniCmR6Y5TKlHPwlXGke7+Z5XdsN1phd4UGyRnXa+8XDDGrcMTHSCp2jMbEiA2t6 rQmqjsJnFO9+S4DZKjwYFoLwUBOZB5mUyz82uxzEpq7bsADriwoEYQHeDJSmaMq2seLp rPp44yP8wACtWG3SsllEa8vIUvhhZn6XGeJt6xT8raGYZNtxIcrnwE7bP5HEs9l1mO3m qrHFYPrVQSre6XHz5IzDpZp5nOeLBG7/MhTJCZQZwVdok7BzxWdVaiA9yDQsDEDu3TiJ YaiOawZsI0TZMJFSmsgj9ISz3CoPoekZLVGwQl5eIjzXchSD0HrsIJjKIrFBbqrROrel g1BQ== X-Gm-Message-State: AOJu0YxSgG/hFYvnVrocImlyc8jkQtmRp3iaBT6nnT/MHzg9ZgtdUQHU Z1IVF+hIKba4evK0LM719BflDvqHvMXkBwkUrUY= X-Received: by 2002:a05:6402:882:b0:52e:1a29:98a with SMTP id e2-20020a056402088200b0052e1a29098amr837881edy.40.1694152848021; Thu, 07 Sep 2023 23:00:48 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id u7-20020aa7d887000000b00528922bb53bsm586307edq.76.2023.09.07.23.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 23:00:47 -0700 (PDT) From: Christoph Muellner To: gcc-patches@gcc.gnu.org, Kito Cheng , Jim Wilson , Palmer Dabbelt , Andrew Waterman , Philipp Tomsich , Jeff Law Subject: [PATCH] riscv: xtheadbb: Fix extendqi insn Date: Fri, 8 Sep 2023 08:00:44 +0200 Message-ID: <20230908060044.1915195-1-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_MANYTO, KAM_SHORT, LIKELY_SPAM_BODY, 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776448051842769831 X-GMAIL-MSGID: 1776448051842769831 From: Christoph Müllner Recently three SPEC CPU 2017 benchmarks broke when using xtheadbb: * 500.perlbench_r * 525.x264_r * 557.xz_r Tracing the issue down revealed, that we emit a 'th.ext xN,xN,15,0' for a extendqi insn, which is obviously wrong. This patch splits the common 'extend2_th_ext' insn into two 'extendqi' and 'extendhi' insns, which emit the right extension instruction. Additionally, this patch adds test cases for these insns. Signed-off-by: Christoph Müllner gcc/ChangeLog: * config/riscv/thead.md (*extend2_th_ext): Remove broken INSN. (*extendhi2_th_ext): New INSN. (*extendqi2_th_ext): New INSN. gcc/testsuite/ChangeLog: * gcc.target/riscv/xtheadbb-ext-2.c: New test. * gcc.target/riscv/xtheadbb-ext-3.c: New test. --- gcc/config/riscv/thead.md | 17 ++++++++++++++--- gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c | 12 ++++++++++++ gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c | 12 ++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c diff --git a/gcc/config/riscv/thead.md b/gcc/config/riscv/thead.md index 29f98dec3a8..05d1b32bd94 100644 --- a/gcc/config/riscv/thead.md +++ b/gcc/config/riscv/thead.md @@ -58,14 +58,25 @@ (define_insn "*th_ext4" [(set_attr "type" "bitmanip") (set_attr "mode" "")]) -(define_insn "*extend2_th_ext" +(define_insn "*extendhi2_th_ext" [(set (match_operand:SUPERQI 0 "register_operand" "=r,r") (sign_extend:SUPERQI - (match_operand:SHORT 1 "nonimmediate_operand" "r,m")))] + (match_operand:HI 1 "nonimmediate_operand" "r,m")))] "TARGET_XTHEADBB" "@ th.ext\t%0,%1,15,0 - l\t%0,%1" + lh\t%0,%1" + [(set_attr "type" "bitmanip,load") + (set_attr "mode" "")]) + +(define_insn "*extendqi2_th_ext" + [(set (match_operand:SUPERQI 0 "register_operand" "=r,r") + (sign_extend:SUPERQI + (match_operand:QI 1 "nonimmediate_operand" "r,m")))] + "TARGET_XTHEADBB" + "@ + th.ext\t%0,%1,7,0 + lb\t%0,%1" [(set_attr "type" "bitmanip,load") (set_attr "mode" "")]) diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c new file mode 100644 index 00000000000..4645b9c56df --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-2.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */ + +signed long extqi(signed char i) +{ + return --i; +} + +/* { dg-final { scan-assembler "th.ext\ta\[0-9\]+,a\[0-9\]+,7,0" } } */ +/* { dg-final { scan-assembler-not "th.ext\ta\[0-9\]+,a\[0-9\]+,15,0" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c new file mode 100644 index 00000000000..2c9ebbc563a --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadbb-ext-3.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_xtheadbb" { target { rv32 } } } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Os" "-Og" "-Oz" } } */ + +signed long exthi(signed short i) +{ + return --i; +} + +/* { dg-final { scan-assembler "th.ext\ta\[0-9\]+,a\[0-9\]+,15,0" } } */ +/* { dg-final { scan-assembler-not "th.ext\ta\[0-9\]+,a\[0-9\]+,7,0" } } */