From 30911f30d8f94b4e7f5aba5e6206206fb8204c9f Mon Sep 17 00:00:00 2001 From: eastb233 Date: Wed, 20 May 2020 11:14:06 +0800 Subject: [PATCH 1/6] 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 -- Gitee From e020ad34bb2af122f6a7d42bebd3b08e9ed30611 Mon Sep 17 00:00:00 2001 From: eastb233 Date: Wed, 20 May 2020 11:19:38 +0800 Subject: [PATCH 2/6] modify patch --- address-calculation-optimization-within-loop.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/address-calculation-optimization-within-loop.patch b/address-calculation-optimization-within-loop.patch index 5801d63..be36f80 100644 --- a/address-calculation-optimization-within-loop.patch +++ b/address-calculation-optimization-within-loop.patch @@ -58,7 +58,7 @@ diff -Nurp a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c 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 +@@ -17,7 +17,6 @@ f (TYPE *x, TYPE *y, unsigned short n, l /* { 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} } } */ -- Gitee From e707f7689030b443649b312e0d6b0f9494ef8bcb Mon Sep 17 00:00:00 2001 From: eastb233 Date: Wed, 20 May 2020 11:29:11 +0800 Subject: [PATCH 3/6] modify patch --- change-gcc-BASE-VER.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 change-gcc-BASE-VER.patch diff --git a/change-gcc-BASE-VER.patch b/change-gcc-BASE-VER.patch new file mode 100644 index 0000000..45beb06 --- /dev/null +++ b/change-gcc-BASE-VER.patch @@ -0,0 +1,17 @@ +diff -urpN a/gcc/BASE-VER b/gcc/BASE-VER +--- a/gcc/BASE-VER 2020-03-31 09:51:52.000000000 +0800 ++++ b/gcc/BASE-VER 2020-05-14 16:45:36.416688565 +0800 +@@ -1 +1 @@ +-9.3.0 ++9.3.1 +diff -urpN a/gcc/ChangeLog b/gcc/ChangeLog +--- a/gcc/ChangeLog 2020-03-31 09:51:52.000000000 +0800 ++++ b/gcc/ChangeLog 2020-05-14 16:45:36.416688565 +0800 +@@ -1,3 +1,7 @@ ++2020-03-12 openEuler ++ ++ * BASE-VER: Set to 9.3.1. ++ + 2020-03-12 Release Manager + + * GCC 9.3.0 released -- Gitee From b93d465eef869b3f6c7495df778f85840df38e22 Mon Sep 17 00:00:00 2001 From: eastb233 Date: Wed, 20 May 2020 11:32:15 +0800 Subject: [PATCH 4/6] modify patch --- change-gcc-BASE-VER.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/change-gcc-BASE-VER.patch b/change-gcc-BASE-VER.patch index 45beb06..92ae397 100644 --- a/change-gcc-BASE-VER.patch +++ b/change-gcc-BASE-VER.patch @@ -1,12 +1,12 @@ -diff -urpN a/gcc/BASE-VER b/gcc/BASE-VER +diff -uprN a/gcc/BASE-VER b/gcc/BASE-VER --- a/gcc/BASE-VER 2020-03-31 09:51:52.000000000 +0800 +++ b/gcc/BASE-VER 2020-05-14 16:45:36.416688565 +0800 @@ -1 +1 @@ -9.3.0 +9.3.1 -diff -urpN a/gcc/ChangeLog b/gcc/ChangeLog ---- a/gcc/ChangeLog 2020-03-31 09:51:52.000000000 +0800 -+++ b/gcc/ChangeLog 2020-05-14 16:45:36.416688565 +0800 +diff -uprN a/gcc/ChangeLog b/gcc/ChangeLog +--- a/gcc/ChangeLog 2020-03-31 09:51:30.000000000 +0800 ++++ b/gcc/ChangeLog 2020-05-14 16:45:36.420688565 +0800 @@ -1,3 +1,7 @@ +2020-03-12 openEuler + @@ -14,4 +14,4 @@ diff -urpN a/gcc/ChangeLog b/gcc/ChangeLog + 2020-03-12 Release Manager - * GCC 9.3.0 released + * GCC 9.3.0 released. -- Gitee From f1ccc1455b376b353de59bca600006fcb86968d5 Mon Sep 17 00:00:00 2001 From: eastb233 Date: Wed, 20 May 2020 11:40:40 +0800 Subject: [PATCH 5/6] change gcc base version --- gcc.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 33e91fd..17e67a8 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,4 +1,4 @@ -%global DATE 20200428 +%global DATE 20200520 %global gcc_version 9.3.0 %global gcc_major 9.3.0 @@ -130,6 +130,7 @@ Patch14: fix-regno-out-of-range.patch Patch15: fix-ICE-in-vectorizable-load.patch Patch16: address-calculation-optimization-within-loop.patch Patch17: skip-debug-insns-when-computing-inline-costs.patch +Patch18: change-gcc-BASE-VER.patch %global gcc_target_platform %{_arch}-linux-gnu @@ -589,6 +590,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build @@ -2517,6 +2519,11 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Wed May 20 2020 eastb233 - 9.3.0-20200312.h1 +- address-calculation-optimization-within-loop.patch: Modify testsuite +- generate-csel.patch: Modify testsuite +- change-gcc-BASE-VER.patch: New file, change GCC base version + * Tue Apr 28 2020 eastb233 - 9.3.0-20200312.h1 - Type:modify - Desc:modify patch name and gcc.spec -- Gitee From 99ff7642896c6380d3a0cd285f144c23786b41e3 Mon Sep 17 00:00:00 2001 From: eastb233 Date: Thu, 21 May 2020 16:33:46 +0800 Subject: [PATCH 6/6] Modify gcc.spec --- gcc.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index 17e67a8..d611aa0 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,7 +1,7 @@ %global DATE 20200520 -%global gcc_version 9.3.0 -%global gcc_major 9.3.0 +%global gcc_version 9.3.1 +%global gcc_major 9.3.1 %global gcc_release 20200312 %global _unpackaged_files_terminate_build 0 %global _performance_build 1 @@ -62,7 +62,7 @@ Name: gcc Version: %{gcc_version} Release: %{gcc_release}.h1 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD -Source0: gcc-%{version}.tar.xz +Source0: gcc-9.3.0.tar.xz %global isl_version 0.16.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -569,7 +569,7 @@ for compiling GCC plugins. The GCC plugin ABI is currently not stable, so plugins must be rebuilt any time GCC is updated. %prep -%setup -q -n gcc-%{version} +%setup -q -n gcc-9.3.0 /bin/pwd %patch0 -p1 @@ -2519,10 +2519,11 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog -* Wed May 20 2020 eastb233 - 9.3.0-20200312.h1 +* Wed May 20 2020 eastb233 - 9.3.1-20200312.h1 - address-calculation-optimization-within-loop.patch: Modify testsuite - generate-csel.patch: Modify testsuite - change-gcc-BASE-VER.patch: New file, change GCC base version +- gcc.spec: Add new Patch, change GCC version to 9.3.1 * Tue Apr 28 2020 eastb233 - 9.3.0-20200312.h1 - Type:modify -- Gitee