From patchwork Tue Aug 27 11:52:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Li, Pan2" X-Patchwork-Id: 1977276 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=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=QziphNtN; 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 4WtQtc3cXvz1yXd for ; Tue, 27 Aug 2024 21:54:00 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 41937385DDFC for ; Tue, 27 Aug 2024 11:53:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by sourceware.org (Postfix) with ESMTPS id B836A385DDFC for ; Tue, 27 Aug 2024 11:53:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B836A385DDFC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B836A385DDFC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724759617; cv=none; b=ic7ajMW819zPMR6eaEZT1bHtgKKddt6ZtMBDPZJdrWtn+BZ1gkZrUYr4Jy76ujACoDBtWkIZPTFZQnRs3HM9aWeZdxKoVz2P/6Retoq5g6hDHjz1G7Qx8BuOZyHyWZwxgdPNcjJDaXpY/kJJTqxzjEAi2/eKbQKFrlq7lU3oSG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724759617; c=relaxed/simple; bh=hUI11bVSazYsIlimJsan4wK4YmlTdR2b9UtEmOkM2lU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=WADVI9FbXgvI2cu8QkZ/zDMkknBvqRbMqy1zTd2m4N60sl2cCqqTPyGx0/tecKX0bADOx1hRP2shQkwnkxUhj2po/yjM7F6n/HdLaOiuHFTB6UO/jGjNwLL2y+aY0N8c01Dx34mgLd3kjJMNXIhLVGiXwdFhhGEYcWS6C9in5ak= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724759615; x=1756295615; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hUI11bVSazYsIlimJsan4wK4YmlTdR2b9UtEmOkM2lU=; b=QziphNtNAi08PeaMBn3rBqA3uhmokzLVV704XJDLWCCZ6xjwEzqQrElZ OC8hmgfTMBsBwL/8DsJnf7ngtvirAKN2Wub+Zj0fTpOAjgy6HHnAv+ln3 7wtUOcTKwKgmiDGiiT1oznA/T0Pk11IhSAzJ7mXM+6kQGRur+qgk/QMqZ NLfw7tNspf7DlnF7PoSrc0otqYH8TUv9KjfWHZJ0UbEkaa55PSQ+D/U2C 7BZVeheCg8FDK+UuJeiCA9k8zwyPbNZJH/cBZ7OogcFFWVbXM35IHAplc Tuhru2kYVDCICngJUC/H+lk3/Vc1E5ifVfX28DIwCnKmkqw4bwGKn7k0c g==; X-CSE-ConnectionGUID: 0QBe8UzUSJO9IjsH91DFvQ== X-CSE-MsgGUID: YJPoXMgdQHCopWEgdNRy4Q== X-IronPort-AV: E=McAfee;i="6700,10204,11176"; a="22824302" X-IronPort-AV: E=Sophos;i="6.10,180,1719903600"; d="scan'208";a="22824302" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2024 04:53:33 -0700 X-CSE-ConnectionGUID: 8OCEfNquS2qwzObDi2b9DQ== X-CSE-MsgGUID: PavrFxVGSf2vW98LifyGrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,180,1719903600"; d="scan'208";a="100336617" Received: from panli.sh.intel.com ([10.239.154.73]) by orviesa001.jf.intel.com with ESMTP; 27 Aug 2024 04:53:31 -0700 From: pan2.li@intel.com To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com, Tamar.Christina@arm.com, juzhe.zhong@rivai.ai, kito.cheng@gmail.com, jeffreyalaw@gmail.com, rdapp.gcc@gmail.com, Pan Li Subject: [PATCH v4] Match: Support form 1 for scalar signed integer .SAT_ADD Date: Tue, 27 Aug 2024 19:52:56 +0800 Message-ID: <20240827115256.1379618-1-pan2.li@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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~incoming=patchwork.ozlabs.org@gcc.gnu.org From: Pan Li This patch would like to support the form 1 of the scalar signed integer .SAT_ADD. Aka below example: Form 1: #define DEF_SAT_S_ADD_FMT_1(T, UT, MIN, MAX) \ T __attribute__((noinline)) \ sat_s_add_##T##_fmt_1 (T x, T y) \ { \ T sum = (UT)x + (UT)y; \ return (x ^ y) < 0 \ ? sum \ : (sum ^ x) >= 0 \ ? sum \ : x < 0 ? MIN : MAX; \ } DEF_SAT_S_ADD_FMT_1(int64_t, uint64_t, INT64_MIN, INT64_MAX) We can tell the difference before and after this patch if backend implemented the ssadd3 pattern similar as below. Before this patch: 4 │ __attribute__((noinline)) 5 │ int64_t sat_s_add_int64_t_fmt_1 (int64_t x, int64_t y) 6 │ { 7 │ int64_t sum; 8 │ long unsigned int x.0_1; 9 │ long unsigned int y.1_2; 10 │ long unsigned int _3; 11 │ long int _4; 12 │ long int _5; 13 │ int64_t _6; 14 │ _Bool _11; 15 │ long int _12; 16 │ long int _13; 17 │ long int _14; 18 │ long int _16; 19 │ long int _17; 20 │ 21 │ ;; basic block 2, loop depth 0 22 │ ;; pred: ENTRY 23 │ x.0_1 = (long unsigned int) x_7(D); 24 │ y.1_2 = (long unsigned int) y_8(D); 25 │ _3 = x.0_1 + y.1_2; 26 │ sum_9 = (int64_t) _3; 27 │ _4 = x_7(D) ^ y_8(D); 28 │ _5 = x_7(D) ^ sum_9; 29 │ _17 = ~_4; 30 │ _16 = _5 & _17; 31 │ if (_16 < 0) 32 │ goto ; [41.00%] 33 │ else 34 │ goto ; [59.00%] 35 │ ;; succ: 3 36 │ ;; 4 37 │ 38 │ ;; basic block 3, loop depth 0 39 │ ;; pred: 2 40 │ _11 = x_7(D) < 0; 41 │ _12 = (long int) _11; 42 │ _13 = -_12; 43 │ _14 = _13 ^ 9223372036854775807; 44 │ ;; succ: 4 45 │ 46 │ ;; basic block 4, loop depth 0 47 │ ;; pred: 2 48 │ ;; 3 49 │ # _6 = PHI 50 │ return _6; 51 │ ;; succ: EXIT 52 │ 53 │ } After this patch: 4 │ __attribute__((noinline)) 5 │ int64_t sat_s_add_int64_t_fmt_1 (int64_t x, int64_t y) 6 │ { 7 │ int64_t _4; 8 │ 9 │ ;; basic block 2, loop depth 0 10 │ ;; pred: ENTRY 11 │ _4 = .SAT_ADD (x_5(D), y_6(D)); [tail call] 12 │ return _4; 13 │ ;; succ: EXIT 14 │ 15 │ } The below test suites are passed for this patch. * The rv64gcv fully regression test. * The x86 bootstrap test. * The x86 fully regression test. gcc/ChangeLog: * match.pd: Add the matching for signed .SAT_ADD. * tree-ssa-math-opts.cc (gimple_signed_integer_sat_add): Add new matching func decl. (match_unsigned_saturation_add): Try signed .SAT_ADD and rename to ... (match_saturation_add): ... here. (math_opts_dom_walker::after_dom_children): Update the above renamed func from caller. Signed-off-by: Pan Li --- gcc/match.pd | 15 +++++++++++++++ gcc/tree-ssa-math-opts.cc | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/gcc/match.pd b/gcc/match.pd index 78f1957e8c7..09a36159163 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -3192,6 +3192,21 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (if (INTEGRAL_TYPE_P (type) && TYPE_UNSIGNED (type) && types_match (type, @0)))) +/* Signed saturation add, case 1: + T sum = (T)((UT)X + (UT)Y) + SAT_S_ADD = (X ^ sum) & !(X ^ Y) < 0 ? (-(T)(X < 0) ^ MAX) : sum; + + The T and UT are type pair like T=int8_t, UT=uint8_t. */ +(match (signed_integer_sat_add @0 @1) + (cond^ (lt (bit_and:c (bit_xor:c @0 (nop_convert@2 (plus (nop_convert @0) + (nop_convert @1)))) + (bit_not (bit_xor:c @0 @1))) + integer_zerop) + (bit_xor:c (negate (convert (lt @0 integer_zerop))) max_value) + @2) + (if (INTEGRAL_TYPE_P (type) && !TYPE_UNSIGNED (type) + && types_match (type, @0, @1)))) + /* Unsigned saturation sub, case 1 (branch with gt): SAT_U_SUB = X > Y ? X - Y : 0 */ (match (unsigned_integer_sat_sub @0 @1) diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc index 8d96a4c964b..3c93fca5b53 100644 --- a/gcc/tree-ssa-math-opts.cc +++ b/gcc/tree-ssa-math-opts.cc @@ -4023,6 +4023,8 @@ extern bool gimple_unsigned_integer_sat_add (tree, tree*, tree (*)(tree)); extern bool gimple_unsigned_integer_sat_sub (tree, tree*, tree (*)(tree)); extern bool gimple_unsigned_integer_sat_trunc (tree, tree*, tree (*)(tree)); +extern bool gimple_signed_integer_sat_add (tree, tree*, tree (*)(tree)); + static void build_saturation_binary_arith_call (gimple_stmt_iterator *gsi, internal_fn fn, tree lhs, tree op_0, tree op_1) @@ -4072,7 +4074,8 @@ match_unsigned_saturation_add (gimple_stmt_iterator *gsi, gassign *stmt) } /* - * Try to match saturation unsigned add with PHI. + * Try to match saturation add with PHI. + * For unsigned integer: * : * _1 = x_3(D) + y_4(D); * if (_1 >= x_3(D)) @@ -4086,10 +4089,31 @@ match_unsigned_saturation_add (gimple_stmt_iterator *gsi, gassign *stmt) * # _2 = PHI <255(2), _1(3)> * => * [local count: 1073741824]: - * _2 = .SAT_ADD (x_4(D), y_5(D)); */ + * _2 = .SAT_ADD (x_4(D), y_5(D)); + * + * For signed integer: + * x.0_1 = (long unsigned int) x_7(D); + * y.1_2 = (long unsigned int) y_8(D); + * _3 = x.0_1 + y.1_2; + * sum_9 = (int64_t) _3; + * _4 = x_7(D) ^ y_8(D); + * _5 = x_7(D) ^ sum_9; + * _15 = ~_4; + * _16 = _5 & _15; + * if (_16 < 0) + * goto ; [41.00%] + * else + * goto ; [59.00%] + * _11 = x_7(D) < 0; + * _12 = (long int) _11; + * _13 = -_12; + * _14 = _13 ^ 9223372036854775807; + * # _6 = PHI <_14(3), sum_9(2)> + * => + * _6 = .SAT_ADD (x_5(D), y_6(D)); [tail call] */ static void -match_unsigned_saturation_add (gimple_stmt_iterator *gsi, gphi *phi) +match_saturation_add (gimple_stmt_iterator *gsi, gphi *phi) { if (gimple_phi_num_args (phi) != 2) return; @@ -4097,7 +4121,8 @@ match_unsigned_saturation_add (gimple_stmt_iterator *gsi, gphi *phi) tree ops[2]; tree phi_result = gimple_phi_result (phi); - if (gimple_unsigned_integer_sat_add (phi_result, ops, NULL)) + if (gimple_unsigned_integer_sat_add (phi_result, ops, NULL) + || gimple_signed_integer_sat_add (phi_result, ops, NULL)) build_saturation_binary_arith_call (gsi, phi, IFN_SAT_ADD, phi_result, ops[0], ops[1]); } @@ -6097,7 +6122,7 @@ math_opts_dom_walker::after_dom_children (basic_block bb) gsi_next (&psi)) { gimple_stmt_iterator gsi = gsi_after_labels (bb); - match_unsigned_saturation_add (&gsi, psi.phi ()); + match_saturation_add (&gsi, psi.phi ()); match_unsigned_saturation_sub (&gsi, psi.phi ()); }