1080ba4291
Sync patch from openeuler/gcc - 20220808 (cherry picked from commit 3d663928609a23db4fc8b4ba1039a53a943ac1ed)
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From ea059ab02ac79eba1c05d6e05cbb2590c47d7c1f Mon Sep 17 00:00:00 2001
|
|
From: zhaowenyu <804544223@qq.com>
|
|
Date: Thu, 23 Jun 2022 10:16:08 +0800
|
|
Subject: [PATCH 06/12] [Backport] ifcvt: Allow constants for
|
|
noce_convert_multiple.
|
|
|
|
Reference: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9b8eaa282250ad260e01d164093b597579db00d9
|
|
|
|
This lifts the restriction of not allowing constants for noce_convert_multiple.
|
|
The code later checks if a valid sequence is produced anyway.
|
|
gcc/ChangeLog:
|
|
|
|
* ifcvt.cc (noce_convert_multiple_sets): Allow constants.
|
|
(bb_ok_for_noce_convert_multiple_sets): Likewise.
|
|
---
|
|
gcc/ifcvt.c | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
|
|
index 977dd1bd4..2452f231c 100644
|
|
--- a/gcc/ifcvt.c
|
|
+++ b/gcc/ifcvt.c
|
|
@@ -3252,7 +3252,9 @@ noce_convert_multiple_sets (struct noce_if_info *if_info)
|
|
we'll end up trying to emit r4:HI = cond ? (r1:SI) : (r3:HI).
|
|
Wrap the two cmove operands into subregs if appropriate to prevent
|
|
that. */
|
|
- if (GET_MODE (new_val) != GET_MODE (temp))
|
|
+
|
|
+ if (!CONSTANT_P (new_val)
|
|
+ && GET_MODE (new_val) != GET_MODE (temp))
|
|
{
|
|
machine_mode src_mode = GET_MODE (new_val);
|
|
machine_mode dst_mode = GET_MODE (temp);
|
|
@@ -3263,7 +3265,8 @@ noce_convert_multiple_sets (struct noce_if_info *if_info)
|
|
}
|
|
new_val = lowpart_subreg (dst_mode, new_val, src_mode);
|
|
}
|
|
- if (GET_MODE (old_val) != GET_MODE (temp))
|
|
+ if (!CONSTANT_P (old_val)
|
|
+ && GET_MODE (old_val) != GET_MODE (temp))
|
|
{
|
|
machine_mode src_mode = GET_MODE (old_val);
|
|
machine_mode dst_mode = GET_MODE (temp);
|
|
@@ -3392,9 +3395,9 @@ bb_ok_for_noce_convert_multiple_sets (basic_block test_bb)
|
|
if (!REG_P (dest))
|
|
return false;
|
|
|
|
- if (!(REG_P (src)
|
|
- || (GET_CODE (src) == SUBREG && REG_P (SUBREG_REG (src))
|
|
- && subreg_lowpart_p (src))))
|
|
+ if (!((REG_P (src) || CONSTANT_P (src))
|
|
+ || (GET_CODE (src) == SUBREG && REG_P (SUBREG_REG (src))
|
|
+ && subreg_lowpart_p (src))))
|
|
return false;
|
|
|
|
/* Destination must be appropriate for a conditional write. */
|
|
--
|
|
2.27.0.windows.1
|
|
|