mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-02 01:05:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[testsuite] Replace fragile 'scan-assembler' with 'scan-offload-rtl' in 'libgomp.oacc-c-c++-common/pr85381*.c'

Browse Source 
These test cases use directives similar to:

    /* { dg-additional-options "-save-temps" } */

    /* { dg-final { scan-assembler-times "bar.sync" 2 } } */

This expects to scan the PTX offloading compilation assembler code (not host
code!), expecting that nvptx offloading code assembly is produced after the
host code, and thus overwrites the latter file.  (Yes, that's certainly
ugly/fragile...)

..., and this broke with recent commit 1dedc12d18
"revamp dump and aux output names" plus fix-up commit commit
efc16503ca "handle dumpbase in offloading, adjust
testsuite" (short summary: file names changed), so let's finally make that
robust.

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/pr85381-2.c: Replace fragile
	'scan-assembler' with 'scan-offload-rtl'.
	* testsuite/libgomp.oacc-c-c++-common/pr85381-3.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/pr85381-4.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/pr85381-5.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/pr85381.c: Likewise.
This commit is contained in:
Thomas Schwinge 2020-06-30 05:24:17 +02:00
parent aff43ac0ae
commit 8a8efad098
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libgomp/testsuite/libgomp.oacc-c-c++-common/pr85381-2.c
View File

@ -1,6 +1,6 @@
/* { dg-additional-options "-save-temps" } */
/* { dg-do run { target openacc_nvidia_accel_selected } }
{ dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */
/* { dg-additional-options "-foffload=-fdump-rtl-mach" } */
int
main (void)
@ -33,4 +33,4 @@ main (void)
so the loop is not recognized as empty loop (which we detect by seeing if
joining immediately follows forked). */
/* { dg-final { scan-assembler-times "bar.sync" 2 } } */
/* { dg-final { scan-offload-rtl-dump-times "nvptx_barsync" 2 "mach" } } */

4
libgomp/testsuite/libgomp.oacc-c-c++-common/pr85381-3.c
View File

@ -1,6 +1,6 @@
/* { dg-additional-options "-save-temps -w" } */
/* { dg-do run { target openacc_nvidia_accel_selected } }
{ dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */
/* { dg-additional-options "-foffload=-fdump-rtl-mach" } */
int a;
#pragma acc declare create(a)
@ -32,4 +32,4 @@ main (void)
return 0;
}
/* { dg-final { scan-assembler-not "bar.sync" } } */
/* { dg-final { scan-offload-rtl-dump-not "nvptx_barsync" "mach" } } */

4
libgomp/testsuite/libgomp.oacc-c-c++-common/pr85381-4.c
View File

@ -1,6 +1,6 @@
/* { dg-additional-options "-save-temps -w" } */
/* { dg-do run { target openacc_nvidia_accel_selected } }
{ dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */
/* { dg-additional-options "-foffload=-fdump-rtl-mach" } */
#define n 1024
@ -24,4 +24,4 @@ main (void)
/* Atm, %ntid.y is broadcast from one loop to the next, so there are 2 bar.syncs
for that (the other two are there for the same reason as in pr85381-2.c).
Todo: Recompute %ntid.y instead of broadcasting it. */
/* { dg-final { scan-assembler-times "bar.sync" 4 } } */
/* { dg-final { scan-offload-rtl-dump-times "nvptx_barsync" 4 "mach" } } */

4
libgomp/testsuite/libgomp.oacc-c-c++-common/pr85381-5.c
View File

@ -1,6 +1,6 @@
/* { dg-additional-options "-save-temps" } */
/* { dg-do run { target openacc_nvidia_accel_selected } }
{ dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */
/* { dg-additional-options "-foffload=-fdump-rtl-mach" } */
#define n 1024
@ -21,4 +21,4 @@ main (void)
return 0;
}
/* { dg-final { scan-assembler-not "bar.sync" } } */
/* { dg-final { scan-offload-rtl-dump-not "nvptx_barsync" "mach" } } */

4
libgomp/testsuite/libgomp.oacc-c-c++-common/pr85381.c
View File

@ -1,6 +1,6 @@
/* { dg-additional-options "-save-temps" } */
/* { dg-do run { target openacc_nvidia_accel_selected } }
{ dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */
/* { dg-additional-options "-foffload=-fdump-rtl-mach" } */
int
main (void)
@ -15,4 +15,4 @@ main (void)
return 0;
}
/* { dg-final { scan-assembler-not "bar.sync" } } */
/* { dg-final { scan-offload-rtl-dump-not "nvptx_barsync" "mach" } } */