From patchwork Sun Nov 19 05:44:07 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: 1865663 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=WdgckF6N; 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 4SY02W2PZVz1yRg for ; Sun, 19 Nov 2023 16:44:35 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABF58384F488 for ; Sun, 19 Nov 2023 05:44:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 2F02A38654B2 for ; Sun, 19 Nov 2023 05:44:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F02A38654B2 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 2F02A38654B2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::534 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700372652; cv=none; b=nfRChWNR9aSanqT/05BzZNh1hX+GZ8IIUaZRNEmJV2iB2r1qQroQt9KxO7+hNrFLTgbbp0zdvcsIOesHJl8w9YxaKT6ILWEHGohoRz16tTKJpahpcDNRn8W7oUAkHfjrPjTCzKVL6r/c7z5JC0Kxo7sr3QEV9m4K5cWss8DfQtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700372652; c=relaxed/simple; bh=fIFdWAnuZ+ky7Vu5cnxFJoY8PszuXY8Tb03G2MRy/6A=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=Z3WSmWB41zZOBxFkwx7wpi7ktVprpdjqOrBQqyXUalQEzPRxIOBM6LvbAG6/Sg7IUBiI9x0ERDauOd6TemUUjyVuFaj2AoNeO0RGR7XH03JQrbvBJClNXVa3ftMwPIlfci1tPIS4WnZY0lpsd38WlB+BDJ7RuZxV9ubmw3DJKgA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-53e04b17132so4712038a12.0 for ; Sat, 18 Nov 2023 21:44:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1700372650; x=1700977450; 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=9z1D1R+lw6s5FeHvkKFF3kLrU6zg9GKEbDDMNq0C9x0=; b=WdgckF6NGzrbtCQImYS3WBl9uRl9Ky0A760q0BQ99knMQXJIQ3j8tjOVvXWMY16xS1 yo57TOomoo4jK9odcit85Jzn7TYct7fOCvHR9zXKFm3SB/4Z7bPrOMtQaPdpQVK6rhao /BezxLWUUdBisJ/vOQYDEjCcPasDBtXkFgaL05GK2tTB6jslP0G1+e8T8Bg9fXhGXRLw 5Fe0bc6viC08ElYpQJZfOITdOAQzN2TD7uy5TAL7MB7IjLZvfNB3stwab0E51Lo/jhh8 GtE1pziknIRYRg3vQ+Lxhm1y9jTAKoNS1y1XxH8mIv1oentnFlnwwpibU1FUwxLTp5JW Mo4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700372650; x=1700977450; 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=9z1D1R+lw6s5FeHvkKFF3kLrU6zg9GKEbDDMNq0C9x0=; b=hnaIjM7jGACnljxqISgXGDOoetyDc74yi3ZoAztVI+vWvtc6WkUHiSs26jtA0GLv9s ZEuljiFoUQbwVrB5EmcVuNOCkhRMdW4RpPl/uGt6y6WLvcbHPEmrGjGqaGUDPhdIUQ7F BiHA3EAWC3j39MrkB+rx8LFKWRcPa0IdZka1AJu6jVHEUn/HiurfIxebkwu1lrszqd9g X8Dom5qz0fKy/KVGWx3H/EqWx0BVF8a1AdJKAbhFcyax4mEsXzpCfCYLJaMDYPAbaDjQ ia4WGuJN9c0ibm1Xlx3m8r7IrG4B55ufajx2Wt0AG8gUYsMaB2Uc1o/poJT5LLFqnEeI r6vQ== X-Gm-Message-State: AOJu0Yxcp5jXJMmw5NWIwtJc5b0U5oDn1P2ohddb1P45zQR2s4J6oFal PtTj/8i0zxW1j0hke8eD1L/LxuJtMiAb44ujq8x70g== X-Google-Smtp-Source: AGHT+IFSRvY5PjtD0ZtKbed6XARzCJWjzY2LLABd5quaBgN5L8Rd1ZmS/49TXy1kqw3vUchhIsnxYQ== X-Received: by 2002:aa7:d981:0:b0:548:a0e8:4e51 with SMTP id u1-20020aa7d981000000b00548a0e84e51mr553652eds.39.1700372649923; Sat, 18 Nov 2023 21:44:09 -0800 (PST) Received: from [192.168.219.3] ([78.8.192.131]) by smtp.gmail.com with ESMTPSA id k16-20020a17090632d000b009ddaf5ebb6fsm2559970ejk.177.2023.11.18.21.44.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Nov 2023 21:44:09 -0800 (PST) Date: Sun, 19 Nov 2023 05:44:07 +0000 (GMT) From: "Maciej W. Rozycki" To: gcc-patches@gcc.gnu.org cc: Andrew Waterman , Jim Wilson , Kito Cheng , Palmer Dabbelt Subject: [PATCH 43/44] RISC-V/testsuite: Add branched cases for FP NE cond-add operation 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=-0.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, KAM_SHORT, LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 Verify, for the generic floating-point NE conditional-add operation, that if-conversion does *not* trigger at `-mbranch-cost=2' setting, which makes original branched code sequences cheaper than their branchless equivalents if-conversion would emit. gcc/testsuite/ * gcc.target/riscv/adddibfne.c: New test. * gcc.target/riscv/addsibfne.c: New test. --- gcc/testsuite/gcc.target/riscv/adddibfne.c | 26 ++++++++++++++++++++++++++ gcc/testsuite/gcc.target/riscv/addsibfne.c | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) gcc-riscv-test-addccne-branch-generic.diff Index: gcc/gcc/testsuite/gcc.target/riscv/adddibfne.c =================================================================== --- /dev/null +++ gcc/gcc/testsuite/gcc.target/riscv/adddibfne.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target rv64 } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */ +/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" } */ + +typedef int __attribute__ ((mode (DI))) int_t; + +int_t +adddifne (double w, double x, int_t y, int_t z) +{ + return w != x ? y + z : y; +} + +/* Expect branched assembly like: + + feq.d a5,fa0,fa1 + bne a5,zero,.L2 + add a0,a0,a1 +.L2: + */ + +/* { dg-final { scan-rtl-dump-not "Conversion succeeded on pass \[0-9\]+\\." "ce1" } } */ +/* { dg-final { scan-rtl-dump-not "if-conversion succeeded through" "ce1" } } */ +/* { dg-final { scan-assembler-times "\\sfeq\\.d\\s" 1 } } */ +/* { dg-final { scan-assembler-times "\\s(?:beq|bne)\\s" 1 } } */ +/* { dg-final { scan-assembler-not "\\s(?:seqz|snez)\\s" } } */ Index: gcc/gcc/testsuite/gcc.target/riscv/addsibfne.c =================================================================== --- /dev/null +++ gcc/gcc/testsuite/gcc.target/riscv/addsibfne.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" "-Os" "-Oz" } } */ +/* { dg-options "-march=rv32gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv32 } } } */ +/* { dg-options "-march=rv64gc -mtune=sifive-5-series -mbranch-cost=2 -mmovcc -fdump-rtl-ce1" { target { rv64 } } } */ + +typedef int __attribute__ ((mode (SI))) int_t; + +int_t +addsifne (double w, double x, int_t y, int_t z) +{ + return w != x ? y + z : y; +} + +/* Expect branched assembly like: + + feq.d a5,fa0,fa1 + bne a5,zero,.L2 + add[w] a0,a0,a1 +.L2: + */ + +/* { dg-final { scan-rtl-dump-not "Conversion succeeded on pass \[0-9\]+\\." "ce1" } } */ +/* { dg-final { scan-rtl-dump-not "if-conversion succeeded through" "ce1" } } */ +/* { dg-final { scan-assembler-times "\\sfeq\\.d\\s" 1 } } */ +/* { dg-final { scan-assembler-times "\\s(?:beq|bne)\\s" 1 } } */ +/* { dg-final { scan-assembler-not "\\s(?:seqz|snez)\\s" } } */