On Fri, Jan 18, 2019 at 6:25 AM H.J. Lu <hjl.to...@gmail.com> wrote: > > On Thu, Jan 17, 2019 at 4:51 AM Richard Biener > <richard.guent...@gmail.com> wrote: > > > > On Thu, Jan 17, 2019 at 12:21 PM Martin Liška <mli...@suse.cz> wrote: > > > > > > On 1/16/19 1:06 PM, Richard Biener wrote: > > > > On Wed, Jan 16, 2019 at 10:20 AM Martin Liška <mli...@suse.cz> wrote: > > > >> > > > >> Hi. > > > >> > > > >> The patch is about resetting TYPE_MODE of vector types. This is > > > >> problematic > > > >> when an inlining among different ISAs happen. Then we end up with a > > > >> different > > > >> mode than when it's expected from debug info. > > > >> > > > >> When creating a new function decl in target_clones, we must > > > >> valid_attribute_p early > > > >> so that the declaration has a proper cl_target_.. node and so that > > > >> inliner can > > > >> fix modes. > > > >> > > > >> Patch can bootstrap on x86_64-linux-gnu and survives regression tests. > > > >> > > > >> Ready to be installed? > > > > > > > > I don't like the new failure mode too much. It looks like > > > > create_version_clone_with_body > > > > can fail so why not simply return NULL when > > > > targetm.target_option.valid_attribute_p > > > > returns false and handle that case in multi-versioning? > > > > > > > > That is, > > > > > > > > + return !seen_error (); > > > > > > > > that looks very wrong to me. > > > > > > Yep, update patch should be better. > > > > > > Patch can bootstrap on x86_64-linux-gnu and survives regression tests. > > > > > > Ready to be installed? > > > > OK. > > > > Thanks, > > Richard. > > > > > Thanks, > > > Martin > > > > > > > > > > > Richard. > > > > > > > >> Thanks, > > > >> Martin > > > >> > > > >> gcc/ChangeLog: > > > >> > > > >> 2019-01-16 Martin Liska <mli...@suse.cz> > > > >> Richard Biener <rguent...@suse.de> > > > >> > > > >> PR middle-end/88587 > > > >> * cgraph.h (create_version_clone_with_body): Add new argument > > > >> with attributes. > > > >> * cgraphclones.c (cgraph_node::create_version_clone): Add > > > >> DECL_ATTRIBUTES to a newly created decl. And call > > > >> valid_attribute_p so that proper cl_target_optimization_node > > > >> is set for the newly created declaration. > > > >> * multiple_target.c (create_target_clone): Set DECL_ATTRIBUTES > > > >> for declaration. > > > >> (expand_target_clones): Do not call valid_attribute_p, it must > > > >> be already done. > > > >> * tree-inline.c (copy_decl_for_dup_finish): Reset mode for > > > >> vector types. > > > >> > > > >> gcc/testsuite/ChangeLog: > > > >> > > > >> 2019-01-16 Martin Liska <mli...@suse.cz> > > > >> > > > >> PR middle-end/88587 > > > >> * g++.target/i386/pr88587.C: New test. > > > >> * gcc.target/i386/mvc13.c: New test. > > > >> --- > > > >> gcc/cgraph.h | 7 +++++- > > > >> gcc/cgraphclones.c | 18 +++++++++++++- > > > >> gcc/multiple_target.c | 32 ++++++++----------------- > > > >> gcc/testsuite/g++.target/i386/pr88587.C | 15 ++++++++++++ > > > >> gcc/testsuite/gcc.target/i386/mvc13.c | 9 +++++++ > > > >> gcc/tree-inline.c | 4 ++++ > > > >> 6 files changed, 61 insertions(+), 24 deletions(-) > > > >> create mode 100644 gcc/testsuite/g++.target/i386/pr88587.C > > > >> create mode 100644 gcc/testsuite/gcc.target/i386/mvc13.c > > > >> > > > >> > > > > > It is wrong to use -m32 in dg-options: > > /* { dg-do compile } */ > /* { dg-require-ifunc "" } */ > /* { dg-options "-O -m32 -g -mno-sse" } */ > > You should use > > /* { dg-do compile { target ia32 } } */ > > Since g++.target/i386/pr88587.C doesn't support -fPIC, > > [hjl@gnu-cfl-1 gcc]$ ./xgcc -B./ > /export/gnu/import/git/sources/gcc/gcc/testsuite/g++.target/i386/pr88587.C > -mx32 -fpic -S > /export/gnu/import/git/sources/gcc/gcc/testsuite/g++.target/i386/pr88587.C:6:6: > warning: always_inline function might not be inlinable [-Wattributes] > 6 | void a() > | ^ > /export/gnu/import/git/sources/gcc/gcc/testsuite/g++.target/i386/pr88587.C: > In function \u2018void a2()\u2019: > /export/gnu/import/git/sources/gcc/gcc/testsuite/g++.target/i386/pr88587.C:6:6: > error: inlining failed in call to always_inline \u2018void a()\u2019: > function body can be overwritten at link time > /export/gnu/import/git/sources/gcc/gcc/testsuite/g++.target/i386/pr88587.C:13:5: > note: called from here > 13 | a (); > | ~~^~ > [hjl@gnu-cfl-1 gcc]$ > > you should add -fno-pic. >
I am checking in this patch as an obvious fix. -- H.J. --- diff --git a/gcc/testsuite/g++.target/i386/pr88587.C b/gcc/testsuite/g++.target/i386/pr88587.C index 6808ab68cbb..e7488e68743 100644 --- a/gcc/testsuite/g++.target/i386/pr88587.C +++ b/gcc/testsuite/g++.target/i386/pr88587.C @@ -1,6 +1,6 @@ -/* { dg-do compile } */ +/* { dg-do compile { target ia32 } } */ /* { dg-require-ifunc "" } */ -/* { dg-options "-O -m32 -g -mno-sse -Wno-attributes" } */ +/* { dg-options "-O -fno-pic -g -mno-sse -Wno-attributes" } */ __attribute__((target("default"),always_inline)) void a() diff --git a/gcc/testsuite/gcc.target/i386/mvc13.c b/gcc/testsuite/gcc.target/i386/mvc13.c index 9e31ef7c4da..8d7e34437b4 100644 --- a/gcc/testsuite/gcc.target/i386/mvc13.c +++ b/gcc/testsuite/gcc.target/i386/mvc13.c @@ -1,6 +1,6 @@ -/* { dg-do compile } */ +/* { dg-do compile { target ia32 } } */ /* { dg-require-ifunc "" } */ -/* { dg-options "-O -m32 -g -mno-sse" } */ +/* { dg-options "-O -g -mno-sse" } */ __attribute__((target_clones("default,sse2"))) void a()