From patchwork Wed May 6 15:40:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 1284513 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=MS5doBfj; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 49HLQr5Wkbz9sTb for ; Thu, 7 May 2020 01:40:50 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 42293394D81A; Wed, 6 May 2020 15:40:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42293394D81A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1588779646; bh=I4D0UQNmJKzSknsUSUcUJmbKfISQ6tb3x+8Hly+wAUU=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MS5doBfjdB9mriVBxqHlcFCbCh4f9fPc9FdhZl2jWHzEPOb+/LGrMa0+v/FBdCaPB +NDtPQz35mQVbeY93Zwxfy6iCy+Qbl3pDTqsAhO5UK8f8jxowYnuF5QAhGtEwris/+ hmzwGDX9FMZ46bo6cnF/G55XDFrSSc09O+sc5liw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id D532E3938C25 for ; Wed, 6 May 2020 15:40:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D532E3938C25 Received: by mail-il1-x133.google.com with SMTP id e8so398183ilm.7 for ; Wed, 06 May 2020 08:40:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=I4D0UQNmJKzSknsUSUcUJmbKfISQ6tb3x+8Hly+wAUU=; b=gSPzqv6gYFmeXTPQiOytkl6cORu1w2rfPMquwkBTgjY540qjKUWNnkCHnXRej374qF S0JHOWeP2hDGNsUVDgccfzleD3j33o8cDV2EWf1nhES0R8hH5Bxz9woFzvQLSyyqS50+ yBAM98GUNPtbw3B3Ov1eIuv1YPX5BAmHTF4JXIRESYZtKt4rB/ez00yuUMCi19OTOQiQ omKOoqRA7RDNDo7KzOkN/SSdUu6wtGoUz07+Z06VYa/9DoTe8x/a7hSjOi0xrpzUrGyI KTqxH2yTxqzlcia+DyOCatIY+U/Ccnx0d8AdQXS7gRG2wBfWKj0XydpogkJTYZcMBVyC lVQw== X-Gm-Message-State: AGi0PuZ3fANAT1B4M8faHccUnnPgkjd1B+3Ie5ilYDzLnWT5U7rqs8ne HvcfgmVDKqPnmxjzA3ZFSG/6mLmLa2eatwgHZyFosdxaPm4= X-Google-Smtp-Source: APiQypK8iBynUYYkX+Mmi5X/yx0LDTD9fBgzyMan1Ke3egiK67qxkSbGpbv5WGYwvzYdKQT1TLrHFiubXOEyR9aMfGU= X-Received: by 2002:a92:d211:: with SMTP id y17mr9558649ily.254.1588779643021; Wed, 06 May 2020 08:40:43 -0700 (PDT) MIME-Version: 1.0 Date: Wed, 6 May 2020 17:40:31 +0200 Message-ID: Subject: [committed] i386: Use ADD to implement compares with negated operand [PR94913] To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: , X-Patchwork-Original-From: Uros Bizjak via Gcc-patches From: Uros Bizjak Reply-To: Uros Bizjak Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Use carry flag from addition to implement GEU/LTU compares with negated operand, so e.g. ~x < y compiles to: addq %rsi, %rdi setc %al instead of: notq %rdi cmpq %rsi, %rdi setb %al 2020-05-06 Uroš Bizjak PR target/94913 * config/i386/predicates.md (add_comparison_operator): New predicate. * config/i386/i386.md (compare->add splitter): New splitters. testsuite/ChangeLog: 2020-05-06 Uroš Bizjak PR target/94913 * gcc.target/i386/pr94913-1.c: New test. * gcc.target/i386/pr94913-2.c: Ditto. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}. Committed to mainline. Uros. diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 911ef7a6c4c..5fe851e0312 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -12324,6 +12324,21 @@ ;; Store-flag instructions. +(define_split + [(set (match_operand:QI 0 "nonimmediate_operand") + (match_operator:QI 1 "add_comparison_operator" + [(not:SWI (match_operand:SWI 2 "register_operand")) + (match_operand:SWI 3 "nonimmediate_operand")]))] + "" + [(parallel + [(set (reg:CCC FLAGS_REG) + (compare:CCC + (plus:SWI (match_dup 2) (match_dup 3)) + (match_dup 2))) + (clobber (scratch:SWI))]) + (set (match_dup 0) + (match_op_dup 1 [(reg:CCC FLAGS_REG) (const_int 0)]))]) + (define_split [(set (match_operand:QI 0 "nonimmediate_operand") (match_operator:QI 1 "shr_comparison_operator" @@ -12518,6 +12533,26 @@ ;; Basic conditional jump instructions. +(define_split + [(set (pc) + (if_then_else + (match_operator 1 "add_comparison_operator" + [(not:SWI (match_operand:SWI 2 "register_operand")) + (match_operand:SWI 3 "nonimmediate_operand")]) + (label_ref (match_operand 0)) + (pc)))] + "" + [(parallel + [(set (reg:CCC FLAGS_REG) + (compare:CCC + (plus:SWI (match_dup 2) (match_dup 3)) + (match_dup 2))) + (clobber (scratch:SWI))]) + (set (pc) + (if_then_else (match_op_dup 1 [(reg:CCC FLAGS_REG) (const_int 0)]) + (label_ref (match_operand 0)) + (pc)))]) + (define_split [(set (pc) (if_then_else diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md index 1a5e2210eca..8d8bcb1a765 100644 --- a/gcc/config/i386/predicates.md +++ b/gcc/config/i386/predicates.md @@ -1293,6 +1293,9 @@ (define_predicate "shr_comparison_operator" (match_code "gtu,leu")) +(define_predicate "add_comparison_operator" + (match_code "geu,ltu")) + ;; Return true if OP is a valid comparison operator in valid mode. (define_predicate "ix86_comparison_operator" (match_operand 0 "comparison_operator") diff --git a/gcc/testsuite/gcc.target/i386/pr94913-1.c b/gcc/testsuite/gcc.target/i386/pr94913-1.c new file mode 100644 index 00000000000..f21032d4522 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr94913-1.c @@ -0,0 +1,21 @@ +/* PR target/94913 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +char fooc (unsigned char x, unsigned char y) +{ + return (unsigned char) ~x < y; +} + +short foos (unsigned short x, unsigned short y) +{ + return (unsigned short) ~x < y; +} + +long fooi (unsigned long x, unsigned long y) +{ + return (unsigned long) ~x < y; +} + +/* { dg-final { scan-assembler-not "cmp" } } */ +/* { dg-final { scan-assembler-times "add" 3 } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr94913-2.c b/gcc/testsuite/gcc.target/i386/pr94913-2.c new file mode 100644 index 00000000000..22bca2bf27b --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr94913-2.c @@ -0,0 +1,24 @@ +/* PR target/94913 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +void f1 (void); +void f2 (void); + +void fooc (unsigned char x, unsigned char y) +{ + if ((unsigned char) ~x < y) f1 (); else f2 (); +} + +void foos (unsigned short x, unsigned short y) +{ + if ((unsigned short) ~x < y) f1 (); else f2 (); +} + +void fooi (unsigned long x, unsigned long y) +{ + if ((unsigned long) ~x < y) f1 (); else f2 (); +} + +/* { dg-final { scan-assembler-not "cmp" } } */ +/* { dg-final { scan-assembler-times "add" 3 } } */