From patchwork Fri Nov 12 15:29:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1554470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=sodplTg1; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrMvd5t74z9sPf for ; Sat, 13 Nov 2021 02:29:32 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5A0803858035 for ; Fri, 12 Nov 2021 15:29:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5A0803858035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636730968; bh=szzgj489GizU3GM7Au+upzOffffX4rgMerTEjD+UlX4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=sodplTg1qvawDEPyaeoB6azIzX7edbQSpSeuFhfqoZZfwuUfcziLvBSCQawJh/Vxe uMf48Ki1DGnklNECkpqMYeSwsM/r+pWVl39LNskBoTXZWZ+xmZUDAgRcR4im4CuTEX 0STM9t8iYA9uBPaEy3QeMvZLJVZK7routgJjB9eE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id CEE103858402 for ; Fri, 12 Nov 2021 15:29:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CEE103858402 Received: by mail-pl1-x62c.google.com with SMTP id y1so8623572plk.10 for ; Fri, 12 Nov 2021 07:29:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=szzgj489GizU3GM7Au+upzOffffX4rgMerTEjD+UlX4=; b=ZJQTzSKKbpdadRYbTa2c6sgn8Gxiy/cg4NQOk5cePCyLFrIIHgv3/wPCHEXsN0H0zC u2BHWSaT5QUwhkfvZV152a4MnT9Ff9HQpMVu1U+Wo3Hb4N0bqdzYifizg4xN6RAnFD6c s56qjS0qtssGneYk3XH/POrCKmN/J0zEdNz5sRdvdaIv65xSuZiqcoh53isc2ZdLVwDX KYPqdjxbCqYF/uYwDnoUYVa3W66QcmoDhbxvE17H5T7E5Vawt91moslQu5mklolaUnXx BmtFwHVe9ntCUPvjJGeZ0diFZ1sKzod0bZiqPWThh9zs6wCLg/CnKbsV3jbiB288obaN amJQ== X-Gm-Message-State: AOAM532vWH1HV3RxcFFZw7meTE4JqdVU0LoBsA+kKIgBH26AhrxAvVxf baF2k5D0SnFU8GUGIwxWfG9nTiGeYyc= X-Google-Smtp-Source: ABdhPJwkYGs0/2nGKW/gN6D97nAuyqIl4h834BZBASuNTQ7H5TMQT+1BxS3YSoQDljHiTkf5xhlvFg== X-Received: by 2002:a17:90b:4a81:: with SMTP id lp1mr18771004pjb.204.1636730945367; Fri, 12 Nov 2021 07:29:05 -0800 (PST) Received: from gnu-cfl-2.localdomain ([2607:fb90:a63f:468b:b937:402b:0:c66]) by smtp.gmail.com with ESMTPSA id g21sm6776967pfc.95.2021.11.12.07.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 07:29:05 -0800 (PST) Received: from gnu-cfl-2.lan (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id DE3101A0A19; Fri, 12 Nov 2021 07:29:03 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Require TARGET_HIMODE_MATH for HImode atomic bit expanders Date: Fri, 12 Nov 2021 07:29:03 -0800 Message-Id: <20211112152903.117525-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3031.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Jakub Jelinek , liuhongt Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Check optab before transforming equivalent, but slighly different cases to their canonical forms in optimize_atomic_bit_test_and and require TARGET_HIMODE_MATH in HImode atomic bit expanders. gcc/ PR target/103205 * tree-ssa-ccp.c (optimize_atomic_bit_test_and): Check optab before transforming equivalent, but slighly different cases to their canonical forms. * config/i386/sync.md (atomic_bit_test_and_set): Require TARGET_HIMODE_MATH for HImode. (atomic_bit_test_and_complement): Likewise. (atomic_bit_test_and_reset): Likewise. gcc/testsuite/ PR target/103205 * gcc.target/i386/pr103205-1a.c: New test. * gcc.target/i386/pr103205-1b.c: Likewise. * gcc.target/i386/pr103205-2a.c: Likewise. * gcc.target/i386/pr103205-2b.c: Likewise. * gcc.target/i386/pr103205-3.c: Likewise. * gcc.target/i386/pr103205-4.c: Likewise. --- gcc/config/i386/sync.md | 6 ++-- gcc/testsuite/gcc.target/i386/pr103205-1a.c | 27 ++++++++++++++++ gcc/testsuite/gcc.target/i386/pr103205-1b.c | 9 ++++++ gcc/testsuite/gcc.target/i386/pr103205-2a.c | 26 ++++++++++++++++ gcc/testsuite/gcc.target/i386/pr103205-2b.c | 9 ++++++ gcc/testsuite/gcc.target/i386/pr103205-3.c | 11 +++++++ gcc/testsuite/gcc.target/i386/pr103205-4.c | 11 +++++++ gcc/tree-ssa-ccp.c | 34 ++++++++++++--------- 8 files changed, 115 insertions(+), 18 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-1a.c create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-1b.c create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-2a.c create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-2b.c create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-3.c create mode 100644 gcc/testsuite/gcc.target/i386/pr103205-4.c diff --git a/gcc/config/i386/sync.md b/gcc/config/i386/sync.md index 05a835256bb..68c4314c21c 100644 --- a/gcc/config/i386/sync.md +++ b/gcc/config/i386/sync.md @@ -717,7 +717,7 @@ (define_expand "atomic_bit_test_and_set" (match_operand:SWI248 2 "nonmemory_operand") (match_operand:SI 3 "const_int_operand") ;; model (match_operand:SI 4 "const_int_operand")] - "" + "mode != HImode || TARGET_HIMODE_MATH" { emit_insn (gen_atomic_bit_test_and_set_1 (operands[1], operands[2], operands[3])); @@ -753,7 +753,7 @@ (define_expand "atomic_bit_test_and_complement" (match_operand:SWI248 2 "nonmemory_operand") (match_operand:SI 3 "const_int_operand") ;; model (match_operand:SI 4 "const_int_operand")] - "" + "mode != HImode || TARGET_HIMODE_MATH" { emit_insn (gen_atomic_bit_test_and_complement_1 (operands[1], operands[2], @@ -792,7 +792,7 @@ (define_expand "atomic_bit_test_and_reset" (match_operand:SWI248 2 "nonmemory_operand") (match_operand:SI 3 "const_int_operand") ;; model (match_operand:SI 4 "const_int_operand")] - "" + "mode != HImode || TARGET_HIMODE_MATH" { emit_insn (gen_atomic_bit_test_and_reset_1 (operands[1], operands[2], operands[3])); diff --git a/gcc/testsuite/gcc.target/i386/pr103205-1a.c b/gcc/testsuite/gcc.target/i386/pr103205-1a.c new file mode 100644 index 00000000000..3ea74b68059 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-1a.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mtune-ctrl=himode_math" } */ + +extern short foo; + +int +foo1 (void) +{ + return __sync_fetch_and_and(&foo, ~1) & 1; +} + +int +foo2 (void) +{ + return __sync_fetch_and_or (&foo, 1) & 1; +} + +int +foo3 (void) +{ + return __sync_fetch_and_xor (&foo, 1) & 1; +} + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btrw" 1 } } */ +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btsw" 1 } } */ +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btcw" 1 } } */ +/* { dg-final { scan-assembler-not "cmpxchgw" } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr103205-1b.c b/gcc/testsuite/gcc.target/i386/pr103205-1b.c new file mode 100644 index 00000000000..4ce24b5011e --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-1b.c @@ -0,0 +1,9 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mtune-ctrl=^himode_math" } */ + +#include "pr103205-1a.c" + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*cmpxchgw" 3 } } */ +/* { dg-final { scan-assembler-not "btrw" } } */ +/* { dg-final { scan-assembler-not "btsw" } } */ +/* { dg-final { scan-assembler-not "btcw" } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr103205-2a.c b/gcc/testsuite/gcc.target/i386/pr103205-2a.c new file mode 100644 index 00000000000..7eb7122aaaf --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-2a.c @@ -0,0 +1,26 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mtune-ctrl=himode_math" } */ + +extern unsigned short foo; +unsigned short +foo1 (void) +{ + return __sync_fetch_and_and(&foo, ~1) & 1; +} + +unsigned short +foo2 (void) +{ + return __sync_fetch_and_or (&foo, 1) & 1; +} + +unsigned short +foo3 (void) +{ + return __sync_fetch_and_xor (&foo, 1) & 1; +} + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btrw" 1 } } */ +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btsw" 1 } } */ +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*btcw" 1 } } */ +/* { dg-final { scan-assembler-not "cmpxchgw" } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr103205-2b.c b/gcc/testsuite/gcc.target/i386/pr103205-2b.c new file mode 100644 index 00000000000..49be2e2f39d --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-2b.c @@ -0,0 +1,9 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -mtune-ctrl=^himode_math" } */ + +#include "pr103205-2a.c" + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*cmpxchgw" 3 } } */ +/* { dg-final { scan-assembler-not "btrw" } } */ +/* { dg-final { scan-assembler-not "btsw" } } */ +/* { dg-final { scan-assembler-not "btcw" } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr103205-3.c b/gcc/testsuite/gcc.target/i386/pr103205-3.c new file mode 100644 index 00000000000..609a674242c --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-3.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +char sync_fetch_and_and_short_15_a; +int +__attribute__sync_fetch_and_and_short_15 (void) +{ + return __sync_fetch_and_and(&sync_fetch_and_and_short_15_a, ~1) & 1; +} + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*cmpxchgb" 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr103205-4.c b/gcc/testsuite/gcc.target/i386/pr103205-4.c new file mode 100644 index 00000000000..825867cd705 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103205-4.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +unsigned char sync_fetch_and_and_short_15_a; +unsigned char +__attribute__sync_fetch_and_and_short_15 (void) +{ + return __sync_fetch_and_and(&sync_fetch_and_and_short_15_a, ~1) & 1; +} + +/* { dg-final { scan-assembler-times "lock;?\[ \t\]*cmpxchgb" 1 } } */ diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 0f79e9f05bd..fec68b5fc73 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -3366,6 +3366,21 @@ optimize_atomic_bit_test_and (gimple_stmt_iterator *gsip, || !gimple_vdef (call)) return; + switch (fn) + { + case IFN_ATOMIC_BIT_TEST_AND_SET: + optab = atomic_bit_test_and_set_optab; + break; + case IFN_ATOMIC_BIT_TEST_AND_COMPLEMENT: + optab = atomic_bit_test_and_complement_optab; + break; + case IFN_ATOMIC_BIT_TEST_AND_RESET: + optab = atomic_bit_test_and_reset_optab; + break; + default: + return; + } + tree bit = nullptr; mask = gimple_call_arg (call, 1); @@ -3384,6 +3399,10 @@ optimize_atomic_bit_test_and (gimple_stmt_iterator *gsip, if (lhs != use_rhs) return; + if (optab_handler (optab, TYPE_MODE (TREE_TYPE (lhs))) + == CODE_FOR_nothing) + return; + gimple *g; gimple_stmt_iterator gsi; tree var; @@ -3628,21 +3647,6 @@ optimize_atomic_bit_test_and (gimple_stmt_iterator *gsip, } } - switch (fn) - { - case IFN_ATOMIC_BIT_TEST_AND_SET: - optab = atomic_bit_test_and_set_optab; - break; - case IFN_ATOMIC_BIT_TEST_AND_COMPLEMENT: - optab = atomic_bit_test_and_complement_optab; - break; - case IFN_ATOMIC_BIT_TEST_AND_RESET: - optab = atomic_bit_test_and_reset_optab; - break; - default: - return; - } - if (optab_handler (optab, TYPE_MODE (TREE_TYPE (lhs))) == CODE_FOR_nothing) return;