diff --git a/0001-change-gcc-version.patch b/0001-change-gcc-version.patch index a13619d..5bffe14 100644 --- a/0001-change-gcc-version.patch +++ b/0001-change-gcc-version.patch @@ -1,6 +1,6 @@ diff -Nurp a/gcc/BASE-VER b/gcc/BASE-VER ---- a/gcc/BASE-VER 2022-05-06 03:30:56.000000000 -0400 -+++ b/gcc/BASE-VER 2022-08-04 08:59:09.152000000 -0400 +--- a/gcc/BASE-VER 2023-11-16 18:07:52.660618230 +0800 ++++ b/gcc/BASE-VER 2023-11-16 18:08:00.480618230 +0800 @@ -1 +1 @@ --12.2.0 -+12.2.1 +-12.3.0 ++12.3.1 diff --git a/0002-i386-Add-syscall-to-enable-AMX-for-latest-kernels.patch b/0002-i386-Add-syscall-to-enable-AMX-for-latest-kernels.patch deleted file mode 100644 index 94625b5..0000000 --- a/0002-i386-Add-syscall-to-enable-AMX-for-latest-kernels.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5e377d21f1f345d8b157b9bc306e02bb9bd45e01 Mon Sep 17 00:00:00 2001 -From: Haochen Jiang -Date: Thu, 16 Jun 2022 00:15:53 -0700 -Subject: [PATCH] i386: Add syscall to enable AMX for latest kernels - -gcc/testsuite/ChangeLog: - - * gcc.target/i386/amx-check.h (request_perm_xtile_data): - New function to check if AMX is usable and enable AMX. - (main): Run test if AMX is usable. ---- - gcc/testsuite/gcc.target/i386/amx-check.h | 30 +++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h b/gcc/testsuite/gcc.target/i386/amx-check.h -index 434b0e59703..6fff5ff4631 100644 ---- a/gcc/testsuite/gcc.target/i386/amx-check.h -+++ b/gcc/testsuite/gcc.target/i386/amx-check.h -@@ -4,11 +4,24 @@ - #include - #include - #include -+#include -+#ifdef __linux__ -+#include -+#endif - #ifdef DEBUG - #include - #endif - #include "cpuid.h" - -+#define XFEATURE_XTILECFG 17 -+#define XFEATURE_XTILEDATA 18 -+#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) -+#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) -+#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | XFEATURE_MASK_XTILEDATA) -+ -+#define ARCH_GET_XCOMP_PERM 0x1022 -+#define ARCH_REQ_XCOMP_PERM 0x1023 -+ - /* TODO: The tmm emulation is temporary for current - AMX implementation with no tmm regclass, should - be changed in the future. */ -@@ -44,6 +57,20 @@ typedef struct __tile - /* Stride (colum width in byte) used for tileload/store */ - #define _STRIDE 64 - -+#ifdef __linux__ -+/* We need syscall to use amx functions */ -+int request_perm_xtile_data() -+{ -+ unsigned long bitmask; -+ -+ if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, XFEATURE_XTILEDATA) || -+ syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) -+ return 0; -+ -+ return (bitmask & XFEATURE_MASK_XTILE) != 0; -+} -+#endif -+ - /* Initialize tile config by setting all tmm size to 16x64 */ - void init_tile_config (__tilecfg_u *dst) - { -@@ -185,6 +212,9 @@ main () - #endif - #ifdef AMX_BF16 - && __builtin_cpu_supports ("amx-bf16") -+#endif -+#ifdef __linux__ -+ && request_perm_xtile_data () - #endif - ) - { --- -2.18.2 - diff --git a/0003-Remove-AVX512_VP2INTERSECT-from-PTA_SAPPHIRERAPIDS.patch b/0003-Remove-AVX512_VP2INTERSECT-from-PTA_SAPPHIRERAPIDS.patch deleted file mode 100644 index 42cabc2..0000000 --- a/0003-Remove-AVX512_VP2INTERSECT-from-PTA_SAPPHIRERAPIDS.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 11c72f20d4d7ba1862a257cef05dc3a5e84a276d Mon Sep 17 00:00:00 2001 -From: "Cui,Lili" -Date: Thu, 29 Sep 2022 14:28:06 +0800 -Subject: [PATCH] Remove AVX512_VP2INTERSECT from PTA_SAPPHIRERAPIDS - -gcc/ChangeLog: - - * config/i386/driver-i386.cc (host_detect_local_cpu): - Move sapphirerapids out of AVX512_VP2INTERSECT. - * config/i386/i386.h: Remove AVX512_VP2INTERSECT from PTA_SAPPHIRERAPIDS - * doc/invoke.texi: Remove AVX512_VP2INTERSECT from SAPPHIRERAPIDS ---- - gcc/config/i386/driver-i386.cc | 13 +++++-------- - gcc/config/i386/i386.h | 7 +++---- - gcc/doc/invoke.texi | 8 ++++---- - 3 files changed, 12 insertions(+), 16 deletions(-) - -diff --git a/gcc/config/i386/driver-i386.cc b/gcc/config/i386/driver-i386.cc -index 3c702fdca33..ef567045c67 100644 ---- a/gcc/config/i386/driver-i386.cc -+++ b/gcc/config/i386/driver-i386.cc -@@ -589,15 +589,12 @@ const char *host_detect_local_cpu (int argc, const char **argv) - /* This is unknown family 0x6 CPU. */ - if (has_feature (FEATURE_AVX)) - { -+ /* Assume Tiger Lake */ - if (has_feature (FEATURE_AVX512VP2INTERSECT)) -- { -- if (has_feature (FEATURE_TSXLDTRK)) -- /* Assume Sapphire Rapids. */ -- cpu = "sapphirerapids"; -- else -- /* Assume Tiger Lake */ -- cpu = "tigerlake"; -- } -+ cpu = "tigerlake"; -+ /* Assume Sapphire Rapids. */ -+ else if (has_feature (FEATURE_TSXLDTRK)) -+ cpu = "sapphirerapids"; - /* Assume Cooper Lake */ - else if (has_feature (FEATURE_AVX512BF16)) - cpu = "cooperlake"; -diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h -index 900a3bc3673..372a2cff8fe 100644 ---- a/gcc/config/i386/i386.h -+++ b/gcc/config/i386/i386.h -@@ -2326,10 +2326,9 @@ constexpr wide_int_bitmask PTA_ICELAKE_SERVER = PTA_ICELAKE_CLIENT - constexpr wide_int_bitmask PTA_TIGERLAKE = PTA_ICELAKE_CLIENT | PTA_MOVDIRI - | PTA_MOVDIR64B | PTA_CLWB | PTA_AVX512VP2INTERSECT | PTA_KL | PTA_WIDEKL; - constexpr wide_int_bitmask PTA_SAPPHIRERAPIDS = PTA_ICELAKE_SERVER | PTA_MOVDIRI -- | PTA_MOVDIR64B | PTA_AVX512VP2INTERSECT | PTA_ENQCMD | PTA_CLDEMOTE -- | PTA_PTWRITE | PTA_WAITPKG | PTA_SERIALIZE | PTA_TSXLDTRK | PTA_AMX_TILE -- | PTA_AMX_INT8 | PTA_AMX_BF16 | PTA_UINTR | PTA_AVXVNNI | PTA_AVX512FP16 -- | PTA_AVX512BF16; -+ | PTA_MOVDIR64B | PTA_ENQCMD | PTA_CLDEMOTE | PTA_PTWRITE | PTA_WAITPKG -+ | PTA_SERIALIZE | PTA_TSXLDTRK | PTA_AMX_TILE | PTA_AMX_INT8 | PTA_AMX_BF16 -+ | PTA_UINTR | PTA_AVXVNNI | PTA_AVX512FP16 | PTA_AVX512BF16; - constexpr wide_int_bitmask PTA_KNL = PTA_BROADWELL | PTA_AVX512PF - | PTA_AVX512ER | PTA_AVX512F | PTA_AVX512CD | PTA_PREFETCHWT1; - constexpr wide_int_bitmask PTA_BONNELL = PTA_CORE2 | PTA_MOVBE; -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 271c8bb8468..a9ecc4426a4 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -32057,11 +32057,11 @@ Intel sapphirerapids CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3, - SSSE3, SSE4.1, SSE4.2, POPCNT, CX16, SAHF, FXSR, AVX, XSAVE, PCLMUL, FSGSBASE, - RDRND, F16C, AVX2, BMI, BMI2, LZCNT, FMA, MOVBE, HLE, RDSEED, ADCX, PREFETCHW, - AES, CLFLUSHOPT, XSAVEC, XSAVES, SGX, AVX512F, AVX512VL, AVX512BW, AVX512DQ, --AVX512CD, PKU, AVX512VBMI, AVX512IFMA, SHA, AVX512VNNI, GFNI, VAES, AVX512VBMI2 -+AVX512CD, PKU, AVX512VBMI, AVX512IFMA, SHA, AVX512VNNI, GFNI, VAES, AVX512VBMI2, - VPCLMULQDQ, AVX512BITALG, RDPID, AVX512VPOPCNTDQ, PCONFIG, WBNOINVD, CLWB, --MOVDIRI, MOVDIR64B, AVX512VP2INTERSECT, ENQCMD, CLDEMOTE, PTWRITE, WAITPKG, --SERIALIZE, TSXLDTRK, UINTR, AMX-BF16, AMX-TILE, AMX-INT8, AVX-VNNI, AVX512FP16 --and AVX512BF16 instruction set support. -+MOVDIRI, MOVDIR64B, ENQCMD, CLDEMOTE, PTWRITE, WAITPKG, SERIALIZE, TSXLDTRK, -+UINTR, AMX-BF16, AMX-TILE, AMX-INT8, AVX-VNNI, AVX512FP16 and AVX512BF16 -+instruction set support. - - @item alderlake - Intel Alderlake CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, SSE3, SSSE3, --- -2.18.2 - diff --git a/0007-i386-Avoid-fma_chain-for-march-alderlake-and-sapphir.patch b/0007-i386-Avoid-fma_chain-for-march-alderlake-and-sapphir.patch deleted file mode 100644 index ad65965..0000000 --- a/0007-i386-Avoid-fma_chain-for-march-alderlake-and-sapphir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b7980cd8d8bcf41b3ca1b6f3ba147789d42a9b99 Mon Sep 17 00:00:00 2001 -From: Hongyu Wang -Date: Tue, 6 Dec 2022 09:53:35 +0800 -Subject: [PATCH] i386: Avoid fma_chain for -march=alderlake and - sapphirerapids. - -For Alderlake there is similar issue like PR 81616, enable -avoid_fma256_chain will also benefit on Intel latest platforms -Alderlake and Sapphire Rapids. - -gcc/ChangeLog: - - * config/i386/x86-tune.def (X86_TUNE_AVOID_256FMA_CHAINS): Add - m_SAPPHIRERAPIDS, m_ALDERLAKE. ---- - gcc/config/i386/x86-tune.def | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/i386/x86-tune.def b/gcc/config/i386/x86-tune.def -index d983e2f6213..1e1b206a71c 100644 ---- a/gcc/config/i386/x86-tune.def -+++ b/gcc/config/i386/x86-tune.def -@@ -485,7 +485,8 @@ DEF_TUNE (X86_TUNE_AVOID_128FMA_CHAINS, "avoid_fma_chains", m_ZNVER) - - /* X86_TUNE_AVOID_256FMA_CHAINS: Avoid creating loops with tight 256bit or - smaller FMA chain. */ --DEF_TUNE (X86_TUNE_AVOID_256FMA_CHAINS, "avoid_fma256_chains", m_ZNVER2 | m_ZNVER3) -+DEF_TUNE (X86_TUNE_AVOID_256FMA_CHAINS, "avoid_fma256_chains", m_ZNVER2 | m_ZNVER3 -+ | m_ALDERLAKE | m_SAPPHIRERAPIDS) - - /* X86_TUNE_V2DF_REDUCTION_PREFER_PHADDPD: Prefer haddpd - for v2df vector reduction. */ --- -2.18.2 - diff --git a/gcc-12.2.0.tar.xz b/gcc-12.3.0.tar.xz similarity index 83% rename from gcc-12.2.0.tar.xz rename to gcc-12.3.0.tar.xz index 3a320cf..c29aea1 100644 Binary files a/gcc-12.2.0.tar.xz and b/gcc-12.3.0.tar.xz differ diff --git a/gcc-12.spec b/gcc-12.spec index 8b7b0b8..6d046fe 100644 --- a/gcc-12.spec +++ b/gcc-12.spec @@ -85,19 +85,19 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: %{?scl_prefix}gcc%{gcc_ver} -Version: 12.2.1 -Release: 14 +Version: 12.3.1 +Release: 15 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD -Source0: https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz +Source0: https://ftp.gnu.org/gnu/gcc/gcc-12.3.0/gcc-12.3.0.tar.xz URL: http://gcc.gnu.org BuildRequires: binutils >= 2.31 BuildRequires: glibc-headers BuildRequires: libtool, zlib-devel, texinfo, gettext, flex, bison, sharutils BuildRequires: gmp-devel >= 4.1.2, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1, isl-devel >= 0.15.0 -BuildRequires: gcc, gcc-c++, make +BuildRequires: gcc, gcc-c++, make, chrpath BuildRequires: gdb BuildRequires: glibc-devel >= 2.17 %ifarch %{multilib_64_archs} sparcv9 ppc @@ -135,12 +135,9 @@ Provides: %{?scl_prefix}gcc%{gcc_ver}(major) = %{gcc_major} Patch0: 0001-change-gcc-version.patch -Patch1: 0002-i386-Add-syscall-to-enable-AMX-for-latest-kernels.patch -Patch2: 0003-Remove-AVX512_VP2INTERSECT-from-PTA_SAPPHIRERAPIDS.patch Patch3: 0004-Add-attribute-hot-judgement-for-INLINE_HINT_known_ho.patch Patch4: 0005-Enable-small-loop-unrolling-for-O2.patch Patch5: 0006-i386-Only-enable-small-loop-unrolling-in-backend-PR-.patch -Patch6: 0007-i386-Avoid-fma_chain-for-march-alderlake-and-sapphir.patch # On ARM EABI systems, we do want -gnueabi to be part of the @@ -596,15 +593,12 @@ not stable, so plugins must be rebuilt any time GCC is updated. %prep -%setup -q -n gcc-12.2.0 +%setup -q -n gcc-12.3.0 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 echo '%{vendor} %{version}-%{release}' > gcc/DEV-PHASE @@ -1454,6 +1448,7 @@ strip -g `find . \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \ -a -type f` popd chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.* +chrpath -d %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgomp.so.1.* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libcc1.so.0.* %if %{build_libquadmath} @@ -1471,15 +1466,19 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libatomic.so.1.* %endif %if %{build_libasan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libasan.so.8.* +chrpath -d %{buildroot}%{_prefix}/%{_lib}/libasan.so.8.* %endif %if %{build_libubsan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libubsan.so.1.* +chrpath -d %{buildroot}%{_prefix}/%{_lib}/libubsan.so.1.* %endif %if %{build_libtsan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libtsan.so.2.* +chrpath -d %{buildroot}%{_prefix}/%{_lib}/libtsan.so.2.* %endif %if %{build_liblsan} chmod 755 %{buildroot}%{_prefix}/%{_lib}/liblsan.so.0.* +chrpath -d %{buildroot}%{_prefix}/%{_lib}/liblsan.so.0.* %endif %if %{build_go} # Avoid stripping these libraries and binaries. @@ -1905,6 +1904,7 @@ end %endif %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libatomic.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libasan.a @@ -1913,6 +1913,7 @@ end %endif %if %{build_libubsan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libubsan.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libubsan.so %endif %endif %ifarch %{multilib_64_archs} @@ -1934,6 +1935,7 @@ end %endif %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libatomic.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libasan.a @@ -1942,6 +1944,7 @@ end %endif %if %{build_libubsan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libubsan.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libubsan.so %endif %endif %ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 @@ -1955,6 +1958,7 @@ end %endif %if %{build_libatomic} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so %endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.a @@ -1963,12 +1967,19 @@ end %endif %if %{build_libubsan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.a +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.so %endif %else +%if %{build_libatomic} +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.so +%endif %if %{build_libasan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o %endif +%if %{build_libubsan} +%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libubsan.so +%endif %endif %if %{build_libtsan} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.so @@ -2665,6 +2676,9 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Mon Nov 20 2023 Shujian Zhao 12.3.1-15 +- Upgrade GCC version 12.2.1 to 12.3.1 + * Wed Dec 14 2022 Hongyu Wang 12.2.1-14 - i386: Avoid fma_chain for -march=alderlake and sapphirerapids