From 30911f30d8f94b4e7f5aba5e6206206fb8204c9f Mon Sep 17 00:00:00 2001
From: eastb233 <xiezhiheng@huawei.com>
Date: Wed, 20 May 2020 11:14:06 +0800
Subject: [PATCH] modify patch

---
 address-calculation-optimization-within-loop.patch | 11 +++++++++++
 generate-csel.patch                                | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/address-calculation-optimization-within-loop.patch b/address-calculation-optimization-within-loop.patch
index 6a7e58c..5801d63 100644
--- a/address-calculation-optimization-within-loop.patch
+++ b/address-calculation-optimization-within-loop.patch
@@ -55,3 +55,14 @@ diff -Nurp a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
  	  || !is_widening_mult_p (rhs2_stmt, &type1, &mult_rhs1,
  				  &type2, &mult_rhs2))
  	return false;
+diff -Nurp a/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c b/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c
+--- a/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c	2020-03-31 09:51:36.000000000 +0800
++++ b/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c	2020-04-29 10:55:44.937471475 +0800
+@@ -17,7 +17,6 @@ f (TYPE *x, TYPE *y, unsigned short n, 1
+ /* { dg-final { scan-assembler {\tstr\tw[0-9]+} } } */
+ /* Should multiply by (VF-1)*4 rather than (257-1)*4.  */
+ /* { dg-final { scan-assembler-not {, 1024} } } */
+-/* { dg-final { scan-assembler-not {\t.bfiz\t} } } */
+ /* { dg-final { scan-assembler-not {lsl[^\n]*[, ]10} } } */
+ /* { dg-final { scan-assembler-not {\tcmp\tx[0-9]+, 0} } } */
+ /* { dg-final { scan-assembler-not {\tcmp\tw[0-9]+, 0} } } */
diff --git a/generate-csel.patch b/generate-csel.patch
index 35a00ce..41fb032 100644
--- a/generate-csel.patch
+++ b/generate-csel.patch
@@ -1,3 +1,13 @@
+diff -uprN a/gcc/testsuite/gcc.dg/graphite/scop-21.c b/gcc/testsuite/gcc.dg/graphite/scop-21.c
+--- a/gcc/testsuite/gcc.dg/graphite/scop-21.c
++++ b/gcc/testsuite/gcc.dg/graphite/scop-21.c
+@@ -30,5 +30,4 @@ int test ()
+
+   return a[20];
+ }
+-/* XFAILed by the fix for PR86865.  */
+-/* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } } */
++/* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" } } */
 diff -uprN a/gcc/testsuite/gcc.dg/tree-ssa/pr89430-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr89430-1.c
 new file mode 100644
 --- /dev/null