On Sun, Dec 01, 2019 at 03:44:38PM +0100, Jan Hubicka wrote:
> > On Nov 30 2019, Jan Hubicka wrote:
> >
> > > * g++.dg/lto/inline-crossmodule-1.h: New testcase.
> > > * g++.dg/lto/inline-crossmodule-1_0.C: New testcase.
> > > * g++.dg/lto/inline-crossmodule-1_1.C: New testcase.
> >
> > ERROR: (DejaGnu) proc "scan-wpa-ipa-times {Inlined ret1} 1 inlined" does
> > not exist.
>
> Uhh, should be scan-wpa-ipa-dump-times, I will test and commit the
> obvious patch.
It doesn't work:
UNRESOLVED: g++-dg-lto-inline-crossmodule-1-01.exe scan-wpa-ipa-dump-times
inlined "(cross module)" 1
UNRESOLVED: g++-dg-lto-inline-crossmodule-1-01.exe scan-wpa-ipa-dump-times
inlined "Inlined key[^\\\\n]*(cross module)" 1
UNRESOLVED: g++-dg-lto-inline-crossmodule-1-01.exe scan-wpa-ipa-dump-times
inlined "Inlined ret1" 1
UNRESOLVED: g++-dg-lto-inline-crossmodule-1-01.exe scan-wpa-ipa-dump-times
inlined "Inlined ret2" 1
Fixed thusly, tested on x86_64-linux, committed to trunk as obvious:
2019-12-03 Jakub Jelinek <ja...@redhat.com>
* g++.dg/lto/inline-crossmodule-1_0.C: Use -fdump-ipa-inline-details
instead of -fdump-ipa-inline. Use "inline" instead of "inlined" as
last argument to scan-wpa-ipa-dump-times, use \\\( and \\\) instead of
( and ) in the regex.
--- gcc/testsuite/g++.dg/lto/inline-crossmodule-1_0.C.jj 2019-12-02
22:28:23.433287949 +0100
+++ gcc/testsuite/g++.dg/lto/inline-crossmodule-1_0.C 2019-12-03
01:30:40.444232221 +0100
@@ -1,11 +1,11 @@
// { dg-lto-do link }
-/* { dg-lto-options { "-O2 -fno-early-inlining -flto -fdump-ipa-inline" } } */
+/* { dg-lto-options { "-O2 -fno-early-inlining -flto
-fdump-ipa-inline-details" } } */
#include "inline-crossmodule-1.h"
int a::key ()
{
return 0;
}
-/* { dg-final { scan-wpa-ipa-dump-times "Inlined ret1" 1 "inlined" } } */
-/* { dg-final { scan-wpa-ipa-dump-times "Inlined ret2" 1 "inlined" } } */
-/* { dg-final { scan-wpa-ipa-dump-times "Inlined key\[^\\n\]*(cross module)" 1
"inlined" } } */
-/* { dg-final { scan-wpa-ipa-dump-times "(cross module)" 1 "inlined" } } */
+/* { dg-final { scan-wpa-ipa-dump-times "Inlined ret1" 1 "inline" } } */
+/* { dg-final { scan-wpa-ipa-dump-times "Inlined ret2" 1 "inline" } } */
+/* { dg-final { scan-wpa-ipa-dump-times "Inlined key\[^\\n\]*\\\(cross
module\\\)" 1 "inline" } } */
+/* { dg-final { scan-wpa-ipa-dump-times "\\\(cross module\\\)" 1 "inline" } }
*/
Jakub
